diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/bomba-cir-doble.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/bomba-cir-doble.elmt
deleted file mode 100644
index d6511de65..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/bomba-cir-doble.elmt
+++ /dev/null
@@ -1,86 +0,0 @@
-<definition width="50" version="0.4" hotspot_x="22" hotspot_y="20" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{2B73CC6D-DEB5-4282-9047-562CF6E57124}"/><names>
-        <name lang="es">Bomba circu-doble</name>
-        <name lang="ca">Bomba circu-doble</name>
-        <name lang="en">Pompe circulation double</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="-2.11229" x1="6.8" y2="-3.57049" x2="5.2"/>
-        <arc width="21.6" x="-9.2" y="-10.8615" antialias="true" height="11.6657" style="line-style:normal;line-weight:thin;filling:none;color:black" start="0" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="13.1989" x1="6" y2="11.7407" x2="4.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="-6.48691" x1="-5.2" y2="-6.48691" x2="-2.8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="8.82427" x1="-6" y2="8.82427" x2="-3.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="-2.84139" x1="-2.8" y2="-4.2996" x2="-1.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="12.4698" x1="-3.6" y2="11.0116" x2="-2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2.26234" x1="17.2" y2="2.26234" x2="19.6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1.53323" x1="-16.4" y2="1.53323" x2="-14"/>
-        <ellipse width="9.6" x="-2.8" y="-10.8615" antialias="true" height="8.02014" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="14.4" x="-5.2" y="-13.0488" antialias="true" height="12.3948" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.2" x="17.2" y="-2.11229" antialias="false" height="5.83283" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-0.654079" x1="17.2" y2="-0.654079" x2="19.6"/>
-        <ellipse width="3.2" x="0.4" y="-7.94512" antialias="true" height="2.91641" 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="-12.8544" x1="2" y2="-11.0722" x2="2"/>
-        <rect width="3.2" x="-16.4" y="-2.84139" antialias="false" height="5.83283" 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="-2.84139" x1="2" y2="-0.654079" x2="2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1.38318" x1="-16.4" y2="-1.38318" x2="-14"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-6.48691" x1="6.8" y2="-6.48691" 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="-10.1324" x1="5.2" y2="-11.5906" x2="6.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="-9.40332" x1="-2" y2="-10.8615" x2="-3.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="-12.3197" x1="-1.2" y2="-10.8615" x2="-0.4"/>
-        <ellipse width="9.6" x="-3.6" y="4.44965" antialias="true" height="8.02014" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-3.57049" x1="3.6" y2="-1.38318" x2="4.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="-10.8615" x1="3.6" y2="-12.3197" x2="4.4"/>
-        <ellipse width="14.4" x="-6" y="2.26234" antialias="true" height="12.3948" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-8.67422" x1="6" y2="-10.1324" x2="8.4"/>
-        <ellipse width="3.2" x="-0.4" y="7.36606" antialias="true" height="2.91641" 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="-7.21601" x1="6.8" y2="-7.21601" x2="8.4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="2.45677" x1="1.2" y2="4.23902" x2="1.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="-5.0287" x1="6" y2="-4.2996" x2="8.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="12.4698" x1="1.2" y2="14.6571" x2="1.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="8.82427" x1="6" y2="8.82427" x2="8.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="-8.67422" x1="-5.2" y2="-7.94512" x2="-2.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="5.17875" x1="4.4" y2="3.72054" x2="6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-4.2996" x1="-4.4" y2="-5.0287" x2="-2.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="5.90785" x1="-2.8" y2="4.44965" x2="-4.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="-1.38318" x1="-1.2" y2="-2.84139" x2="-0.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="-5.7578" x1="0.4" y2="-7.21601" x2="3.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="2.99144" x1="-2" y2="4.44965" x2="-1.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="11.7407" x1="2.8" y2="13.928" x2="3.6"/>
-        <arc width="17.6" x="-6.8" y="-14.507" antialias="true" height="13.1239" 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:thin;filling:none;color:black" y1="4.44965" x1="2.8" y2="2.99144" x2="3.6"/>
-        <arc width="15.2" x="-6.8" y="-15.2362" antialias="true" height="16.0403" 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="6.63696" x1="5.2" y2="5.17875" x2="7.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.09517" x1="6" y2="8.09517" x2="7.6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7.94512" x1="11.4399" y2="-7.94512" x2="13.3734"/>
-        <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="10.2825" x1="5.2" y2="11.0116" x2="7.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="6.63696" x1="-6" y2="7.36606" x2="-3.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="11.0116" x1="-5.2" y2="10.2825" x2="-3.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="13.928" x1="-2" y2="12.4698" x2="-1.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="9.55337" x1="-0.4" y2="8.09517" x2="2.8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10.2825" x1="11.3866" y2="10.2825" x2="12.6311"/>
-        <arc width="17.6" x="-7.6" y="0.804129" antialias="true" height="13.1239" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="15.2" x="-7.6" y="0.075025" antialias="true" height="16.0403" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <arc width="21.6" x="-10" y="4.44965" antialias="true" height="11.6657" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7.94512" x1="14" y2="-6.48691" x2="15.6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6.48691" x1="15.6" y2="-0.654079" x2="15.6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0.075025" x1="15.6" y2="0.075025" x2="17.2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10.2825" x1="12.4" y2="8.82427" x2="15.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="8.82427" x1="15.6" y2="2.99144" x2="15.6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2.26234" x1="17.2" y2="2.26234" x2="15.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="-4.2996" x1="12.4" y2="5.90785" x2="12.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="7.36606" x1="10" y2="7.36606" x2="11.6"/>
-        <polygon x4="-13.2" y5="-1.38318" x5="-13.2" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-8.67422" x1="-6.8" y2="-8.67422" x2="-9.2" y3="-2.11229" x3="-10.8" y4="-1.38318"/>
-        <polygon x4="-7.6" y5="10.2825" x5="-7.6" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0.804129" x1="-13.2" y2="2.26234" x2="-10.8" y3="10.2825" x3="-9.2" y4="10.2825"/>
-        <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="7.36606" x1="10.8" y2="5.90785" x2="12.4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-2.84139" x1="-6" y2="0.075025" 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="0.075025" x1="-9.2" y2="2.99144" x2="-6.8"/>
-        <rect width="3.2" x="1.2" y="-13.7779" antialias="false" height="2.91641" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="4.4" y5="-9.40332" x5="4.4" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-7.94512" x1="-1.2" y2="-9.40332" x2="2" y3="-7.21601" x3="1.2" y4="-9.40332"/>
-        <input x="-7.6" y="19.3963" size="4" rotate="true" text="_" tagg="label"/>
-        <terminal x="-16.4" y="0.075025" orientation="w"/>
-        <terminal x="20.4" y="0.804129" orientation="e"/>
-        <terminal x="2.8" y="-15.2362" orientation="n"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/bomba-cir-vertical.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/bomba-cir-vertical.elmt
deleted file mode 100644
index 470d1e614..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/bomba-cir-vertical.elmt
+++ /dev/null
@@ -1,31 +0,0 @@
-<definition width="50" version="0.4" hotspot_x="27" hotspot_y="21" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{83135876-F4A7-4826-946B-C6D50EC57AB5}"/><names>
-        <name lang="es">Bomba vertical</name>
-        <name lang="ca">Bomba vertical</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <arc width="19" x="-12" y="8" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <arc width="19" x="-12" y="5" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <rect width="1" x="-19" y="7" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6" x="7" y="8" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-10" x1="-2.5" y2="5" x2="-2.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="-10" x1="3.5" y2="5" x2="3.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-10" x1="-6.5" y2="5" x2="-6.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="-10" x1="0.5" y2="5" x2="0.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="-10" x1="-8.5" y2="5" x2="-8.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="5" y2="5" x2="5"/>
-        <rect width="6" x="-18" y="8" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-10" y2="5" x2="-10"/>
-        <rect width="3" x="-13" y="-9" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="-9" y5="-17" x5="4" y6="-16" x6="6" y7="-11" x7="6" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-11" x1="6" y2="-11" x2="-11" y3="-16" x3="-11" y4="-17"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-10" y2="5" x2="5"/>
-        <rect width="1" x="13" y="7" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-8" y="17.5" size="4" rotate="true" text="_" tagg="label"/>
-        <polygon x4="-4" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-4" x1="-8" y2="-6" x2="-6" y3="-4" x3="-6" y4="-7"/>
-        <terminal x="-19" y="10" orientation="w"/>
-        <terminal x="14" y="10" orientation="e"/>
-        <terminal x="-12" y="-7" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/chiller-2.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/chiller-2.elmt
deleted file mode 100644
index f099237ec..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/chiller-2.elmt
+++ /dev/null
@@ -1,56 +0,0 @@
-<definition width="130" version="0.4" hotspot_x="56" hotspot_y="45" height="60" link_type="simple" type="element" orientation="dyyy">
-<uuid uuid="{2F3EE972-4564-40B0-849F-68F2C83D8E8A}"/><names>
-        <name lang="es">Enfriadora-2</name>
-        <name lang="ca">Refredadora-2</name>
-    </names>
-    <informations></informations>
-    <description>
-        <rect width="3.00312" x="65.0396" y="5.39312" antialias="false" height="3.28965" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="12" x="22" y="-38" antialias="true" height="3" style="line-style:dashed;line-weight:thin;filling:none;color:black"/>
-        <rect width="4" x="-47" y="-17" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="12" x="54" y="-38" antialias="true" height="3" style="line-style:dashed;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="-2.2827" x1="-0.76533" y2="-2.2827" x2="69.5317"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-11.0551" x1="-0.76533" y2="-11.0551" x2="69.5317"/>
-        <polygon x4="67.9352" y5="-34.0827" x5="67.0133" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-34.0827" x1="36.5875" y2="-39.9251" x2="40.2755" y3="-39.9251" x3="64.2473" y4="-34.0827"/>
-        <rect width="3" x="-50" y="-19" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="-50" y2="-16" x2="-48"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-6.6689" x1="-0.76533" y2="-6.6689" x2="69.5317"/>
-        <ellipse width="12" x="39" y="-38" antialias="true" height="3" style="line-style:dashed;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="-14" x1="-50" y2="-14" x2="-48"/>
-        <rect width="3" x="51" y="-38" antialias="false" height="3" style="line-style:dashed;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="2.10347" x1="-0.76533" y2="2.10347" x2="69.5317"/>
-        <rect width="3.00312" x="-40.0427" y="5.39312" antialias="false" height="3.28965" 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="-17.6344" x1="-0.76533" y2="-17.6344" x2="69.5317"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-15.4413" x1="-0.76533" y2="-15.4413" x2="69.5317"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-19.8276" x1="-0.76533" y2="-19.8276" x2="69.5317"/>
-        <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="-24.2138" x1="-0.76533" y2="-24.2138" x2="69.5317"/>
-        <rect width="112.577" x="-43.0458" y="-34.0827" antialias="false" height="39.4758" 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="-0.0896" x1="-0.76533" y2="-0.0896" x2="69.5317"/>
-        <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.862" x1="-0.76533" y2="-8.862" x2="69.5317"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-34.0827" x1="-2.0031" y2="4.29657" x2="-2.0031"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-28.6" x1="-0.76533" y2="-28.6" x2="69.5317"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-13.2482" x1="-0.76533" y2="-13.2482" x2="69.5317"/>
-        <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.4758" x1="-0.76533" y2="-4.4758" x2="69.5317"/>
-        <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="-26.4069" x1="-0.76533" y2="-26.4069" x2="69.5317"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-22.0207" x1="-0.76533" y2="-22.0207" x2="69.5317"/>
-        <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="-30.7931" x1="-0.76533" y2="-30.7931" x2="69.5317"/>
-        <polygon x4="35.9352" y5="-34.0827" x5="35.0133" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-34.0827" x1="4.58753" y2="-39.9251" x2="8.27554" y3="-39.9251" x3="32.2473" y4="-34.0827"/>
-        <rect width="3.00312" x="11.0396" y="5.39312" antialias="false" height="3.28965" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="11.0115" x="-39.0417" y="-28.6" antialias="false" height="6.57931" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="4" x="-47" y="-2" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3" x="-50" y="-4" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="-50" y2="-1" x2="-48"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1" x1="-50" y2="1" x2="-48"/>
-        <polygon x4="-37" y5="-15" x5="-34" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-15" x1="-40" y2="-15" x2="-33" y3="-16" x3="-37" y4="-14"/>
-        <polygon x4="-34" y5="0" x5="-39" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="-32" y2="0" x2="-39" y3="-1" x3="-34" y4="1"/>
-        <polygon x4="35" y5="-33" x5="3" antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" closed="false" y1="-33" x1="3" y2="-29" x2="-1" y3="5" x3="31" y4="2"/>
-        <polygon x4="39" y5="2" x5="35" antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" closed="false" y1="2" x1="35" y2="-34" x2="66" y3="-31" x3="69" y4="5"/>
-        <ellipse width="12" x="7" y="-38" antialias="true" height="3" style="line-style:dashed;line-weight:thin;filling:none;color:black"/>
-        <rect width="3" x="19" y="-38" antialias="false" height="3" style="line-style:dashed;line-weight:thin;filling:none;color:black"/>
-        <polygon x4="-31" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-23" x1="-36" y2="-26" x2="-33" y3="-24" x3="-33" y4="-27"/>
-        <input x="-27" y="-8" size="4" rotate="true" text="Chiller_" tagg="label"/>
-        <terminal x="-35.0374" y="-29.6965" orientation="n"/>
-        <terminal x="-50" y="0" orientation="w"/>
-        <terminal x="-50" y="-15" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/chiller-3.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/chiller-3.elmt
deleted file mode 100644
index 2c3f35c0e..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/chiller-3.elmt
+++ /dev/null
@@ -1,63 +0,0 @@
-<definition width="90" version="0.4" hotspot_x="15" hotspot_y="62" height="80" link_type="simple" type="element" orientation="dyyy">
-<uuid uuid="{40565F15-DD57-47C4-A579-73E8304BE84A}"/><names>
-        <name lang="es">Enfriadora-3</name>
-        <name lang="ca">Refredadora-3</name>
-    </names>
-    <informations></informations>
-    <description>
-        <ellipse width="12" x="22" y="-56" antialias="true" height="3" style="line-style:dashed;line-weight:thin;filling:none;color:black"/>
-        <rect width="4" x="-5" y="-10" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="12" x="54" y="-56" antialias="true" height="3" style="line-style:dashed;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="-10.7267" x1="32.6" y2="-3.88857" x2="32.6"/>
-        <arc width="5.6" x="17.6" y="-12.6059" antialias="true" height="3.53531" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-180" angle="-180"/>
-        <arc width="5.6" x="27" y="-12.6059" antialias="true" height="3.53531" style="line-style:normal;line-weight:thin;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:thin;filling:none;color:black" y1="-11" x1="7.5" y2="-3" x2="7.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="-20.2827" x1="-0.76533" y2="-20.2827" x2="69.5317"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-29.0551" x1="-0.76533" y2="-29.0551" x2="69.5317"/>
-        <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="-10.7267" x1="23.2" y2="-3.88857" x2="23.2"/>
-        <rect width="3" x="-8" y="-12" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="67.9352" y5="-52.0827" x5="67.0133" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-52.0827" x1="36.5875" y2="-57.9251" x2="40.2755" y3="-57.9251" x3="64.2473" y4="-52.0827"/>
-        <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="-24.6689" x1="-0.76533" y2="-24.6689" x2="69.5317"/>
-        <line 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="-8" y2="-9" x2="-6"/>
-        <arc width="5.6" x="17.6" y="-5.53531" antialias="true" height="3.53531" style="line-style:normal;line-weight:thin;filling:none;color:black" start="0" angle="-180"/>
-        <ellipse width="12" x="39" y="-56" antialias="true" height="3" style="line-style:dashed;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="-7" x1="-8" y2="-7" x2="-6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-15.8965" x1="-0.76533" y2="-15.8965" x2="69.5317"/>
-        <rect width="3" x="51" y="-56" antialias="false" height="3" style="line-style:dashed;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="-10.7266" x1="17.6" y2="-3.8886" x2="17.6"/>
-        <rect width="3.00312" x="1.95735" y="9.39312" antialias="false" height="3.28965" 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="-35.6344" x1="-0.76533" y2="-35.6344" x2="69.5317"/>
-        <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="-33.4413" x1="-0.76533" y2="-33.4413" x2="69.5317"/>
-        <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="-37.8276" x1="-0.76533" y2="-37.8276" x2="69.5317"/>
-        <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="-42.2138" x1="-0.76533" y2="-42.2138" x2="69.5317"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-18.0896" x1="-0.76533" y2="-18.0896" x2="69.5317"/>
-        <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="-26.862" x1="-0.76533" y2="-26.862" x2="69.5317"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-46.6" x1="-0.76533" y2="-46.6" x2="69.5317"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-31.2482" x1="-0.76533" y2="-31.2482" x2="69.5317"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-22.4758" x1="-0.76533" y2="-22.4758" x2="69.5317"/>
-        <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="-44.4069" x1="-0.76533" y2="-44.4069" x2="69.5317"/>
-        <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.0207" x1="-0.76533" y2="-40.0207" x2="69.5317"/>
-        <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="-48.7931" x1="-0.76533" y2="-48.7931" x2="69.5317"/>
-        <polygon x4="35.9352" y5="-52.0827" x5="35.0133" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-52.0827" x1="4.58753" y2="-57.9251" x2="8.27554" y3="-57.9251" x3="32.2473" y4="-52.0827"/>
-        <rect width="3.00312" x="64.0396" y="9.39312" antialias="false" height="3.28965" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="-5" y="3" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3" x="-8" y="1" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="-8" y2="4" x2="-6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="-8" y2="6" x2="-6"/>
-        <polygon x4="35" y5="-51" x5="3" antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" closed="false" y1="-51" x1="3" y2="-47" x2="-1" y3="-13" x3="31" y4="-16"/>
-        <polygon x4="39" y5="-16" x5="35" antialias="false" style="line-style:dashed;line-weight:thin;filling:none;color:black" closed="false" y1="-16" x1="35" y2="-52" x2="66" y3="-49" x3="69" y4="-13"/>
-        <ellipse width="12" x="7" y="-56" antialias="true" height="3" style="line-style:dashed;line-weight:thin;filling:none;color:black"/>
-        <rect width="3" x="19" y="-56" antialias="false" height="3" style="line-style:dashed;line-weight:thin;filling:none;color:black"/>
-        <rect width="71" x="-1" y="-52" antialias="false" height="38" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="71" x="-1" y="-14" antialias="false" height="23" 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="-2" x1="0" y2="-2" x2="69"/>
-        <arc width="5.6" x="27" y="-5.53531" antialias="true" height="3.53531" style="line-style:normal;line-weight:thin;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="-10.7266" x1="27" y2="-3.8886" x2="27"/>
-        <rect width="4.2" x="4" y="-11" antialias="false" height="8" 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="-11" x1="5" y2="-3" x2="5"/>
-        <input x="35" y="-6" size="4" rotate="true" text="Chiller_" tagg="label"/>
-        <terminal x="-8" y="5" orientation="w"/>
-        <terminal x="-8" y="-8" orientation="w"/>
-        <terminal x="6" y="-12" orientation="n"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/colector-ida.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/colector-ida.elmt
deleted file mode 100644
index 41f88479c..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/colector-ida.elmt
+++ /dev/null
@@ -1,32 +0,0 @@
-<definition width="100" version="0.5" type="element" link_type="simple" hotspot_x="50" hotspot_y="14" orientation="dyyy" height="40">
-<uuid uuid="{8CBD63C5-F4FA-4CD2-B2BE-9CA2FEA0DC54}"/><names>
-        <name lang="es">Colector</name>
-        <name lang="ca">Col.lector</name>
-    </names>
-    <informations></informations>
-    <description>
-        <rect width="6" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="7" y="-9"/>
-        <rect width="6" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-12" y="-9"/>
-        <rect width="6" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="28" y="-9"/>
-        <rect width="6" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-3" y="12"/>
-        <arc width="8" angle="-180" antialias="true" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-44" y="-2" start="-90"/>
-        <arc width="8" angle="-180" antialias="true" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black" x="36" y="-2" start="90"/>
-        <rect width="14" antialias="false" height="1.23008" style="line-style:normal;line-weight:normal;filling:none;color:black" x="3" y="-10.2301"/>
-        <rect width="14" antialias="false" height="1.23008" style="line-style:normal;line-weight:normal;filling:none;color:black" x="24" y="-10.2301"/>
-        <rect width="14" antialias="false" height="1.23008" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-16" y="-10.2301"/>
-        <rect width="14" antialias="false" height="1.23008" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-7" y="17.7699"/>
-        <rect width="6" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-34" y="-9"/>
-        <rect width="14" antialias="false" height="1.23008" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-38" y="-10.2301"/>
-        <line y1="12" length1="1.5" y2="12" length2="1.5" x1="-41" x2="39" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="-2" length1="1.5" y2="-2" length2="1.5" x1="-40" x2="40" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input text="_" tagg="label" size="4" rotate="true" x="-7" y="9.5"/>
-        <input text="_" tagg="label" size="4" rotate="true" x="-34" y="10"/>
-        <terminal orientation="s" x="0" y="20"/>
-        <terminal orientation="n" x="-31" y="-10"/>
-        <terminal orientation="n" x="-10" y="-10"/>
-        <terminal orientation="n" x="10" y="-10"/>
-        <terminal orientation="n" x="30" y="-10"/>
-        <terminal orientation="w" x="-44" y="5"/>
-        <terminal orientation="e" x="43" y="5"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/colector-unico.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/colector-unico.elmt
deleted file mode 100644
index 0231e6d03..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/colector-unico.elmt
+++ /dev/null
@@ -1,44 +0,0 @@
-<definition width="220" version="0.5" type="element" link_type="simple" hotspot_x="109" hotspot_y="14" orientation="dyyy" height="40">
-<uuid uuid="{C64A664C-D959-483F-8EEF-694B4995A4D0}"/><names>
-        <name lang="es">Colector unico</name>
-        <name lang="ca">Col.lector únic</name>
-    </names>
-    <informations></informations>
-    <description>
-        <rect width="6" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" x="57" y="12"/>
-        <rect width="6" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="67" y="-9"/>
-        <rect width="6" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-52" y="-9"/>
-        <rect width="6" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="47" y="-9"/>
-        <rect width="14" antialias="false" height="1.23008" style="line-style:normal;line-weight:normal;filling:none;color:black" x="53" y="17.7699"/>
-        <rect width="6" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-72" y="-9"/>
-        <rect width="6" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-32" y="-9"/>
-        <rect width="6" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="87" y="-9"/>
-        <rect width="14" antialias="false" height="1.23008" style="line-style:normal;line-weight:normal;filling:none;color:black" x="63" y="-10.2301"/>
-        <rect width="6" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-63" y="12"/>
-        <rect width="14" antialias="false" height="1.23008" style="line-style:normal;line-weight:normal;filling:none;color:black" x="83" y="-10.2301"/>
-        <arc width="8" angle="-180" antialias="true" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-104" y="-2" start="-90"/>
-        <arc width="8" angle="-180" antialias="true" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black" x="97" y="-2" start="90"/>
-        <rect width="14" antialias="false" height="1.23008" style="line-style:normal;line-weight:normal;filling:none;color:black" x="43" y="-10.2301"/>
-        <rect width="6" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="27" y="-9"/>
-        <rect width="14" antialias="false" height="1.23008" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-56" y="-10.2301"/>
-        <rect width="14" antialias="false" height="1.23008" style="line-style:normal;line-weight:normal;filling:none;color:black" x="23" y="-10.2301"/>
-        <rect width="14" antialias="false" height="1.23008" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-36" y="-10.2301"/>
-        <rect width="14" antialias="false" height="1.23008" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-76" y="-10.2301"/>
-        <rect width="14" antialias="false" height="1.23008" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-67" y="17.7699"/>
-        <rect width="6" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-92" y="-9"/>
-        <rect width="14" antialias="false" height="1.23008" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-96" y="-10.2301"/>
-        <line y1="12" length1="1.5" y2="12" length2="1.5" x1="-99.4847" x2="100.358" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="-2" length1="1.5" y2="-2" length2="1.5" x1="-99.4869" x2="100.361" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input text="_" tagg="label" size="4" rotate="true" x="-15" y="10.5"/>
-        <terminal orientation="s" x="-60" y="20"/>
-        <terminal orientation="n" x="-90" y="-10"/>
-        <terminal orientation="n" x="-70" y="-10"/>
-        <terminal orientation="n" x="-50" y="-10"/>
-        <terminal orientation="n" x="-30" y="-10"/>
-        <terminal orientation="n" x="30" y="-10"/>
-        <terminal orientation="n" x="50" y="-10"/>
-        <terminal orientation="n" x="70" y="-10"/>
-        <terminal orientation="n" x="90" y="-10"/>
-        <terminal orientation="s" x="60" y="20"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/dep-inercia.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/dep-inercia.elmt
deleted file mode 100644
index 989159054..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/dep-inercia.elmt
+++ /dev/null
@@ -1,24 +0,0 @@
-<definition width="40" version="0.4" hotspot_x="19" hotspot_y="44" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{F5AEC3E6-DD8D-4110-849B-0D9C8A33E4BA}"/><names>
-        <name lang="es">Depósito inercial</name>
-        <name lang="ca">Depòsit inercial</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <arc width="31" x="-15" y="-35" antialias="true" height="11" 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="-29" x1="16" y2="21" x2="16"/>
-        <arc width="8" x="-7" y="23" antialias="true" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <arc width="31" x="-15" y="16" antialias="true" height="11" 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="-29" x1="-15" y2="21" x2="-15"/>
-        <polygon x4="9" y5="26.8383" x5="9" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="25" x1="12" y2="34.1912" x2="15" y3="34.1912" x3="13" y4="26.8383"/>
-        <rect width="3" x="-1" y="-39" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="7" x="-3" y="-40" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="-8" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="25" x1="-11" y2="34" x2="-14" y3="34" x3="-11" y4="27"/>
-        <arc width="4" x="-5" y="25" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <rect width="1" x="-5" y="28" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-8" y="-14" size="4" rotate="true" text="__ L." tagg="label"/>
-        <terminal x="1" y="-40" orientation="n"/>
-        <terminal x="-6" y="30" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/derivacion-te.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/derivacion-te.elmt
deleted file mode 100644
index 1fabf0817..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/derivacion-te.elmt
+++ /dev/null
@@ -1,16 +0,0 @@
-<definition hotspot_x="15" hotspot_y="14" width="30" type="element" version="0.4" height="20" link_type="simple" orientation="dyyy">
-<uuid uuid="{1C708EED-BBEC-45A8-8488-216F30436872}"/><names>
-        <name lang="es">Derivación-Te</name>
-        <name lang="ca">Derivació-Te</name>
-    </names>
-    <informations/>
-    <description>
-        <input rotate="true" text="Te" tagg="label" y="8" x="-1" size="6"/>
-        <circle style="line-style:normal;line-weight:normal;filling:black;color:black" y="-3" antialias="false" x="-3" diameter="6"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" y2="0" x2="0" end1="none" length1="1.5" y1="-10" x1="0"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" y2="0" x2="10" end1="none" length1="1.5" y1="0" x1="-10"/>
-        <terminal y="-10" x="0" orientation="n"/>
-        <terminal y="0" x="10" orientation="e"/>
-        <terminal y="0" x="-10" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/enfriadora-1.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/enfriadora-1.elmt
deleted file mode 100644
index 394dfdb70..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/enfriadora-1.elmt
+++ /dev/null
@@ -1,47 +0,0 @@
-<definition width="110" version="0.5" type="element" link_type="simple" hotspot_x="57" hotspot_y="39" orientation="dyyy" height="50">
-<uuid uuid="{96CE3BE3-CB93-4CB7-867D-B38C4601F80F}"/><names>
-        <name lang="es">Enfriadora-1+Módulo h</name>
-        <name lang="ca">Refredadora+Mòdul h</name>
-    </names>
-    <informations></informations>
-    <description>
-        <rect width="4" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-46" y="-22"/>
-        <line y1="-2.2827" length1="1.5" y2="-2.2827" length2="1.5" x1="-1.0031" x2="47.0468" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="3" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-49" y="-24"/>
-        <line y1="-11.0551" length1="1.5" y2="-11.0551" length2="1.5" x1="-1.0031" x2="47.0468" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="-21" length1="1.5" y2="-21" length2="1.5" x1="-49" x2="-47" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="-6.6689" length1="1.5" y2="-6.6689" length2="1.5" x1="-1.0031" x2="47.0468" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="2.10347" length1="1.5" y2="2.10347" length2="1.5" x1="-1.0031" x2="47.0468" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="-19" length1="1.5" y2="-19" length2="1.5" x1="-49" x2="-47" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.00312" antialias="false" height="3.28965" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-39.0427" y="5.39312"/>
-        <line y1="-17.6344" length1="1.5" y2="-17.6344" length2="1.5" x1="-1.0031" x2="47.0468" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="-15.4413" length1="1.5" y2="-15.4413" length2="1.5" x1="-1.0031" x2="47.0468" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="-19.8276" length1="1.5" y2="-19.8276" length2="1.5" x1="-1.0031" x2="47.0468" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="-24.2138" length1="1.5" y2="-24.2138" length2="1.5" x1="-1.0031" x2="47.0468" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="89.0926" antialias="true" height="39.4758" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-42.0458" y="-34.0827"/>
-        <line y1="-0.0896" length1="1.5" y2="-0.0896" length2="1.5" x1="-1.0031" x2="47.0468" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="-8.862" length1="1.5" y2="-8.862" length2="1.5" x1="-1.0031" x2="47.0468" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="-34.0827" length1="1.5" y2="4.29657" length2="1.5" x1="-1.0031" x2="-1.0031" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="-28.6" length1="1.5" y2="-28.6" length2="1.5" x1="-1.0031" x2="47.0468" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="-13.2482" length1="1.5" y2="-13.2482" length2="1.5" x1="-1.0031" x2="47.0468" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="-4.4758" length1="1.5" y2="-4.4758" length2="1.5" x1="-1.0031" x2="47.0468" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="-26.4069" length1="1.5" y2="-26.4069" length2="1.5" x1="-1.0031" x2="47.0468" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="-22.0207" length1="1.5" y2="-22.0207" length2="1.5" x1="-1.0031" x2="47.0468" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="-30.7931" length1="1.5" y2="-30.7931" length2="1.5" x1="-1.0031" x2="47.0468" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <polygon y1="-34.0827" closed="false" y2="-37.3724" y3="-37.3724" x1="7.0052" y4="-34.0827" x2="11.0094" y5="-34.0827" x3="37.0364" x4="41.0405" x5="40.0396" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.00312" antialias="false" height="3.28965" style="line-style:normal;line-weight:normal;filling:none;color:black" x="40.0396" y="5.39312"/>
-        <rect width="11.0115" antialias="false" height="6.57931" style="line-style:normal;line-weight:thin;filling:red;color:black" x="-38.0417" y="-28.6"/>
-        <rect width="4" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-46" y="-2"/>
-        <rect width="3" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-49" y="-4"/>
-        <line y1="-1" length1="1.5" y2="-1" length2="1.5" x1="-49" x2="-47" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="1" length1="1.5" y2="1" length2="1.5" x1="-49" x2="-47" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon y1="-15" closed="false" y2="-15" y3="-16" x1="-39" y4="-14" x2="-32" y5="-15" x3="-36" x4="-36" x5="-33" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon y1="0" closed="false" y2="0" y3="-1" x1="-31" y4="1" x2="-38" y5="0" x3="-33" x4="-33" x5="-38" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon y1="-24" closed="false" y2="-27" y3="-23" x1="-36" y4="-27" x2="-32" y5="-27" x3="-32" x4="-28" x5="-28" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:blue"/>
-        <line y1="-25" length1="1.5" y2="-27" length2="1.5" x1="-30" x2="-28" end1="none" end2="simple" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:blue"/>
-        <input text="Chiller_" tagg="label" size="4" rotate="true" x="-27" y="-8"/>
-        <terminal orientation="n" x="-30" y="-30"/>
-        <terminal orientation="w" x="-50" y="0"/>
-        <terminal orientation="w" x="-50" y="-20"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/enfriadora-2.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/enfriadora-2.elmt
deleted file mode 100644
index a4bd8b2e2..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/enfriadora-2.elmt
+++ /dev/null
@@ -1,24 +0,0 @@
-<definition width="50" version="0.5" type="element" link_type="simple" hotspot_x="35" hotspot_y="38" orientation="dyyy" height="60">
-<uuid uuid="{65B480EB-E1BB-4750-93E7-CA5E5A96E65A}"/><names>
-        <name lang="es">Enfriadora-2+ Módulo h</name>
-        <name lang="ca">Refredadora-2+Mòdul h</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="2.85" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-30.125" y="-11"/>
-        <rect width="5.7" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x="5.025" y="14"/>
-        <rect width="38.95" antialias="false" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-26.325" y="-27"/>
-        <rect width="21.85" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-13.975" y="-31"/>
-        <rect width="27.55" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-16.825" y="-32"/>
-        <rect width="5.7" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-22.525" y="14"/>
-        <line y1="-27" length1="1.5" y2="12" length2="1.5" x1="-15.875" x2="-15.875" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.85" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-30.125" y="9"/>
-        <rect width="5.7" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-24.425" y="-24"/>
-        <input text="Chiller_" tagg="label" size="4" rotate="true" x="-17.775" y="-6"/>
-        <polygon y1="-18" closed="false" y2="-20" y3="-18" x1="-24.425" y4="-21" x2="-21.575" y5="-21" x3="-21.575" x4="-18.725" x5="-18.725" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal orientation="w" x="-30.125" y="10"/>
-        <terminal orientation="w" x="-30.125" y="-10"/>
-        <terminal orientation="n" x="-20" y="-26"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/enfriadora-3.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/enfriadora-3.elmt
deleted file mode 100644
index 51c6ce345..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/enfriadora-3.elmt
+++ /dev/null
@@ -1,29 +0,0 @@
-<definition width="80" version="0.5" type="element" link_type="simple" hotspot_x="35" hotspot_y="38" orientation="dyyy" height="60">
-<uuid uuid="{9AF3BE02-E682-4578-8A0C-4A4853799B62}"/><names>
-        <name lang="es">Enfriadora-3+ Módulo h</name>
-        <name lang="ca">Refredadora-3+Mòdul h</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="14.95" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" x="22.8" y="-31"/>
-        <rect width="6" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x="33" y="14"/>
-        <rect width="3" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-30" y="-11"/>
-        <rect width="18.85" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x="20.85" y="-32"/>
-        <rect width="6" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x="11" y="14"/>
-        <rect width="68" antialias="false" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-27" y="-27"/>
-        <rect width="14.95" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-4.05" y="-31"/>
-        <rect width="18.85" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-6" y="-32"/>
-        <rect width="6" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-18" y="14"/>
-        <line y1="-27" length1="1.5" y2="12" length2="1.5" x1="-11" x2="-11" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-30" y="9"/>
-        <rect width="6" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-20" y="-24"/>
-        <polygon y1="-23" closed="false" y2="2" y3="-22" x1="-10" y4="-22" x2="12" x3="39" x4="39" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="2" length1="1.5" y2="2" length2="1.5" x1="-11" x2="40" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon y1="-19" closed="false" y2="-21" y3="-19" x1="-25" y4="-21" x2="-23" y5="-21" x3="-22" x4="-21" x5="-21" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input text="Chiller_" tagg="label" size="4" rotate="true" x="0" y="-19"/>
-        <terminal orientation="w" x="-30" y="10"/>
-        <terminal orientation="w" x="-30" y="-10"/>
-        <terminal orientation="n" x="-20" y="-27"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/enfriadora-agua-agua.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/enfriadora-agua-agua.elmt
deleted file mode 100644
index df68ab624..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/enfriadora-agua-agua.elmt
+++ /dev/null
@@ -1,64 +0,0 @@
-<definition width="70" version="0.5" type="element" link_type="simple" hotspot_x="38" hotspot_y="21" orientation="dyyy" height="50">
-<uuid uuid="{62F958FF-6CBB-414A-9421-4B84095304B8}"/><names>
-        <name lang="es">Enfriadora Agua-Agua</name>
-        <name lang="ca">Refredadora aigua-aigua</name>
-    </names>
-    <informations></informations>
-    <description>
-        <ellipse width="6.3" antialias="true" height="6.81482" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-19.325" y="12.5062"/>
-        <rect width="2.1" antialias="false" height="2.27161" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-28.825" y="19.1852"/>
-        <polygon y1="5.69134" closed="false" y2="5.69134" y3="9.09875" x1="12.175" x2="14.275" x3="14.275" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.31" antialias="false" height="2.27161" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-28.32" y="-8.8025"/>
-        <rect width="2.1" antialias="false" height="2.27161" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-28.825" y="10.5062"/>
-        <line y1="15.9136" length1="1.5" y2="15.9136" length2="1.5" x1="-17.225" x2="-15.125" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="3.91294" length1="1.5" y2="7.19365" length2="1.5" x1="-9.27125" x2="-9.27125" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="3.91295" length1="1.5" y2="7.19365" length2="1.5" x1="7.5025" x2="7.5025" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="3.91294" length1="1.5" y2="7.19365" length2="1.5" x1="-11.87" x2="-11.87" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="3.91294" length1="1.5" y2="7.19365" length2="1.5" x1="-10.4525" x2="-10.4525" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="5.67" antialias="false" height="2.65527" style="line-style:normal;line-weight:normal;filling:none;color:black" x="6.085" y="22.3447"/>
-        <line y1="-5.77695" length1="1.5" y2="-5.77695" length2="1.5" x1="-22.6304" x2="15.3845" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="3.91295" length1="1.5" y2="7.19365" length2="1.5" x1="8.92" x2="8.92" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc width="7.0686" angle="-180" antialias="true" height="9.15674" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-26.8993" y="-15.1731" start="-90"/>
-        <line y1="3.91295" length1="1.5" y2="7.19365" length2="1.5" x1="10.1013" x2="10.1013" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc width="4.94802" angle="-180" antialias="true" height="9.15674" style="line-style:normal;line-weight:normal;filling:none;color:black" x="13.6567" y="-15.1731" start="90"/>
-        <polygon y5="8.131" y6="9.06834" y7="9.06834" y8="8.131" y9="3.4443" y10="2.97555" y11="0.632264" y12="0.632264" y13="-0.305126" y14="-1.2424" y15="-1.2424" y16="-0.305126" y17="0.632264" x20="5.6125" y18="0.632264" x21="10.3375" y19="2.5069" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10.3375" x2="11.755" x3="11.755" x4="10.81" x5="5.14" y20="2.97555" x6="4.6675" y21="2.97555" x7="0.415" x8="-0.0575" x9="-0.0575" closed="false" x10="0.415" x11="0.415" antialias="false" x12="-0.0575" x13="-0.0575" x14="1.36" x15="4.6675" x16="5.6125" x17="5.6125" x18="5.14" x19="5.14" y1="2.97555" y2="3.91295" y3="6.72498" y4="8.131"/>
-        <rect width="5.67" antialias="false" height="2.65527" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-18.485" y="22.3447"/>
-        <arc width="7.56" angle="-180" antialias="true" height="12.3913" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-27.935" y="9.95344" start="-90"/>
-        <rect width="2.3625" antialias="false" height="0.937348" style="line-style:normal;line-weight:normal;filling:none;color:black" x="7.975" y="2.03824"/>
-        <line y1="-15.1731" length1="1.5" y2="-15.1731" length2="1.5" x1="-23.8295" x2="16.3467" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="5.292" angle="-180" antialias="true" height="12.3913" style="line-style:normal;line-weight:normal;filling:none;color:black" x="15.4405" y="9.95344" start="90"/>
-        <line y1="0.632264" length1="1.5" y2="0.632264" length2="1.5" x1="0.331" x2="4.75854" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <polygon y1="2.5069" closed="false" y2="3.4443" y3="4.38161" x1="3.7225" y4="2.97555" x2="1.8325" y5="2.03824" x3="2.305" y6="2.5069" x4="4.6675" x5="4.195" x6="3.7225" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="0.945" antialias="true" height="0.937348" style="line-style:normal;line-weight:normal;filling:none;color:black" x="2.305" y="7.19365"/>
-        <line y1="3.91295" length1="1.5" y2="7.19365" length2="1.5" x1="6.5575" x2="6.5575" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="2.97555" length1="1.5" y2="8.131" length2="1.5" x1="10.81" x2="10.81" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="22.3447" length1="1.5" y2="22.3447" length2="1.5" x1="-25.3133" x2="17.656" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="9.95344" length1="1.5" y2="9.95344" length2="1.5" x1="-24.6518" x2="18.3175" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon y5="8.131" y6="9.06834" y7="9.06834" y8="8.131" y9="3.44426" y10="2.9756" y11="0.63223" y12="0.63223" y13="-0.305115" y14="-1.24252" y15="-1.24252" y16="-0.305115" y17="0.63223" x20="-13.76" y18="0.63223" x21="-9.035" y19="2.50692" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-9.035" x2="-7.6175" x3="-7.6175" x4="-8.5625" x5="-14.2325" y20="2.9756" x6="-14.705" y21="2.9756" x7="-18.9575" x8="-19.43" x9="-19.43" closed="false" x10="-18.9575" x11="-18.9575" antialias="false" x12="-19.43" x13="-19.43" x14="-18.0125" x15="-14.705" x16="-13.76" x17="-13.76" x18="-14.2325" x19="-14.2325" y1="2.9756" y2="3.91294" y3="6.72498" y4="8.131"/>
-        <rect width="2.3625" antialias="false" height="0.937347" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-11.3975" y="2.03824"/>
-        <line y1="0.63223" length1="1.5" y2="0.63223" length2="1.5" x1="-19.0415" x2="-14.614" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <polygon y1="2.50692" closed="false" y2="3.44426" y3="4.38161" x1="-15.65" y4="2.9756" x2="-17.54" y5="2.03824" x3="-17.0675" y6="2.50692" x4="-14.705" x5="-15.1775" x6="-15.65" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="0.945" antialias="true" height="0.937347" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-17.0675" y="7.19365"/>
-        <line y1="3.91294" length1="1.5" y2="7.19365" length2="1.5" x1="-12.815" x2="-12.815" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="2.9756" length1="1.5" y2="8.131" length2="1.5" x1="-8.5625" x2="-8.5625" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon y1="1.47652" closed="false" y2="-4.1753" y3="-4.1753" x1="-15.125" y4="1.47652" x2="-0.425" y5="2.28393" x3="15.325" x4="4.825" x5="4.825" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.2" antialias="false" height="13.6296" style="line-style:normal;line-weight:normal;filling:none;color:black" x="16.375" y="-4.53089"/>
-        <line y1="-4.53089" length1="1.5" y2="9.09875" length2="1.5" x1="19.525" x2="19.525" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <polygon y1="5.69134" closed="false" y2="5.69134" y3="9.09875" x1="-7.775" x2="-5.675" x3="-5.675" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.31" antialias="false" height="2.27161" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-28.32" y="-15.4815"/>
-        <ellipse width="6.93" antialias="true" height="6.81482" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-19.545" y="-14.4815"/>
-        <line y1="-11.0741" length1="1.5" y2="-11.0741" length2="1.5" x1="-17.235" x2="-14.925" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="14.7778" length1="1.5" y2="17.0494" length2="1.5" x1="-16.175" x2="-16.175" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input text="Chiller_" tagg="label" size="4" rotate="true" x="-13.025" y="15.9136"/>
-        <line y1="-4.27052" length1="1.5" y2="-5.72948" length2="1.5" x1="15" x2="15" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="0" length1="1.5" y2="-4" length2="1.5" x1="2" x2="-5" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="-4" length1="1.5" y2="-4" length2="1.5" x1="-5" x2="-23" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="-4" length1="1.5" y2="-6" length2="1.5" x1="-23" x2="-23" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="0" length1="1.5" y2="-4" length2="1.5" x1="-18" x2="-23" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal orientation="e" x="21.625" y="-2.25929"/>
-        <terminal orientation="w" x="-29.475" y="-7.6667"/>
-        <terminal orientation="w" x="-30" y="10"/>
-        <terminal orientation="w" x="-29.875" y="20.321"/>
-        <terminal orientation="w" x="-29.475" y="-14.3457"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/enfriadoras.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/enfriadoras.elmt
deleted file mode 100644
index dfa4011f7..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/enfriadoras.elmt
+++ /dev/null
@@ -1,40 +0,0 @@
-<definition width="70" version="0.5" type="element" link_type="simple" hotspot_x="22" hotspot_y="39" orientation="dyyy" height="70">
-<uuid uuid="{BA5C72FD-910D-4215-8CD4-87C2D1AA16D0}"/><names>
-        <name lang="es">Enfriadora chalet</name>
-        <name lang="ca">Refredadora xalet</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <arc width="13.05" angle="-180" antialias="true" height="3.79569" style="line-style:normal;line-weight:normal;filling:none;color:black" x="2.3" y="8.02156" start="-180"/>
-        <arc width="13.05" angle="-180" antialias="true" height="3.79569" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-12.2" y="8.02156" start="-180"/>
-        <rect width="5.0025" antialias="false" height="2.53046" style="line-style:normal;line-weight:normal;filling:none;color:black" x="35.1425" y="8.49111"/>
-        <arc width="4.35" angle="-180" antialias="true" height="11.3871" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-0.6" y="-31.2005" start="-90"/>
-        <rect width="5.0025" antialias="false" height="1.26523" style="line-style:normal;line-weight:normal;filling:none;color:black" x="28.4725" y="25.7348"/>
-        <rect width="51.6925" antialias="false" height="61.9962" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-16.55" y="-36.2615"/>
-        <arc width="4.35" angle="-180" antialias="true" height="11.3871" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-0.6" y="-2.10027" start="-90"/>
-        <arc width="4.35" angle="-180" antialias="true" height="11.3871" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-0.6" y="10.552" start="-90"/>
-        <arc width="4.35" angle="-180" antialias="true" height="11.3871" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-0.6" y="-18.5482" start="-90"/>
-        <ellipse width="30.45" antialias="true" height="26.5698" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-13.65" y="-3.3655"/>
-        <arc width="4.35" angle="-180" antialias="true" height="11.3871" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-0.6" y="10.552" start="90"/>
-        <arc width="13.05" angle="-180" antialias="true" height="3.79569" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-12.2" y="8.02156" start="0"/>
-        <arc width="4.35" angle="-180" antialias="true" height="11.3871" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-0.6" y="-2.10027" start="90"/>
-        <arc width="13.05" angle="-180" antialias="true" height="3.79569" style="line-style:normal;line-weight:normal;filling:none;color:black" x="2.3" y="-21.0787" start="-180"/>
-        <arc width="13.05" angle="-180" antialias="true" height="3.79569" style="line-style:normal;line-weight:normal;filling:none;color:black" x="2.3" y="8.02156" start="0"/>
-        <arc width="13.05" angle="-180" antialias="true" height="3.79569" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-12.2" y="-21.0787" start="-180"/>
-        <arc width="4.35" angle="-180" antialias="true" height="11.3871" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-0.6" y="-18.5482" start="90"/>
-        <ellipse width="30.45" antialias="true" height="26.5698" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-13.65" y="-32.4658"/>
-        <arc width="13.05" angle="-180" antialias="true" height="3.79569" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-12.2" y="-21.0787" start="0"/>
-        <arc width="4.35" angle="-180" antialias="true" height="11.3871" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-0.6" y="-31.2005" start="90"/>
-        <arc width="13.05" angle="-180" antialias="true" height="3.79569" style="line-style:normal;line-weight:normal;filling:none;color:black" x="2.3" y="-21.0787" start="0"/>
-        <line y1="-36.2615" length1="1.5" y2="24.4695" length2="1.5" x1="19.7" x2="19.7" end1="none" end2="none" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5.0025" antialias="false" height="2.53046" style="line-style:normal;line-weight:normal;filling:none;color:black" x="35.1425" y="18.1434"/>
-        <rect width="6.67" antialias="false" height="2.53046" style="line-style:normal;line-weight:thin;filling:none;color:black" x="26.805" y="-21.0787"/>
-        <rect width="4.35" antialias="false" height="1.26523" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-15.1" y="25.7348"/>
-        <polygon y1="-14.7526" closed="false" y2="-17.283" y3="-14.7526" x1="26.805" y4="-18.5482" x2="28.4725" x3="30.14" x4="31.8075" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input text="Chiller_" tagg="label" size="4" rotate="true" x="-18" y="-41.3224"/>
-        <terminal orientation="e" x="40" y="20"/>
-        <terminal orientation="e" x="40" y="10"/>
-        <terminal orientation="e" x="30" y="-20"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/fancoil-bajo.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/fancoil-bajo.elmt
deleted file mode 100644
index bc51a0469..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/fancoil-bajo.elmt
+++ /dev/null
@@ -1,63 +0,0 @@
-<definition hotspot_x="44" hotspot_y="43" width="120" type="element" version="0.5" height="60" link_type="simple" orientation="dyyy">
-<uuid uuid="{B090FB83-FD22-4D81-B9D8-133F69764591}"/><names>
-        <name lang="ca">Fancoil habitació</name>
-        <name lang="es">Fancoil habitación</name>
-    </names>
-    <informations></informations>
-    <description>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-29" y2="11" end1="none" x1="-21" y1="11" length1="1.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="9" width="6" antialias="false" height="2" x="-38"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-29" y2="1" end1="none" x1="-21" y1="1" length1="1.5"/>
-        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" width="3.20345" y="-10.5998" antialias="true" height="0.942723" x="25.1575"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="9" width="2" angle="-180" antialias="true" height="2" x="-21" start="90"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="53.7301" y2="-6.73647" end1="none" x1="51.2742" y1="-17.7281" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-29.7714" y2="9" end1="none" x1="-20.2476" y1="9" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="51.2742" y2="-4.29389" end1="none" x1="48.8182" y1="-15.2855" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="63.5541" y2="-15.2855" end1="none" x1="61.0981" y1="-26.2772" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="58.6421" y2="-11.6216" end1="none" x1="56.1861" y1="-22.6133" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="61.0981" y2="-14.0642" end1="none" x1="58.6421" y1="-25.0559" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="56.1861" y2="-9.17906" end1="none" x1="53.7301" y1="-20.1707" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="48.8182" y2="-3.07259" end1="none" x1="46.3622" y1="-14.0642" length1="1.5"/>
-        <polygon y4="-8.73647" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="24.2584" y2="-11.1791" x5="32.8543" y3="-8.73647" y5="-11.1791" x4="29.1703" closed="false" x1="31.6263" y1="-11.1791" x3="20.5744"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.4004" width="3.68397" antialias="false" height="18.3194" x="37.7663"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="46.3622" y2="-0.630004" end1="none" x1="43.9062" y1="-11.6216" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="37.7663" y2="-12.8429" end1="none" x1="68.466" y1="-39.7114" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="41.4502" y2="7.91905" end1="none" x1="72.15" y1="-18.9494" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="37.9943" y2="-10.4004" end1="none" x1="68.694" y1="-37.2688" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="41.4502" y2="-10.4004" end1="none" x1="72.15" y1="-37.2688" length1="1.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-10.4004" width="3.68397" antialias="false" height="9.3194" x="-27.3172"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-23.6333" y2="-12.8429" end1="none" x1="7.0665" y1="-39.7114" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="68.466" y2="-15.2855" end1="none" x1="37.7663" y1="11.5829" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="68.466" y2="-39.7114" end1="none" x1="7.0665" y1="-39.7114" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="68.466" y2="-37.2688" end1="none" x1="68.466" y1="-39.7114" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="72.15" y2="-37.2688" end1="none" x1="68.466" y1="-37.2688" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="72.15" y2="-18.9494" end1="none" x1="72.15" y1="-37.2688" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="67.6601" y2="-18.9494" end1="none" x1="71.9398" y1="-18.9494" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="3.38252" y2="-37.2688" end1="none" x1="-27.3172" y1="-10.4004" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="41.4502" y2="3.03388" end1="none" x1="67.238" y1="-18.9494" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="64.7821" y2="-29.9411" end1="none" x1="67.238" y1="-19.3551" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="64.7821" y2="-17.7281" end1="none" x1="62.3261" y1="-28.7198" length1="1.5"/>
-        <polygon y4="-8.73647" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-19.9493" y2="-11.1791" x5="-11.3534" y3="-8.73647" y5="-11.1791" x4="-15.0373" closed="false" x1="-12.5814" y1="-11.1791" x3="-23.6333"/>
-        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" width="2.45598" y="7.91905" antialias="true" height="2.44259" x="-15.0373"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-7.13814" width="8.59593" antialias="false" height="4.88517" x="-11.8974"/>
-        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" width="3.20345" y="-10.5998" antialias="true" height="0.94272" x="-19.8425"/>
-        <polygon y7="-4.89307" x4="0" y3="-9.78639" antialias="false" x3="-9" y4="-9.78639" x2="-12" x1="-12" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="-3" x7="0" y5="-7.33973" x5="-3" closed="false" y8="-8.97084" x9="0" y2="-7.33973" x8="0" y6="-2.44641" y1="-7.33973" y9="-9.78639"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-1" width="2" angle="-180" antialias="true" height="2" x="-21" start="90"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-29.7792" y2="-1" end1="none" x1="-20.2392" y1="-1" length1="1.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8" width="4" antialias="false" height="5" x="-33"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-2" width="2" antialias="false" height="13" x="-32"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-1" width="6" antialias="false" height="2" x="-38"/>
-        <polygon y4="-13" x6="-24" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-24" y2="12" x5="-24" y3="12" y5="-13" x4="38" y6="-1" closed="false" x1="-24" y1="6" x3="38"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-24" y2="6.32446" end1="none" x1="-24" y1="1.67554" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="-29.5778" y2="-5" end1="none" x1="-32.4667" y1="-5" length1="1.5"/>
-        <polygon y4="-5" x6="-12" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" x2="-23" y2="-6" x5="-12" y3="-7" y5="-5" x4="-17" y6="-5" closed="false" x1="-29" y1="-8" x3="-19"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-27" y2="8.81818" end1="none" x1="-27" y1="1.18182" length1="1.5"/>
-        <input rotate="true" text="fan-coil_" tagg="label" y="5" x="7" size="4"/>
-        <terminal y="-10" x="-8" orientation="n"/>
-        <terminal y="-16" x="55" orientation="e"/>
-        <terminal y="-25" x="-15" orientation="w"/>
-        <terminal y="10" x="-39" orientation="w"/>
-        <terminal y="0" x="-39" orientation="w"/>
-        <terminal y="11.5829" x="-13.8093" orientation="s"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/fancoil-cassette.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/fancoil-cassette.elmt
deleted file mode 100644
index 5c96307cd..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/fancoil-cassette.elmt
+++ /dev/null
@@ -1,42 +0,0 @@
-<definition hotspot_x="35" hotspot_y="27" width="90" type="element" version="0.5" height="50" link_type="simple" orientation="dyyy">
-<uuid uuid="{684AF4E0-E89F-4CBC-8200-BFEFDDE3D6EE}"/><names>
-        <name lang="ca">Fancoil Cassette</name>
-        <name lang="es">Fancoil Cassette</name>
-    </names>
-    <informations></informations>
-    <description>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="44" y2="17" end1="none" x1="-11" y1="17" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="41" y2="15" end1="none" x1="35" y1="10" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="42" y2="15" end1="none" x1="36" y1="10" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-16" y2="15" end1="none" x1="-22" y1="10" length1="1.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-0.594096" width="7.07266" antialias="false" height="2.33948" x="-30.119"/>
-        <polygon y4="5" x6="26" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-32" y2="4" x5="34" y3="5" y5="4" x4="34" y6="3" closed="false" x1="-24" y1="3" x3="-32"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-11.2915" width="7.07266" antialias="false" height="2.33948" x="-30.119"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-15" y2="19" end1="none" x1="-32" y1="5" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="52" y2="19" end1="none" x1="34" y1="4" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="51.981" y2="19" end1="none" x1="-14.9825" y1="19" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="45" y2="12.3246" end1="none" x1="45" y1="-2.29961" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="45" y2="-3" end1="none" x1="31" y1="-14" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="33" y2="8" end1="none" x1="-22" y1="8" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-15" y2="15" end1="none" x1="-21" y1="10" length1="1.5"/>
-        <polygon y4="10" style="line-style:normal;line-weight:normal;filling:black;color:black" antialias="false" x2="-11" y2="15" x5="-17" y3="15" y5="10" x4="31" x1="-17" y1="10" x3="37"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-20" y2="2" end1="none" x1="-20" y1="-17" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="31" y2="3" end1="none" x1="31" y1="-14" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="22" y2="3" end1="none" x1="22" y1="-17" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-23" y2="-13" end1="none" x1="-23" y1="3" length1="1.5"/>
-        <polygon y4="-14" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-20" y2="-18" x5="31" y3="-18" y5="-14" x4="31" closed="false" x1="-23" y1="-14" x3="22"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="27" y2="3" end1="none" x1="-23" y1="3" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="49" y2="-2" end1="none" x1="46" y1="-2" length1="1.5"/>
-        <polygon y4="-16" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="30" y2="-14" y3="-17" x4="25" closed="false" x1="25" y1="-16" x3="28"/>
-        <polygon y4="-15" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-20.6" y2="-16.6254" y3="-18.2508" x4="-21.95" closed="false" x1="-21.95" y1="-15" x3="-26"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" y="-6" antialias="true" x="34" diameter="3"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="37" y2="-5" end1="none" x1="35" y1="-3" length1="1.5"/>
-        <input rotate="true" text="Fancoil" tagg="label" y="-6" x="-11" size="4"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-9.78229" width="1.53633" antialias="false" height="9.01845" x="-27.3508"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-15" width="3" antialias="false" height="4" x="-28"/>
-        <terminal y="0" x="-30" orientation="w"/>
-        <terminal y="-7" x="42" orientation="e"/>
-        <terminal y="-10" x="-30" orientation="w"/>
-        <terminal y="-22" x="-14" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/fancoil-conductos.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/fancoil-conductos.elmt
deleted file mode 100644
index 41bfa5894..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/fancoil-conductos.elmt
+++ /dev/null
@@ -1,65 +0,0 @@
-<definition hotspot_x="45" hotspot_y="69" width="120" type="element" version="0.5" height="80" link_type="simple" orientation="dyyy">
-<uuid uuid="{FB9B19F9-9DDB-40E8-B083-446EF809E30E}"/><names>
-        <name lang="ca">Fancoil conductes</name>
-        <name lang="es">Fancoil conductos</name>
-    </names>
-    <informations></informations>
-    <description>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-30" y2="0.88665" end1="none" x1="-22" y1="0.88665" length1="1.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-1.9345" width="6" antialias="false" height="2.82115" x="-39"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-30" y2="-9.16623" end1="none" x1="-22" y1="-9.16623" length1="1.5"/>
-        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" width="3.20345" y="-24.7074" antialias="true" height="1.32978" x="24.1575"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4.9345" width="2" angle="-180" antialias="true" height="2.82115" x="-22" start="90"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="52.7301" y2="-20.0791" end1="none" x1="50.2742" y1="-35.5836" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-30.7714" y2="-1.9345" end1="none" x1="-21.2476" y1="-1.9345" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="50.2742" y2="-16.6337" end1="none" x1="47.8182" y1="-32.1382" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="62.5541" y2="-32.1382" end1="none" x1="60.0981" y1="-47.6428" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="57.6421" y2="-26.9699" end1="none" x1="55.1861" y1="-42.4746" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="60.0981" y2="-30.4154" end1="none" x1="57.6421" y1="-45.92" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="55.1861" y2="-23.5246" end1="none" x1="52.7301" y1="-39.0291" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="47.8182" y2="-14.9109" end1="none" x1="45.3622" y1="-30.4154" length1="1.5"/>
-        <polygon y4="-22.0791" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="23.2584" y2="-25.5246" x5="31.8543" y3="-22.0791" y5="-25.5246" x4="28.1703" closed="false" x1="30.6263" y1="-25.5246" x3="19.5744"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-25.2474" width="3.68397" antialias="false" height="25.8409" x="36.7663"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="45.3622" y2="-11.4655" end1="none" x1="42.9062" y1="-26.9699" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="36.7663" y2="-28.6927" end1="none" x1="67.466" y1="-66.5927" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="40.4502" y2="0.59361" end1="none" x1="71.15" y1="-37.3064" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="36.9943" y2="-25.2474" end1="none" x1="67.694" y1="-63.1473" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="40.4502" y2="-25.2474" end1="none" x1="71.15" y1="-63.1473" length1="1.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-25.2474" width="3.68397" antialias="false" height="13.1457" x="-28.3172"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-24.6333" y2="-28.6927" end1="none" x1="6.0665" y1="-66.5927" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="67.466" y2="-32.1382" end1="none" x1="36.7663" y1="5.7617" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="67.466" y2="-66.5927" end1="none" x1="6.0665" y1="-66.5927" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="67.466" y2="-63.1473" end1="none" x1="67.466" y1="-66.5927" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="71.15" y2="-63.1473" end1="none" x1="67.466" y1="-63.1473" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="71.15" y2="-37.3064" end1="none" x1="71.15" y1="-63.1473" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="66.6601" y2="-37.3064" end1="none" x1="70.9398" y1="-37.3064" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="2.38252" y2="-63.1473" end1="none" x1="-28.3172" y1="-25.2474" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="40.4502" y2="-6.29729" end1="none" x1="66.238" y1="-37.3064" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="63.7821" y2="-52.811" end1="none" x1="66.238" y1="-37.8786" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="63.7821" y2="-35.5836" end1="none" x1="61.3261" y1="-51.0882" length1="1.5"/>
-        <polygon y4="-23.0791" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-20.9493" y2="-26.5246" x5="-12.3534" y3="-23.0791" y5="-26.5246" x4="-16.0373" closed="false" x1="-13.5814" y1="-26.5246" x3="-24.6333"/>
-        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" width="2.45598" y="0.59361" antialias="true" height="3.44546" x="-16.0373"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-20.6457" width="8.59593" antialias="false" height="6.8909" x="-12.8974"/>
-        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" width="3.20345" y="-25.7074" antialias="true" height="1.32978" x="-20.8425"/>
-        <polygon y7="-17.4788" x4="-1" y3="-24.3812" antialias="false" x3="-10" y4="-24.3812" x2="-13" x1="-13" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="-4" x7="-1" y5="-20.93" x5="-4" closed="false" y8="-23.2309" x9="-1" y2="-20.93" x8="-1" y6="-14.0276" y1="-20.93" y9="-24.3812"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-11.9874" width="2" angle="-180" antialias="true" height="2.82115" x="-22" start="90"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-30.7792" y2="-11.9874" end1="none" x1="-21.2392" y1="-11.9874" length1="1.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-19.8614" width="4" antialias="false" height="7.05288" x="-34"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-13.398" width="2" antialias="false" height="14.2846" x="-33"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-11.9874" width="6" antialias="false" height="2.82115" x="-39"/>
-        <polygon y4="-28.9143" x6="-25" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-25" y2="6.3501" x5="-25" y3="6.3501" y5="-28.9143" x4="37" y6="-11.9874" closed="false" x1="-25" y1="-2.11335" x3="37"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-25" y2="-2.82424" end1="none" x1="-25" y1="-8.68707" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="-30.5778" y2="-15.6297" end1="none" x1="-33.4667" y1="-15.6297" length1="1.5"/>
-        <polygon y4="-14.8085" x6="-13" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" x2="-24" y2="-16.2191" x5="-13" y3="-17.6297" y5="-14.8085" x4="-18" y6="-14.8085" closed="false" x1="-30" y1="-19.0403" x3="-20"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-28" y2="-2.26402" end1="none" x1="-28" y1="-8.83671" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-28" y2="3.5672" end1="none" x1="-28" y1="1.43782" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-25" y2="3.52895" end1="none" x1="-28" y1="3.52895" length1="1.5"/>
-        <input rotate="true" text="Fan-coil_" tagg="label" y="-7" x="1" size="4"/>
-        <terminal y="0" x="-40" orientation="w"/>
-        <terminal y="-10.5768" x="-40" orientation="w"/>
-        <terminal y="5.7617" x="-14.8093" orientation="s"/>
-        <terminal y="-24.6826" x="-9" orientation="n"/>
-        <terminal y="-33.146" x="54" orientation="e"/>
-        <terminal y="-45.8412" x="-16" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/fancoil-pared.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/fancoil-pared.elmt
deleted file mode 100644
index 5ef753416..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/fancoil-pared.elmt
+++ /dev/null
@@ -1,40 +0,0 @@
-<definition hotspot_x="38" hotspot_y="17" width="70" type="element" version="0.5" height="40" link_type="simple" orientation="dyyy">
-<uuid uuid="{E9C7B52B-871C-4110-9E7E-CAF5C793E732}"/><names>
-        <name lang="ca">Fancoil paret</name>
-        <name lang="es">Fancoil pared</name>
-    </names>
-    <informations></informations>
-    <description>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="7" width="6" antialias="false" height="4" x="-30"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="16.5" y2="-1.15597" end1="none" x1="13.7" y1="-5.00252" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="20.7" y2="-0.51488" end1="none" x1="17.9" y1="-4.36143" length1="1.5"/>
-        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" width="2" y="7" antialias="false" height="4" x="-31"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="12.3" y2="-2.43816" end1="none" x1="9.5" y1="-6.2847" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="6.7" y2="-3.72034" end1="none" x1="3.9" y1="-7.56688" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="0.4" y2="-5.64361" end1="none" x1="-2.4" y1="-9.4901" length1="1.5"/>
-        <polygon y7="-12.0545" x4="-12.9" y3="11.0247" antialias="false" x3="-20.6" y4="6.53711" x2="-26.9" x1="-26.9" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="-10.1" x7="-12.9" y5="2.69057" x11="-26.9" x5="-10.1" y10="-12.0545" closed="false" y8="-13.9778" x9="-23.4" y11="-10.1312" y2="11.0247" x8="-19.2" x10="-26.9" y6="-8.208" y1="-10.1312" y9="-13.9778"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="15.1" y2="-5.00252" end1="none" x1="-19.2" y1="-13.9778" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="24.2" y2="0.7673" end1="none" x1="-10.1" y1="-8.208" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="23.5" y2="11.6658" end1="none" x1="-10.1" y1="2.69057" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="21.4" y2="15.5124" end1="none" x1="-12.9" y1="6.53711" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="13.7" y2="20" end1="none" x1="-20.6" y1="11.0247" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="7.4" y2="20" end1="none" x1="-26.9" y1="11.0247" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="21.4" y2="-3.07925" end1="none" x1="15.1" y1="-5.00252" length1="1.5"/>
-        <polygon y4="15.5124" x6="18.6" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="24.9" y2="0.7673" x5="18.6" y3="11.6658" y5="18.0767" x4="22.1" y6="18.0767" closed="false" x1="21.4" y1="-3.07925" x3="24.9"/>
-        <polygon y4="19.3589" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="13.7" y2="20" y3="19.3589" x4="15.8" closed="false" x1="7.4" y1="20" x3="15.8"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-19.2" y2="11.6658" end1="none" x1="-12.2" y1="7.1782" length1="1.5"/>
-        <polygon y4="14.2302" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-14.3" y2="11.6658" y3="20" x4="15.8" closed="false" x1="-15" y1="9.10147" x3="19.3"/>
-        <polygon y4="3.33166" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" x2="23.5" y2="8.46038" x5="23.5" y3="7.81929" y5="3.97275" x4="20.7" closed="false" x1="23.5" y1="3.97275" x3="20.7"/>
-        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" width="1.4" y="12.948" antialias="true" height="0.64109" x="20.7"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="-6.6" y2="-7.56688" end1="none" x1="-9.4" y1="-11.4134" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="17.9" y2="16.7945" end1="none" x1="20" y1="15.5124" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="11.6" y2="19.3589" end1="none" x1="13.7" y1="18.7178" length1="1.5"/>
-        <input rotate="true" text="Fancoil" tagg="label" y="1.5" x="-9" size="4"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-2" width="6" antialias="false" height="4" x="-31"/>
-        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" width="2" y="-2" antialias="false" height="4" x="-32"/>
-        <terminal y="0" x="-30" orientation="w"/>
-        <terminal y="15" x="-16" orientation="s"/>
-        <terminal y="7.1782" x="22.1" orientation="s"/>
-        <terminal y="10" x="-30" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/fancoil-suelo.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/fancoil-suelo.elmt
deleted file mode 100644
index 9eb38f204..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/fancoil-suelo.elmt
+++ /dev/null
@@ -1,35 +0,0 @@
-<definition hotspot_x="25" hotspot_y="38" width="50" type="element" version="0.5" height="70" link_type="simple" orientation="dyyy">
-<uuid uuid="{39920157-6959-4072-8B05-8C5BC5D7AFD4}"/><names>
-        <name lang="ca">Fancoil sol</name>
-        <name lang="es">Fancoil Suelo</name>
-    </names>
-    <informations></informations>
-    <description>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="18" width="3" angle="-180" antialias="true" height="4" x="-19" start="-90"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="20" y2="2.20976" end1="none" x1="1.485" y1="15.0265" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="20" y2="-0.05201" end1="none" x1="1.485" y1="12.7647" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-13" y2="22" end1="none" x1="-17" y1="22" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-13" y2="18" end1="none" x1="-17" y1="18" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="20" y2="4.47154" end1="none" x1="1.485" y1="17.2883" length1="1.5"/>
-        <polygon y4="-15.1305" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="16.78" y2="-28.7011" x5="13.56" y3="-14.3766" y5="-27.9472" x4="-4.15" closed="false" x1="13.56" y1="-27.9472" x3="-2.54"/>
-        <polygon y4="-15.8844" x6="-0.125" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-13.005" y2="22.5657" x5="-0.125" y3="-15.8844" y5="-10.6069" x4="-8.175" y6="22.5657" closed="false" x1="-0.125" y1="22.5657" x3="-13.005"/>
-        <polygon y4="-26.4394" x6="-0.125" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="8.73" y2="-31.7168" x5="21.61" y3="-31.7168" y5="6.7333" x4="21.61" y6="22.5657" closed="false" x1="-13.005" y1="-15.8844" x3="13.56"/>
-        <polygon y4="-4.57555" x6="1.485" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="1.485" y2="19.55" x5="1.485" y3="5.97943" y5="8.2411" x4="20" y6="9.749" closed="false" x1="1.485" y1="9.749" x3="20"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="20" y2="-2.31378" end1="none" x1="1.485" y1="10.5029" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="21.61" y2="-25.6854" end1="none" x1="-0.125" y1="-9.85302" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="20.805" y2="-27.1932" end1="none" x1="-0.93" y1="-11.3609" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" x2="13.56" y2="-31.7168" end1="none" x1="-8.175" y1="-15.8844" length1="1.5"/>
-        <polygon y4="-29.4551" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-0.125" y2="-12.1148" x5="-4.955" y3="-26.4394" y5="-15.1305" x4="14.365" closed="false" x1="-4.955" y1="-15.1305" x3="19.195"/>
-        <polygon y4="-13.6226" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="19.195" y2="-27.1932" x5="15.975" y3="-12.8687" y5="-26.4394" x4="-1.735" closed="false" x1="15.975" y1="-26.4394" x3="-0.125"/>
-        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" width="2.415" y="18.7961" antialias="true" height="2.26177" x="-10.59"/>
-        <input rotate="true" text="Ud_" tagg="label" y="-3.60548" x="-1.735" size="4"/>
-        <rect style="line-style:normal;line-weight:thin;filling:none;color:black" y="-10.8531" width="3.45" antialias="false" height="5.57509" x="-9.785"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="8" width="3" angle="-180" antialias="true" height="4" x="-19" start="-90"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-13" y2="12" end1="none" x1="-17" y1="12" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-13" y2="8" end1="none" x1="-17" y1="8" length1="1.5"/>
-        <terminal y="23.7125" x="-5.185" orientation="s"/>
-        <terminal y="10" x="-20" orientation="w"/>
-        <terminal y="-11.9681" x="-8.635" orientation="n"/>
-        <terminal y="20" x="-20" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/grupo-llenado.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/grupo-llenado.elmt
deleted file mode 100644
index 327c62e9a..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/grupo-llenado.elmt
+++ /dev/null
@@ -1,24 +0,0 @@
-<definition orientation="dyyy" link_type="simple" ic="true" type="element" hotspot_x="24" hotspot_y="27" width="50" height="40" version="0.4">
-<uuid uuid="{8AF173DC-4579-4C70-917A-1DDD4421620F}"/><names>
-        <name lang="es">Grupo de llenado</name>
-        <name lang="ca">Grup d'ompliment</name>
-    </names>
-    <informations/>
-    <description>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-4.86528" width="5.25" height="6.42404" x="15.8"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-6.15008" width="12.6" height="8.99365" x="-13.6"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-8.7197" width="5.25" height="2.56961" x="-9.4"/>
-        <line x2="-0.531143" y2="-13.8589" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" length2="1.5" y1="-13.8589" x1="-7.73279" length1="1.5" end1="none"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-4.86528" width="5.25" height="6.42404" x="-18.85"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-4.86528" width="5.25" height="6.42404" x="-1"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="-6.15008" width="11.55" height="10.2785" x="4.25"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y="4.12838" width="5.25" height="2.56961" x="7.4"/>
-        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" y="-20.283" width="8.4" height="10.2785" x="6.35"/>
-        <text size="6" text="P" y="-11.2893" x="8.45"/>
-        <line x2="9.5" y2="-6.15008" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" length2="1.5" y1="-10.0045" x1="9.5" length1="1.5" end1="none"/>
-        <line x2="-6.796" y2="-8.7197" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" length2="1.5" y1="-13.8589" x1="-6.796" length1="1.5" end1="none"/>
-        <input size="5" text="Ø_" tagg="label" y="13.122" rotate="true" x="-6.25"/>
-        <terminal orientation="w" y="-1.01085" x="-19.9"/>
-        <terminal orientation="e" y="-1.01085" x="21.05"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/intercambiador1.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/intercambiador1.elmt
deleted file mode 100644
index e4f7f94e2..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/intercambiador1.elmt
+++ /dev/null
@@ -1,27 +0,0 @@
-<definition hotspot_x="22" hotspot_y="30" width="50" type="element" version="0.5" height="60" link_type="simple" orientation="dyyy">
-<uuid uuid="{5005F646-D020-4BE3-AE43-6D06E60D7F5A}"/><names>
-        <name lang="ca">Intercanviador de plaques</name>
-        <name lang="es">Intercambador placas</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-21.5172" width="4.725" antialias="false" height="4.62887" x="15.115"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="16.4281" width="4.725" antialias="false" height="5.04796" x="-15.125"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="17.2694" width="4.725" antialias="false" height="5.04796" x="15.115"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-0.005" y2="24" end1="none" x1="-0.005" y1="-23.8316" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="3.3025" y2="24" end1="none" x1="3.3025" y1="-23.8316" length1="1.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-23.8316" width="3.78" antialias="false" height="47.8316" x="11.335"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="7.555" y2="24" end1="none" x1="7.555" y1="-23.8316" length1="1.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-23.8316" width="3.78" antialias="false" height="47.8316" x="-10.4"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-3.785" y2="24" end1="none" x1="-3.785" y1="-23.8316" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="10.39" y2="-21.5172" end1="none" x1="-5.675" y1="-21.5172" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="11.335" y2="21.476" end1="none" x1="-6.62" y1="21.476" length1="1.5"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-21.5172" width="4.725" antialias="false" height="4.62887" x="-15.125"/>
-        <input rotate="true" text="_" tagg="label" y="-25.7603" x="-5.675" size="4"/>
-        <terminal y="-20" x="-15" orientation="w"/>
-        <terminal y="19.7934" x="19.84" orientation="e"/>
-        <terminal y="20" x="-15" orientation="w"/>
-        <terminal y="-19.2028" x="19.84" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/qet_directory
deleted file mode 100644
index 51f7c322d..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/qet_directory
+++ /dev/null
@@ -1,8 +0,0 @@
-<qet-directory>
-    <names>
-        <name lang="es">Centralizados agua</name>
-        <name lang="ca">Centralitzats aigua</name>
-        <name lang="en">Centralised water</name>
-        <name lang="fr">Eaux</name>
-    </names>
-</qet-directory>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/torre-refrig.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/torre-refrig.elmt
deleted file mode 100644
index 3d1a56053..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/torre-refrig.elmt
+++ /dev/null
@@ -1,54 +0,0 @@
-<definition width="80" version="0.4" hotspot_x="34" hotspot_y="67" height="90" link_type="simple" type="element" orientation="dyyy">
-<uuid uuid="{1BFC0AB5-ED3A-412D-A01B-E69DECF03437}"/><names>
-        <name lang="es">Torre de refrigeración</name>
-        <name lang="ca">Torre de refrigeració</name>
-    </names>
-    <informations></informations>
-    <description>
-        <rect width="4" x="22" y="15" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="4" x="31" y="-50" antialias="false" height="11" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="20" x="-23" y="-50" antialias="false" height="20" 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="17" x1="26" y2="15" x2="29"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.22331" x1="36.6" y2="15" x2="29.8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-0.553378" x1="-19.5" y2="-0.553378" x2="-4.2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9.33399" x1="32.7801" y2="9.33399" x2="39.38"/>
-        <ellipse width="5.1" x="-5.9" y="-12.9961" antialias="true" height="12.4427" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12.9961" x1="21.3" y2="-19.2174" x2="26.4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6.77473" x1="-0.8" y2="-9.8854" x2="0.9"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12.9961" x1="-4.2" y2="-19.2174" x2="0.9"/>
-        <rect width="57.8" x="-28" y="-51.8795" antialias="false" height="66.8795" 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="-51.8795" x1="-28" y2="-59.6562" x2="-21.2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-0.553378" x1="6" y2="-0.553378" x2="21.3"/>
-        <ellipse width="5.1" x="19.6" y="-12.9961" antialias="true" height="12.4427" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12.9961" x1="-21.2" y2="-19.2174" x2="-16.1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6.77473" x1="24.7" y2="-9.8854" x2="26.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="-59.6562" x1="36.6" y2="-51.8795" x2="29.8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12.9961" x1="4.3" y2="-19.2174" x2="9.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="-59.6562" x1="36.6" y2="7.22331" x2="36.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="-19.2174" x1="-15.9227" y2="-19.2174" x2="0.707832"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19.2174" x1="9.57731" y2="-19.2174" x2="26.2079"/>
-        <line 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.21939" x1="36.6" y2="2.5573" x2="29.8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17.6621" x1="26.4" y2="-9.8854" x2="26.4"/>
-        <arc width="5.1" x="2.6" y="-12.9961" antialias="true" height="12.4427" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17.6621" x1="0.9" y2="-9.8854" x2="0.9"/>
-        <arc width="5.1" x="-22.9" y="-12.9961" antialias="true" height="12.4427" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <rect width="32.3" x="-12.7" y="-58.1009" antialias="false" height="3.11068" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="19.6" y5="-58.1009" x5="19.6" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-58.1009" x1="-12.7" y2="-61.2116" x2="-9.3" y3="-61.2116" x3="23" y4="-58.1009"/>
-        <line 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.6562" x1="-21.2" y2="-59.6562" x2="-11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-59.6562" x1="36.6" y2="-59.6562" x2="23"/>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-54.9902" x1="19.6" y2="-58.1009" x2="23" y3="-61.2116" x3="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="2.5573" x1="29.8" y2="2.5573" x2="-28"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-0.553378" x1="34.1801" y2="-0.553378" x2="40.78"/>
-        <input x="-13" y="-38" size="4" rotate="true" text="Torre_" tagg="label"/>
-        <polygon x4="-20" y5="-21" x5="-20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-15" x1="-26" y2="-19" x2="-23" y3="-16" x3="-22" y4="-21"/>
-        <ellipse width="4" x="31" y="-21" antialias="false" height="11" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="20" x="5" y="-50" antialias="false" height="20" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="4" x="-28" y="-22" antialias="false" height="6" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="2" x="-26" y="-24" antialias="false" height="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="-25" y="15" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="17" x1="-21" y2="15" x2="-18"/>
-        <terminal x="41.7" y="-0.553378" orientation="e"/>
-        <terminal x="39" y="10" orientation="e"/>
-        <terminal x="-30" y="-19" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/valv-equiibrado.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/valv-equiibrado.elmt
deleted file mode 100644
index f7612f488..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/valv-equiibrado.elmt
+++ /dev/null
@@ -1,43 +0,0 @@
-<definition hotspot_x="24" hotspot_y="21" width="40" type="element" version="0.5" height="30" link_type="simple" orientation="dyyy">
-<uuid uuid="{D0AD5798-1D44-4B92-B689-8B20CB43FB74}"/><names>
-        <name lang="ca">Vàlvula d'equilibrat</name>
-        <name lang="es">Válvula de equilibrado</name>
-    </names>
-    <informations></informations>
-    <description>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="2.64204" width="2.1125" angle="-180" antialias="true" height="3.35796" x="3.6325" start="-90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="2.64204" width="2.1125" angle="-180" antialias="true" height="3.35796" x="-13.69" start="90"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-12.8739" y2="2.64204" end1="none" x1="-14.8984" y1="2.64204" length1="1.5"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="2.64204" width="2.1125" angle="-180" antialias="true" height="3.35796" x="-16.225" start="-90"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="6.98356" y2="2.64204" end1="none" x1="4.95915" y1="2.64204" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-12.8739" y2="-2.63475" end1="none" x1="-14.8983" y1="-2.63475" length1="1.5"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-5.99271" width="2.1125" angle="-180" antialias="true" height="3.35796" x="-13.69" start="90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="2.64204" width="2.1125" angle="-180" antialias="true" height="3.35796" x="6.1675" start="90"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="6.9836" y2="-2.63475" end1="none" x1="4.95919" y1="-2.63475" length1="1.5"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-2.63475" width="1.69" angle="-180" antialias="true" height="5.27679" x="-13.2675" start="90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-5.99271" width="2.535" angle="-180" antialias="true" height="3.35796" x="-16.225" start="-90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-5.99271" width="2.1125" angle="-180" antialias="true" height="3.35796" x="6.1675" start="90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-2.63475" width="1.69" angle="-180" antialias="true" height="5.27679" x="-16.225" start="-90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-2.63475" width="1.69" angle="-180" antialias="true" height="5.27679" x="6.59" start="90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-5.99271" width="2.535" angle="-180" antialias="true" height="3.35796" x="3.6325" start="-90"/>
-        <polygon y7="5.04059" x4="-11.5775" y3="-5.03329" antialias="false" x3="-11.5775" y4="5.04059" x2="-12" x1="-15.8025" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="-15.8025" x7="-16.225" y5="6" x5="-12" y10="-5.99271" closed="false" y8="-5.03329" x9="-15.8025" y2="-5.99271" x8="-16.225" x10="-15.8025" y6="6" y1="-5.99271" y9="-5.99271"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-2.63475" width="1.69" angle="-180" antialias="true" height="5.27679" x="3.6325" start="-90"/>
-        <polygon y7="5.04059" x4="8.28" y3="-5.03329" antialias="false" x3="8.28" y4="5.04059" x2="7.8575" x1="4.055" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="4.055" x7="3.6325" y5="6" x5="7.8575" y10="-5.99271" closed="false" y8="-5.03329" x9="4.055" y2="-5.99271" x8="3.6325" x10="4.055" y6="6" y1="-5.99271" y9="-5.99271"/>
-        <polygon y4="3.60146" x6="3.6325" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-9.465" y2="4.08116" x5="1.9425" y3="3.60146" y5="4.08116" x4="1.0975" y6="4.08116" closed="false" x1="-11.5775" y1="4.08116" x3="-8.62"/>
-        <polygon y4="-4.07388" x6="3.21" style="line-style:normal;line-weight:normal;filling:none;color:black" x7="3.6325" antialias="false" x2="2.7875" y2="-9.8304" y7="-4.55359" x5="2.365" y3="-4.07388" y5="-4.55359" x4="1.52" y6="-4.55359" closed="false" x1="-2.705" y1="-13.1884" x3="-0.17"/>
-        <polygon y4="-4.07388" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" x2="-6.93" y2="-5.03329" y3="-2.15504" x4="-0.17" closed="false" x1="-2.705" y1="-13.1884" x3="-1.4375"/>
-        <polygon y4="-9.8304" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-0.5925" y2="-14.1478" y3="-12.2289" x4="2.7875" closed="false" x1="-2.705" y1="-13.1884" x3="2.365"/>
-        <polygon y4="-12.7086" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="1.0975" y2="-15.1072" y3="-14.1478" x4="1.52" closed="false" x1="0.2525" y1="-13.668" x3="2.365"/>
-        <polygon y4="-18.9449" x6="1.0975" style="line-style:normal;line-weight:normal;filling:blue;color:black" x7="1.0975" antialias="false" x2="5.3225" y2="-13.1884" y7="-15.1072" x5="-1.015" y3="-14.6274" y5="-17.5057" x4="-0.17" y6="-15.1072" closed="false" x1="2.365" y1="-14.1478" x3="6.1675"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="5.3225" y2="-13.1884" end1="none" x1="-1.015" y1="-17.5057" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-5.6625" y2="-7.91151" end1="none" x1="-2.705" y1="-13.1884" length1="1.5"/>
-        <polygon y4="-11.4959" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-7.775" y2="-7.99675" x5="-6.475" y3="-10.0963" y5="-9.39643" x4="-8.425" closed="false" x1="-7.775" y1="-7.29691" x3="-9.725"/>
-        <polygon y7="-7.29691" x4="-9.725" y3="-4.49756" antialias="false" x3="-9.725" y4="-5.89724" x2="-10.375" x1="-11.675" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="-10.375" x7="-8.425" y5="-7.99675" x5="-11.675" closed="false" y8="-7.29691" x9="-7.775" y2="-4.49756" x8="-7.775" y6="-9.39643" y1="-4.49756" y9="-7.29691"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-5.825" y2="-7.99675" end1="none" x1="-6.475" y1="-9.39643" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-9.725" y2="-7.99675" end1="none" x1="-10.375" y1="-7.29691" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-7.775" y2="-10.0963" end1="none" x1="-8.425" y1="-9.39643" length1="1.5"/>
-        <input rotate="true" text="_" tagg="label" y="-17.4446" x="-9.725" size="4"/>
-        <terminal y="0" x="-18" orientation="w"/>
-        <terminal y="0" x="8" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/valv-pres-dif.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/valv-pres-dif.elmt
deleted file mode 100644
index 134faa512..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Climatizacion/aire-agua/valv-pres-dif.elmt
+++ /dev/null
@@ -1,67 +0,0 @@
-<definition hotspot_x="14" hotspot_y="29" width="40" type="element" version="0.5" height="70" link_type="simple" orientation="dyyy">
-<uuid uuid="{6C9D17D6-3B05-4712-963F-DAD17CC7F2E4}"/><names>
-        <name lang="ca">Vàlvula pres. diferencial</name>
-        <name lang="es">Válvula pres. diferencial</name>
-    </names>
-    <informations></informations>
-    <description>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-3.07378" width="2.6" angle="-180" antialias="true" height="3.57413" x="9.34" start="-90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="33.4259" width="2.6" angle="-180" antialias="true" height="3.57413" x="15.74" start="-90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-3.07378" width="2.6" angle="-180" antialias="true" height="3.57413" x="-5.58" start="90"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-4.5756" y2="-3.07378" end1="none" x1="-7.0672" y1="-3.07378" length1="1.5"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="33.4259" width="2.6" angle="-180" antialias="true" height="3.57413" x="-5.58" start="90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-3.07378" width="2.6" angle="-180" antialias="true" height="3.57413" x="-8.7" start="-90"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-4.5756" y2="33.4259" end1="none" x1="-7.0672" y1="33.4259" length1="1.5"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="33.4259" width="2.6" angle="-180" antialias="true" height="3.57413" x="-8.7" start="-90"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="13.4644" y2="-3.07378" end1="none" x1="10.9728" y1="-3.07378" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-4.5756" y2="-8.69025" end1="none" x1="-7.06712" y1="-8.69025" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="19.8644" y2="33.4259" end1="none" x1="17.3728" y1="33.4259" length1="1.5"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12.2644" width="2.6" angle="-180" antialias="true" height="3.57413" x="-5.58" start="90"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-4.5756" y2="27.8094" end1="none" x1="-7.06712" y1="27.8094" length1="1.5"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-3.07378" width="2.6" angle="-180" antialias="true" height="3.57413" x="12.46" start="90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="24.2352" width="2.6" angle="-180" antialias="true" height="3.57413" x="-5.58" start="90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="33.4259" width="2.6" angle="-180" antialias="true" height="3.57413" x="18.86" start="90"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="13.4644" y2="-8.69025" end1="none" x1="10.9729" y1="-8.69025" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="19.8644" y2="27.8094" end1="none" x1="17.3728" y1="27.8094" length1="1.5"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8.69025" width="2.08" angle="-180" antialias="true" height="5.61649" x="-5.06" start="90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12.2644" width="3.12" angle="-180" antialias="true" height="3.57413" x="-8.7" start="-90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="27.8094" width="2.08" angle="-180" antialias="true" height="5.61649" x="-5.06" start="90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="24.2352" width="3.12" angle="-180" antialias="true" height="3.57413" x="-8.7" start="-90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12.2644" width="2.6" angle="-180" antialias="true" height="3.57413" x="12.46" start="90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8.69025" width="2.08" angle="-180" antialias="true" height="5.61649" x="-8.7" start="-90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="24.2352" width="2.6" angle="-180" antialias="true" height="3.57413" x="18.86" start="90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="27.8094" width="2.08" angle="-180" antialias="true" height="5.61649" x="-8.7" start="-90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8.69025" width="2.08" angle="-180" antialias="true" height="5.61649" x="12.98" start="90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-12.2644" width="3.12" angle="-180" antialias="true" height="3.57413" x="9.34" start="-90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="27.8094" width="2.08" angle="-180" antialias="true" height="5.61649" x="19.38" start="90"/>
-        <polygon y7="-0.520814" x4="-2.98" y3="-11.2432" antialias="false" x3="-2.98" y4="-0.520814" x2="-3.5" x1="-8.18" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="-8.18" x7="-8.7" y5="0.500357" x5="-3.5" y10="-12.2644" closed="false" y8="-11.2432" x9="-8.18" y2="-12.2644" x8="-8.7" x10="-8.18" y6="0.500357" y1="-12.2644" y9="-12.2644"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="24.2352" width="3.12" angle="-180" antialias="true" height="3.57413" x="15.74" start="-90"/>
-        <polygon y7="35.9788" x4="-2.98" y3="25.2564" antialias="false" x3="-2.98" y4="35.9788" x2="-3.5" x1="-8.18" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="-8.18" x7="-8.7" y5="37" x5="-3.5" y10="24.2352" closed="false" y8="25.2564" x9="-8.18" y2="24.2352" x8="-8.7" x10="-8.18" y6="37" y1="24.2352" y9="24.2352"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="-8.69025" width="2.08" angle="-180" antialias="true" height="5.61649" x="9.34" start="-90"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" y="27.8094" width="2.08" angle="-180" antialias="true" height="5.61649" x="15.74" start="-90"/>
-        <polygon y7="-0.520814" x4="15.06" y3="-11.2432" antialias="false" x3="15.06" y4="-0.520814" x2="14.54" x1="9.86" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="9.86" x7="9.34" y5="0.500357" x5="14.54" y10="-12.2644" closed="false" y8="-11.2432" x9="9.86" y2="-12.2644" x8="9.34" x10="9.86" y6="0.500357" y1="-12.2644" y9="-12.2644"/>
-        <polygon y4="-2.05261" x6="9.188" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-1.29" y2="-1.56753" x5="7.836" y3="-2.05261" y5="-1.56753" x4="7.16" y6="-1.56753" closed="false" x1="-2.98" y1="-1.56753" x3="-0.614"/>
-        <polygon y7="35.9788" x4="21.46" y3="25.2564" antialias="false" x3="21.46" y4="35.9788" x2="20.94" x1="16.26" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="16.26" x7="15.74" y5="37" x5="20.94" y10="24.2352" closed="false" y8="25.2564" x9="16.26" y2="24.2352" x8="15.74" x10="16.26" y6="37" y1="24.2352" y9="24.2352"/>
-        <polygon y4="34.4471" x6="15.74" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-0.38" y2="34.9576" x5="13.66" y3="34.4471" y5="34.9576" x4="12.62" y6="34.9576" closed="false" x1="-2.98" y1="34.9576" x3="0.66"/>
-        <polygon y4="26.2776" x6="15.22" style="line-style:normal;line-weight:normal;filling:none;color:black" x7="15.74" antialias="false" x2="14.7" y2="20.1505" y7="25.767" x5="14.18" y3="26.2776" y5="25.767" x4="13.14" y6="25.767" closed="false" x1="7.94" y1="16.5764" x3="11.06"/>
-        <polygon y4="26.2776" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" x2="2.74" y2="25.2564" y3="28.32" x4="11.06" closed="false" x1="7.94" y1="16.5764" x3="9.5"/>
-        <polygon y7="19.1293" x4="0.14" y3="25.767" antialias="false" x3="-0.9" y4="26.2776" x2="-1.42" x1="-2.98" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="-1.94" x7="0.66" y5="23.7246" x5="0.14" y10="22.1929" closed="false" y8="21.6823" x9="4.82" y2="25.767" x8="2.74" x10="4.3" y6="21.1717" y1="25.767" y9="21.6823"/>
-        <polygon y4="20.6611" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-1.2424" y2="17.6486" x5="-1.64248" y3="18.9397" y5="20.2307" x4="-1.64248" closed="false" x1="-0.042" y1="19.3701" x3="-2.84288"/>
-        <polygon y4="20.1505" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="10.54" y2="15.5552" y3="17.5975" x4="14.7" closed="false" x1="7.94" y1="16.5764" x3="14.18"/>
-        <polygon y4="17.087" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="12.62" y2="14.534" y3="15.5552" x4="13.14" closed="false" x1="11.58" y1="16.0658" x3="14.18"/>
-        <polygon y4="10.4493" x6="12.62" style="line-style:normal;line-weight:normal;filling:blue;color:black" x7="12.62" antialias="false" x2="17.82" y2="16.5764" y7="14.534" x5="10.02" y3="15.0446" y5="11.9811" x4="11.06" y6="14.534" closed="false" x1="14.18" y1="15.5552" x3="18.86"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="17.82" y2="16.5764" end1="none" x1="10.02" y1="11.9811" length1="1.5"/>
-        <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="4.3" y2="22.1929" end1="none" x1="7.94" y1="16.5764" length1="1.5"/>
-        <polygon y4="25.767" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" x2="2.22" y2="28.32" y3="26.2776" x4="4.3" closed="false" x1="0.14" y1="26.2776" x3="4.3"/>
-        <polygon x14="8.9" y7="-15.8872" x4="0.9" y14="-10.673" y3="-9.92811" antialias="false" x3="-0.7" y4="-9.92811" x2="-1.5" y12="-9.92811" x1="-3.1" style="line-style:normal;line-weight:normal;filling:none;color:black" x6="1.7" x7="1.7" y5="-12.9077" x11="4.9" x5="0.9" y10="-12.9077" closed="false" y8="-15.8872" x15="8.9" y15="-10.673" x9="4.1" y11="-9.92811" y2="-10.673" x8="4.1" x10="4.9" x13="8.1" y6="-12.9077" y1="-10.673" y13="-10.673" y9="-12.9077" x12="7.3"/>
-        <polygon y4="-9.92811" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" x2="1.7" y2="-8.43833" x5="5.7" y3="-8.43833" y5="-9.92811" x4="5.7" closed="false" x1="0.9" y1="-9.18322" x3="4.1"/>
-        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:red" width="4.8" y="-24.8259" antialias="true" height="6.70402" x="-1.5"/>
-        <line length2="1.5" style="line-style:dashed;line-weight:normal;filling:none;color:red" end2="none" antialias="false" x2="3.3" y2="-16.0011" end1="none" x1="3.3" y1="-20.9963" length1="1.5"/>
-        <line length2="1.5" style="line-style:dashed;line-weight:normal;filling:none;color:red" end2="none" antialias="false" x2="-1.5" y2="18.3777" end1="none" x1="-1.5" y1="-21.1015" length1="1.5"/>
-        <input rotate="true" text="_" tagg="label" y="10.5564" x="3.3" size="4"/>
-        <terminal y="30.296" x="-9.5" orientation="w"/>
-        <terminal y="30.296" x="21.7" orientation="e"/>
-        <terminal y="-6.20366" x="-9.5" orientation="w"/>
-        <terminal y="-6.20366" x="15.3" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/codoalpex-16.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/codoalpex-16.elmt
deleted file mode 100644
index 98d3febef..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/codoalpex-16.elmt
+++ /dev/null
@@ -1,23 +0,0 @@
-<definition width="60" version="0.4" hotspot_x="34" hotspot_y="37" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{BB70027E-E4D4-4259-BD1B-04D49EA15870}"/><names>
-        <name lang="es">Codo Alpex 16</name>
-        <name lang="ca">Colze Alpex 16</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="4" x="-4" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="17" x="2" y="-30.4762" antialias="false" height="15.4762" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="33" x="-16" y="-25" antialias="true" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <rect width="11" x="5" y="-32.6871" antialias="false" height="2.21089" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="12" x="5" y="-13" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.22328" x="-27.1212" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="18.8979" x="-24.8979" y="-8" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="10" x="-5" y="-14" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <rect width="22" x="-1" y="-15" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="2" x="-6" y="-10" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <input x="12" y="2" size="4" rotate="true" text="16" tagg="label"/>
-        <terminal x="-27.1212" y="0" orientation="w"/>
-        <terminal x="10" y="-32.6871" orientation="n"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/codoalpex20.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/codoalpex20.elmt
deleted file mode 100644
index 73d9effe6..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/codoalpex20.elmt
+++ /dev/null
@@ -1,23 +0,0 @@
-<definition width="70" version="0.4" hotspot_x="33" hotspot_y="39" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{9A00A38B-9393-4BFC-A241-3C1E62C3108B}"/><names>
-        <name lang="es">Codo Alpex 20</name>
-        <name lang="ca">Colze Alpex 20</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="5.21976" x="-0.513623" y="-0.115766" antialias="false" height="12.7448" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="22.184" x="7.31602" y="-32.2387" antialias="false" height="18.9271" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="43.063" x="-16.1729" y="-25.6053" antialias="true" height="38.2343" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <rect width="14.3543" x="11.2308" y="-34.6065" antialias="false" height="2.3678" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="15.6593" x="11.2308" y="-10.3116" antialias="false" height="3.82343" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.21976" x="-27.9174" y="-0.115766" antialias="false" height="12.7448" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="22.184" x="-24.6976" y="-3.9392" antialias="false" height="20.3916" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="13.0494" x="-1.81856" y="-11.5861" antialias="true" height="11.4703" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <rect width="29" x="4" y="-13" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="4" x="-4" y="-8" antialias="false" height="27" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <input x="19" y="7" size="4" rotate="true" text="20" tagg="label"/>
-        <terminal x="-27.9174" y="6.25662" orientation="w"/>
-        <terminal x="17.7555" y="-34.6065" orientation="n"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/codoalpex25.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/codoalpex25.elmt
deleted file mode 100644
index 25068fdc0..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/codoalpex25.elmt
+++ /dev/null
@@ -1,23 +0,0 @@
-<definition width="80" version="0.4" hotspot_x="35" hotspot_y="57" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{EF577F14-FBB9-46F2-9BCF-65A4152B443C}"/><names>
-        <name lang="es">Codo Alpex 25</name>
-        <name lang="ca">Clze Alpex 25</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="6.26371" x="2.36713" y="-7.3698" antialias="false" height="16.3488" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="26.6208" x="11.7627" y="-45.1238" antialias="false" height="22.675" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="51.6756" x="-16.424" y="-40.0674" antialias="true" height="49.0465" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <rect width="17.2252" x="16.4605" y="-48.2228" antialias="false" height="3.09892" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="18.7911" x="16.4605" y="-20.4489" antialias="false" height="4.90465" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.26371" x="-30.5174" y="-7.3698" antialias="false" height="16.3488" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="26.6208" x="-27.2537" y="-12.2744" antialias="false" height="26.1581" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="15.6593" x="0.8012" y="-22.0837" antialias="true" height="14.7139" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <rect width="34" x="8" y="-23" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="3" x="-1" y="-16" antialias="false" height="33" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <input x="25" y="4" size="4" rotate="true" text="25" tagg="label"/>
-        <terminal x="-30.5174" y="0.80461" orientation="w"/>
-        <terminal x="25" y="-48.642" orientation="n"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/codoalpex32.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/codoalpex32.elmt
deleted file mode 100644
index e9cb6d882..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/codoalpex32.elmt
+++ /dev/null
@@ -1,23 +0,0 @@
-<definition width="100" version="0.4" hotspot_x="38" hotspot_y="67" height="90" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{96490A36-C6A3-40CE-8819-561259BF2B93}"/><names>
-        <name lang="es">Codo Alpex 32</name>
-        <name lang="ca">Colze Alpex 32</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="7.20327" x="10.5998" y="-10.6809" antialias="false" height="18.7958" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="30.6139" x="21.4047" y="-56.3644" antialias="false" height="27.6469" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="59.427" x="-11.01" y="-48.2724" antialias="true" height="56.3873" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <rect width="19.809" x="27.8072" y="-59.35" antialias="false" height="2.98565" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="21.6098" x="26.8072" y="-25.7175" antialias="false" height="5.63873" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.45686" x="-29.8946" y="-10.6809" antialias="false" height="18.7958" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="33.0375" x="-26.4377" y="-16.3197" antialias="false" height="30.0732" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="18.0082" x="8.79898" y="-27.5971" antialias="true" height="16.9162" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <rect width="40" x="16" y="-29" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="3" x="7" y="-19" antialias="false" height="35" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <input x="38" y="-7" size="4" rotate="true" text="32" tagg="label"/>
-        <terminal x="-29.8946" y="-1.28306" orientation="w"/>
-        <terminal x="35.8112" y="-59.35" orientation="n"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/colector-aseo.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/colector-aseo.elmt
deleted file mode 100644
index 96efd31a4..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/colector-aseo.elmt
+++ /dev/null
@@ -1,29 +0,0 @@
-<definition width="100" version="0.4" hotspot_x="47" hotspot_y="42" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{17004149-3457-48D9-BEE7-553E750D419B}"/><names>
-        <name lang="es">Te Alpex 20-16-20</name>
-        <name lang="ca">Te Alpex 20-16-20</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="14.8323" x="-6.03731" y="-33.5547" antialias="false" height="16.6377" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="13.8" x="-5.35" y="-16.3123" antialias="false" height="3.72834" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.6" x="15.35" y="-6.37002" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="11.5" x="8.45" y="-17.555" antialias="true" height="11.185" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <rect width="2.73" x="43.685" y="-6.6128" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="9.59738" x="-3.41984" y="-35.8823" antialias="false" height="2.32754" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.6" x="-15.7" y="-6.37002" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.79693" x="-40.2906" y="-6.37002" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="19.7937" x="-37.4937" y="-10.3411" antialias="false" height="19.8845" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="21.735" x="21.95" y="-10.3411" antialias="false" height="19.8845" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="11.5" x="-16.85" y="-17.555" antialias="true" height="11.185" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6.05777" x1="-9.95" y2="6.05777" x2="15.35"/>
-        <rect width="2" x="-18" y="-13" antialias="false" height="25" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="2" x="20" y="-14" antialias="false" height="27" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="20" x="-9" y="-17" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <input x="-12" y="2" size="4" rotate="true" text="20-16-20" tagg="label"/>
-        <terminal x="-40" y="0" orientation="w"/>
-        <terminal x="0.9426" y="-35.8823" orientation="n"/>
-        <terminal x="46.415" y="-0.39891" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/colector-aseo20-16.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/colector-aseo20-16.elmt
deleted file mode 100644
index 4033829ce..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/colector-aseo20-16.elmt
+++ /dev/null
@@ -1,55 +0,0 @@
-<definition width="100" version="0.4" hotspot_x="45" hotspot_y="73" height="120" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{2C189D10-5C2D-400E-A627-DD356A25A74A}"/><names>
-        <name lang="es">Colector Aseo20-16</name>
-        <name lang="ca">Col.lector aseo 20-16</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="-37.1559" x1="-3" y2="-24.9144" x2="-3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="23" x1="10" y2="23" x2="21"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24" x1="11" y2="-24" 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="-12" x1="-15" y2="-12" x2="-4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24" x1="-15" y2="-24" x2="-4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="0" y2="-12" x2="-3"/>
-        <text x="30" y="-16" size="4" text="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="7" y2="-12" x2="10"/>
-        <text x="29" y="32" size="4" text="16"/>
-        <rect width="1.79693" x="43.7094" y="24.63" antialias="false" height="9.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1.79693" x="-37.2906" y="24.63" antialias="false" height="9.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-27" y="31" size="4" text="16"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="11" y2="-12" x2="22"/>
-        <text x="0" y="-47" size="4" text="20"/>
-        <rect width="23.8323" x="-9.03731" y="-61.7658" antialias="false" height="19.8488" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="-3" y2="22" x2="-3"/>
-        <rect width="19.7937" x="23.5063" y="21.393" antialias="false" height="15.896" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="13.8" x="-3.35" y="-41.3123" antialias="false" height="3.72834" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="19.7937" x="-35.4937" y="21.393" antialias="false" height="15.896" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="-16" y="18" antialias="false" height="22.5" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="2" x="22" y="17" antialias="false" height="22.5" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="2.73" x="45.685" y="-24.6128" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="9.59738" x="-1.41984" y="-64.5426" antialias="false" height="2.77675" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1.79693" x="-37.2906" y="-23.37" antialias="false" height="9.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="19.7937" x="-35.4937" y="-26.607" antialias="false" height="15.896" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="21.735" x="23.95" y="-28.3411" antialias="false" height="19.8845" 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="35.0578" x1="-7.95" y2="35.0578" x2="17.35"/>
-        <rect width="2" x="-16" y="-30" antialias="false" height="22.5" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="2" x="22" y="-32" antialias="false" height="27" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="32" x="-13" y="-42" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="10" y2="22" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="35" x1="-14" y2="35" 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="23" x1="-14" y2="23" x2="-3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="23" x1="-3" y2="27" x2="1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="23" x1="10" y2="27" 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="-37.1559" x1="10" y2="-24.9144" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24" x1="10" y2="-21" x2="7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-24" x1="-3" y2="-21" x2="0"/>
-        <text x="-27" y="-16" size="4" text="16"/>
-        <input x="15" y="8" size="9" rotate="true" text="aseo" tagg="label"/>
-        <terminal x="-38" y="-18" orientation="w"/>
-        <terminal x="2.9426" y="-64.5426" orientation="n"/>
-        <terminal x="48.415" y="-18.3989" orientation="e"/>
-        <terminal x="-38" y="30" orientation="w"/>
-        <terminal x="47" y="30" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/curvaalpex16.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/curvaalpex16.elmt
deleted file mode 100644
index 84ae9b4a1..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/curvaalpex16.elmt
+++ /dev/null
@@ -1,22 +0,0 @@
-<definition width="80" version="0.4" hotspot_x="46" hotspot_y="34" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{F4E04A57-A75B-4183-BCEF-C8881983D302}"/><names>
-        <name lang="es">Curva Alpex 16</name>
-        <name lang="ca">Corva Alpex 16</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <arc width="52" x="-42" y="-29" antialias="true" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <ellipse width="0" x="29" y="4" antialias="true" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="31" x="-32" y="-19" antialias="true" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.34551" x1="-1" y2="-19.6811" x2="-1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="-0.904" y2="-20" x2="9.896"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.35862" x1="10" y2="-19.669" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="11" x1="-17" y2="11" x2="-29"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="21" x1="-16.8476" y2="21" x2="-29.1406"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="21" x1="-30" y2="11" x2="-30"/>
-        <input x="12" y="5" size="4" rotate="true" text="16" tagg="label"/>
-        <terminal x="-31" y="16" orientation="w"/>
-        <terminal x="4" y="-21" orientation="n"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/curvaalpex20.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/curvaalpex20.elmt
deleted file mode 100644
index 8c0c49189..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/curvaalpex20.elmt
+++ /dev/null
@@ -1,21 +0,0 @@
-<definition width="70" version="0.4" hotspot_x="47" hotspot_y="43" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{DB3146B2-012D-4807-A383-700B3B216D44}"/><names>
-        <name lang="es">Curva Alpex 20</name>
-        <name lang="ca">Corva Alpex 20</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <arc width="59.8" x="-42" y="-37.5" antialias="true" height="58.5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <arc width="35.65" x="-30.5" y="-25.8" antialias="true" height="35.1" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8.65425" x1="5.15" y2="-26.5969" x2="5.15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-26.97" x1="5.2604" y2="-26.97" x2="17.6804"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8.66959" x1="17.8" y2="-26.5827" x2="17.8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9.3" x1="-13.25" y2="9.3" x2="-27.05"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="21" x1="-13.0747" y2="21" x2="-27.2117"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="21" x1="-28.2" y2="9.3" x2="-28.2"/>
-        <input x="20" y="1" size="4" rotate="true" text="20" tagg="label"/>
-        <terminal x="-29.35" y="15.15" orientation="w"/>
-        <terminal x="10.9" y="-28.14" orientation="n"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/curvaalpex25.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/curvaalpex25.elmt
deleted file mode 100644
index 0a75d2929..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/curvaalpex25.elmt
+++ /dev/null
@@ -1,21 +0,0 @@
-<definition width="80" version="0.4" hotspot_x="46" hotspot_y="53" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{A5F24761-5C5A-48D4-AEDC-E13BC6DC1546}"/><names>
-        <name lang="es">Curva  Alpex 25</name>
-        <name lang="ca">Corva Alpex 25</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <arc width="71.76" x="-42" y="-48.225" antialias="true" height="69.225" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <arc width="42.78" x="-28.2" y="-34.38" antialias="true" height="41.535" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14.0909" x1="14.58" y2="-35.323" x2="14.58"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-35.7645" x1="14.7125" y2="-35.7645" x2="29.6165"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-14.109" x1="29.76" y2="-35.3062" x2="29.76"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.155" x1="-7.5" y2="7.155" x2="-24.06"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="21" x1="-7.28964" y2="21" x2="-24.254"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="21" x1="-25.44" y2="7.155" x2="-25.44"/>
-        <input x="33" y="12" size="4" rotate="true" text="25" tagg="label"/>
-        <terminal x="-26.82" y="14.0775" orientation="w"/>
-        <terminal x="21.48" y="-37.149" orientation="n"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/curvaalpex32.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/curvaalpex32.elmt
deleted file mode 100644
index eeae2e35b..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/curvaalpex32.elmt
+++ /dev/null
@@ -1,21 +0,0 @@
-<definition width="80" version="0.4" hotspot_x="53" hotspot_y="47" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{9E86F766-4FB6-44FE-BBD7-4187484DCED7}"/><names>
-        <name lang="es">Curva  Alpex 32</name>
-        <name lang="ca">Corva Alpex 32</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <arc width="71.76" x="-49" y="-43.8" antialias="true" height="73.8" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <arc width="42.78" x="-35.2" y="-29.04" antialias="true" height="44.28" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7.40997" x1="7.58" y2="-30.0453" x2="7.58"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30.516" x1="7.71248" y2="-30.516" x2="22.6165"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7.42932" x1="22.76" y2="-30.0274" x2="22.76"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15.24" x1="-14.5" y2="15.24" x2="-31.06"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-14.2897" y2="30" x2="-31.254"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="30" x1="-32.44" y2="15.24" x2="-32.44"/>
-        <input x="13" y="24" size="4" rotate="true" text="32" tagg="label"/>
-        <terminal x="-33.82" y="22.62" orientation="w"/>
-        <terminal x="14.48" y="-31.992" orientation="n"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/llave-pasoalpex20.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/llave-pasoalpex20.elmt
deleted file mode 100644
index 2d6d9c3cd..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/llave-pasoalpex20.elmt
+++ /dev/null
@@ -1,30 +0,0 @@
-<definition width="60" version="0.4" hotspot_x="33" hotspot_y="37" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{0CF0B821-2E32-445E-90B2-41CC19D92A23}"/><names>
-        <name lang="es">Llave paso20</name>
-        <name lang="ca">Aixeta pas 20</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="-13" x1="0" y2="-6" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="2.39781" y2="-4" x2="6.65242"/>
-        <rect width="2" x="-15" y="-8" antialias="false" height="15" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="12" x="-27" y="-6" antialias="false" height="11" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="-29" y="-4" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="7" y="-8" antialias="false" height="15" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="11" x="-8" y="-30.825" antialias="false" height="9.825" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29.4214" x1="0" y2="-23.1054" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29.4214" x1="-5" y2="-23.1054" x2="-5"/>
-        <polygon x4="3" y5="-21" x5="-9" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-21" x1="-9" y2="-13" x2="-23" y3="-13" x3="17" y4="-21"/>
-        <rect width="12" x="9" y="-6" antialias="false" height="11" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="21" y="-4" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="-13" y2="3" x2="7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="-12.6022" y2="-4" x2="-8.34758"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="-6" y2="-6" x2="-6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="-6" y2="-4" x2="-8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="0" y2="-4" x2="2"/>
-        <input x="-17" y="12" size="4" rotate="true" text="paso 20" tagg="label"/>
-        <terminal x="-28" y="0" orientation="w"/>
-        <terminal x="22" y="0" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/llavealpex25.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/llavealpex25.elmt
deleted file mode 100644
index f20324ec9..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/llavealpex25.elmt
+++ /dev/null
@@ -1,30 +0,0 @@
-<definition width="70" version="0.4" hotspot_x="36" hotspot_y="37" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{23BFA3A4-0FFF-46A4-A9D3-1E66B47A5ED7}"/><names>
-        <name lang="es">Llave paso25</name>
-        <name lang="ca">Aixeta pas 25</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="-16" x1="2" y2="-7.25" x2="2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.75" x1="4.42332" y2="-4.75" x2="8.44979"/>
-        <rect width="2.2" x="-14.5" y="-9.75" antialias="false" height="18.75" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="13.2" x="-27.7" y="-7.25" antialias="false" height="13.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.2" x="-29.9" y="-4.75" antialias="false" height="8.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.2" x="9.7" y="-9.75" antialias="false" height="18.75" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="11" x="-7" y="-33.825" antialias="false" height="9.825" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-32.4214" x1="1" y2="-26.1054" x2="1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-32.4214" x1="-4" y2="-26.1054" x2="-4"/>
-        <polygon x4="4" y5="-24" x5="-8" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-24" x1="-8" y2="-16" x2="-22" y3="-16" x3="18" y4="-24"/>
-        <rect width="13.2" x="11.9" y="-7.25" antialias="false" height="13.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.2" x="25.1" y="-4.75" antialias="false" height="8.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4" x1="-12.3" y2="4" x2="9.7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4.75" x1="-10.9767" y2="-4.75" x2="-6.95021"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16" x1="-4.6" y2="-7.25" x2="-4.6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7.25" x1="-4.6" y2="-4.75" x2="-6.8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7.25" x1="2" y2="-4.75" x2="4.2"/>
-        <input x="-7" y="10" size="4" rotate="true" text="paso 25" tagg="label"/>
-        <terminal x="-28.8" y="0.25" orientation="w"/>
-        <terminal x="26.2" y="0.25" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/llavealpex32.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/llavealpex32.elmt
deleted file mode 100644
index 29c6c44ce..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/llavealpex32.elmt
+++ /dev/null
@@ -1,30 +0,0 @@
-<definition width="80" version="0.4" hotspot_x="35" hotspot_y="44" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{6FB49577-F3EE-4853-99E6-BEE5B34CE093}"/><names>
-        <name lang="es">Llave paso32</name>
-        <name lang="ca">Aixeta pas 32</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="-18.5912" x1="7.92" y2="-8.51895" x2="7.92"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5.64117" x1="10.8751" y2="-5.64117" x2="16.1549"/>
-        <rect width="2.53" x="-11.055" y="-11.3967" antialias="false" height="21.5834" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="15.18" x="-26.235" y="-8.51895" antialias="false" height="15.8278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.53" x="-28.765" y="-5.64117" antialias="false" height="10.0722" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.53" x="16.775" y="-11.3967" antialias="false" height="21.5834" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="12.65" x="-2.43" y="-39.1098" antialias="false" height="11.3097" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-37.4941" x1="6.77" y2="-30.2237" x2="6.77"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-37.4941" x1="1.02" y2="-30.2237" x2="1.02"/>
-        <polygon x4="10.22" y5="-27.8001" x5="-3.58" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-27.8001" x1="-3.58" y2="-18.5912" x2="-19.68" y3="-18.5912" x3="26.32" y4="-27.8001"/>
-        <rect width="15.18" x="19.305" y="-8.51895" antialias="false" height="15.8278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.53" x="34.485" y="-5.64117" antialias="false" height="10.0722" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="4.43107" x1="-8.525" y2="4.43107" x2="16.775"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5.64117" x1="-7.83491" y2="-5.64117" x2="-2.55506"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18.5912" x1="0.33" y2="-8.51895" x2="0.33"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8.51895" x1="0.33" y2="-5.64117" x2="-2.2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8.51895" x1="7.92" y2="-5.64117" x2="10.45"/>
-        <input x="1" y="7" size="4" rotate="true" text="paso 32" tagg="label"/>
-        <terminal x="-27.5" y="0.1144" orientation="w"/>
-        <terminal x="35.75" y="0.1144" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito-codoalpex16-1_2h.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito-codoalpex16-1_2h.elmt
deleted file mode 100644
index 074500aea..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito-codoalpex16-1_2h.elmt
+++ /dev/null
@@ -1,37 +0,0 @@
-<definition width="60" version="0.4" hotspot_x="33" hotspot_y="33" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{97520B06-4564-4028-92A8-3F7A246F321D}"/><names>
-        <name lang="es">Manguito-Codo16-1/2H</name>
-        <name lang="ca">Manguet-colze16-1/2H</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <arc width="5" x="-2" y="-16" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="11" y2="10" x2="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16.4762" x1="3" y2="-12" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="-18" x1="4" y2="-19" x2="15"/>
-        <rect width="15.12" x="2.12" y="-24.2274" antialias="false" height="7.26838" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="-5" y="-4" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="11.34" x="4.01" y="-23.5553" antialias="false" height="5.99466" style="line-style:dashed;line-weight:normal;filling:none;color:red"/>
-        <rect width="2" x="-26" y="-4" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="17" x="-24" y="-7" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="5" x="17" y="-16" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <arc width="14" x="3" y="-16" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <arc width="10" x="-6" y="-13" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <rect width="24" x="-2" y="-16" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-16.4762" x1="17" y2="-12" x2="17"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="-20" x1="4" y2="-21" x2="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" x1="2" y2="-9" x2="4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="15" y2="-12" x2="18"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6.18462" x1="3" y2="10.8" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="11" x1="3.4273" y2="11" x2="14.6204"/>
-        <line 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.99801" x1="15" y2="-8.07509" x2="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="3.53171" y2="8" x2="14.5073"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8" x1="7" y2="10" x2="7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="-1" y2="6" x2="2"/>
-        <rect width="2" x="-7" y="-9" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <input x="-12" y="15" size="4" rotate="true" text="16-1/2&quot;H_" tagg="label"/>
-        <terminal x="-26" y="1" orientation="w"/>
-        <terminal x="9" y="-25" orientation="n"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito-codoalpex20-1_2h.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito-codoalpex20-1_2h.elmt
deleted file mode 100644
index 41f846702..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito-codoalpex20-1_2h.elmt
+++ /dev/null
@@ -1,36 +0,0 @@
-<definition width="60" version="0.4" hotspot_x="34" hotspot_y="32" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{6C154AFB-6184-4D5B-BDB3-60E1754DCA17}"/><names>
-        <name lang="es">Manguito-Codo 20-1/2H</name>
-        <name lang="ca">Manguet-Colze 20-1/2H</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8.25051" x1="10.6347" y2="10.5305" x2="10.6347"/>
-        <arc width="5" x="-2" y="-17" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17.4762" x1="3" y2="-13" x2="3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="-19" x1="4" y2="-20" x2="15"/>
-        <rect width="4" x="-5" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="15.12" x="2.12" y="-25.2274" antialias="false" height="7.26838" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5.33559" x1="-0.0959829" y2="11.275" x2="-0.0959829"/>
-        <rect width="11.34" x="4.01" y="-24.5553" antialias="false" height="5.99466" style="line-style:dashed;line-weight:normal;filling:none;color:red"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="11.6705" x1="0.477168" y2="11.6705" x2="15.4908"/>
-        <arc width="5" x="17" y="-17" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="11.472" x1="16" y2="-10.0231" x2="16"/>
-        <arc width="14" x="3" y="-17" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <rect width="2.36678" x="-27.9256" y="-6.20875" antialias="false" height="12.776" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="24" x="-2" y="-17" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17.4762" x1="17" y2="-13" x2="17"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8.25051" x1="0.617217" y2="8.25051" x2="15.3391"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="-21" x1="4" y2="-22" x2="15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8.25051" x1="5.26934" y2="10.5305" x2="5.26934"/>
-        <rect width="18.5588" x="-25.5588" y="-10.0415" antialias="false" height="20.4415" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="10" x="-6" y="-14" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="2" y2="-10" x2="4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="16" y2="-13" x2="18"/>
-        <rect width="2" x="-7" y="-13" antialias="false" height="26" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <input x="-5" y="15" size="4" rotate="true" text="20-1/2&quot;H" tagg="label"/>
-        <terminal x="-27.9256" y="0.17923" orientation="w"/>
-        <terminal x="9" y="-25" orientation="n"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito-codoalpex20-3_4h.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito-codoalpex20-3_4h.elmt
deleted file mode 100644
index 62d924495..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito-codoalpex20-3_4h.elmt
+++ /dev/null
@@ -1,31 +0,0 @@
-<definition width="60" version="0.4" hotspot_x="32" hotspot_y="34" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{C408583C-AE38-438E-A965-4896BBD94BA1}"/><names>
-        <name lang="es">Manguito-Codo 20-3/4"H</name>
-        <name lang="ca">Manguet-Colze 20-3/4"H</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <arc width="6" x="-4" y="-19.737" antialias="true" height="4.737" 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="-20.3009" x1="2" y2="-15" x2="2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="-22.1055" x1="3.2" y2="-23.2897" x2="16.4"/>
-        <rect width="4" x="-5" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="18.144" x="0.944" y="-28.4803" antialias="false" height="8.60757" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="33" x="-17" y="-25" antialias="true" height="30" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <rect width="13.608" x="3.212" y="-28.6844" antialias="false" height="7.09917" style="line-style:dashed;line-weight:normal;filling:none;color:red"/>
-        <rect width="2.36678" x="-27.9256" y="-6.20875" antialias="false" height="12.776" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="6" x="18.8" y="-19.737" antialias="true" height="4.737" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <rect width="18.5588" x="-25.5588" y="-10.0415" antialias="false" height="20.4415" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="16.8" x="2" y="-19.737" antialias="true" height="4.737" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
-        <arc width="10" x="-6" y="-14" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <rect width="28.8" x="-4" y="-19.737" antialias="false" height="4.737" 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="-20.3009" x1="18.8" y2="-15" x2="18.8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="-24.474" x1="3.2" y2="-25.6582" x2="16.4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-15" x1="0" y2="-10" x2="4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="16" y2="-15" x2="20"/>
-        <rect width="2" x="-7" y="-13" antialias="false" height="26" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <input x="12" y="4" size="4" rotate="true" text="20-3/3H" tagg="label"/>
-        <terminal x="-27.9256" y="0.17923" orientation="w"/>
-        <terminal x="10" y="-29" orientation="n"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito16-1_2h.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito16-1_2h.elmt
deleted file mode 100644
index 23be86411..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito16-1_2h.elmt
+++ /dev/null
@@ -1,28 +0,0 @@
-<definition width="60" version="0.4" hotspot_x="38" hotspot_y="15" height="30" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{6EC4B87F-7700-49EE-B9CB-D86E58D1F5EB}"/><names>
-        <name lang="es">Manguito16-1/2"H</name>
-        <name lang="ca">manguet16-1/2"H</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-3" y2="5" x2="1"/>
-        <rect width="4.2" x="-6.8" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="3" x="-1" y="5" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="11.424" x="2.61" y="-7.96398" antialias="false" height="16.2165" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="8.064" x="4.97" y="-5.77928" antialias="false" height="11.8471" style="line-style:dashed;line-weight:normal;filling:none;color:red"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="6.06777" x1="6.314" y2="-5.18693" x2="7.658"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="6.06777" x1="8.33" y2="-5.77928" x2="10.346"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="6.06777" x1="10.346" y2="-5.77928" x2="13.034"/>
-        <rect width="5" x="-3" y="-11" antialias="false" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-3" y2="-5" x2="1"/>
-        <arc width="3" x="-1" y="-11" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="2" x="0" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="2.1" x="-29.9" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="18.9" x="-27.8" y="-8" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.1" x="-8.9" y="-11" antialias="false" height="22" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <input x="-24" y="15" size="4" rotate="true" text="16-1/2&quot;H" tagg="label"/>
-        <terminal x="-29.9" y="0" orientation="w"/>
-        <terminal x="14" y="0" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito16-1_2m.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito16-1_2m.elmt
deleted file mode 100644
index d66da4a9e..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito16-1_2m.elmt
+++ /dev/null
@@ -1,27 +0,0 @@
-<definition width="50" version="0.4" hotspot_x="34" hotspot_y="15" height="30" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{1819B072-E9AA-4421-A9BF-16AB46158C4B}"/><names>
-        <name lang="es">Manguito16-1/2"M</name>
-        <name lang="ca">Manguet 16-1/2"H</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-3" y2="5" x2="1"/>
-        <rect width="4.2" x="-6.8" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="3" x="-1" y="5" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="8.064" x="1.97" y="-5.77928" antialias="false" height="11.8471" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="6.06777" x1="3.314" y2="-5.18693" x2="4.658"/>
-        <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.06777" x1="5.33" y2="-5.77928" x2="7.346"/>
-        <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.06777" x1="7.346" y2="-5.77928" x2="10.034"/>
-        <rect width="5" x="-3" y="-11" antialias="false" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="-3" y2="-5" x2="1"/>
-        <arc width="3" x="-1" y="-11" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <arc width="2" x="0" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="2.1" x="-29.9" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="18.9" x="-27.8" y="-8" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.1" x="-8.9" y="-11" antialias="false" height="22" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <input x="-27" y="16" size="4" rotate="true" text="16-1/2&quot;M" tagg="label"/>
-        <terminal x="-29.9" y="0" orientation="w"/>
-        <terminal x="11" y="0" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito20-1_2m.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito20-1_2m.elmt
deleted file mode 100644
index 2fe67eb90..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito20-1_2m.elmt
+++ /dev/null
@@ -1,27 +0,0 @@
-<definition width="60" version="0.4" hotspot_x="25" hotspot_y="15" height="30" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{9DB64023-2FB7-416E-9780-E94BC694CD93}"/><names>
-        <name lang="es">Manguito20-1/2"M</name>
-        <name lang="ca">Manguet20-1/2"M</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="8.064" x="21.97" y="-5.77928" antialias="false" height="11.8471" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="16" y2="5" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="6.06777" x1="23.314" y2="-5.18693" x2="24.658"/>
-        <rect width="6.12995" x="9.94966" y="-6.36337" antialias="false" height="13.2602" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="3" x="18" y="5" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="6.06777" x1="25.33" y2="-5.77928" x2="27.346"/>
-        <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.06777" x1="27.346" y2="-5.77928" x2="30.034"/>
-        <rect width="2.74746" x="-19.365" y="-6.36337" antialias="false" height="13.2602" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="24.3672" x="-16.6176" y="-10.3414" antialias="false" height="21.2163" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5" x="16" y="-11" antialias="false" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="16" y2="-5" x2="20"/>
-        <arc width="3" x="18" y="-11" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="2.2" x="7.6565" y="-13" antialias="false" height="26" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <arc width="2" x="19" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="-12" y="19" size="4" rotate="true" text="20-1/2&quot;M" tagg="label"/>
-        <terminal x="-20" y="0" orientation="w"/>
-        <terminal x="30" y="0" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito20-3_4m.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito20-3_4m.elmt
deleted file mode 100644
index fa962710e..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito20-3_4m.elmt
+++ /dev/null
@@ -1,27 +0,0 @@
-<definition width="60" version="0.4" hotspot_x="36" hotspot_y="15" height="30" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{9CB6BC99-B534-492D-B96B-6ED43AA6D11B}"/><names>
-        <name lang="es">Manguito20-3/4"M</name>
-        <name lang="ca">Mnaguet20-3/4"M</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="6.20909" x1="3" y2="6.20909" x2="7"/>
-        <rect width="4.66359" x="-1.91531" y="-6.36337" antialias="false" height="13.2602" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="3" x="5" y="6.20909" antialias="true" height="6.79091" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="2.49769" x="-29.565" y="-6.36337" antialias="false" height="13.2602" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="23.152" x="-27.0674" y="-10.3414" antialias="false" height="21.2163" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="8.064" x="8.97" y="-5.99109" antialias="false" height="13.4088" 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="7.41761" x1="10.314" y2="-5.32066" x2="11.658"/>
-        <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="7.41761" x1="12.33" y2="-5.99109" x2="14.346"/>
-        <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="7.41761" x1="14.346" y2="-5.99109" x2="17.034"/>
-        <rect width="5" x="3" y="-11.9" antialias="false" height="24.9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5.10909" x1="3" y2="-5.10909" x2="7"/>
-        <arc width="3" x="5" y="-11.9" antialias="true" height="6.79091" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="2" x="-4" y="-13" antialias="false" height="26" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <arc width="2" x="6" y="-5.10909" antialias="true" height="11.3182" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="-19" y="18" size="4" rotate="true" text="20-3/4&quot;M" tagg="label"/>
-        <terminal x="-29.565" y="0.266721" orientation="w"/>
-        <terminal x="18" y="0.55" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito25-1m.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito25-1m.elmt
deleted file mode 100644
index f67c92013..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito25-1m.elmt
+++ /dev/null
@@ -1,28 +0,0 @@
-<definition width="80" version="0.4" hotspot_x="36" hotspot_y="20" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{8BA224D0-8D64-4F40-A1C6-2CB24610259B}"/><names>
-        <name lang="es">Manguito25-1"M</name>
-        <name lang="ca">Manguet25-1"M</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="8.44136" x1="24.2026" y2="-8.80647" x2="27.1077"/>
-        <line 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.805" x1="17" y2="7.805" x2="22.67"/>
-        <rect width="5.36313" x="11.2321" y="-10.5422" antialias="false" height="22.3799" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="4.2525" x="19.835" y="7.805" antialias="true" height="9.195" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="3.88427" x="-28.5279" y="-9.5422" antialias="false" height="18.3799" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="32.7399" x="-24.6438" y="-15.0562" antialias="false" height="29.4079" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="11.4307" x="24.2975" y="-8.71425" antialias="false" height="18.1557" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="9.44136" x1="26.2026" y2="-7.80647" x2="29.1077"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="9.44136" x1="29.0603" y2="-8.71425" x2="31.918"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="9.44136" x1="31.918" y2="-8.71425" x2="34.7282"/>
-        <rect width="7.0875" x="17" y="-16.715" antialias="false" height="33.715" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7.52" x1="17" y2="-7.52" x2="22.67"/>
-        <arc width="4.2525" x="19.835" y="-16.715" antialias="true" height="9.195" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="3" x="8" y="-18" antialias="false" height="36" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <arc width="2.835" x="21.2525" y="-7.52" antialias="true" height="15.325" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="-19" y="24" size="4" rotate="true" text="25-1&quot;M" tagg="label"/>
-        <terminal x="-29" y="0" orientation="w"/>
-        <terminal x="36" y="0" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito32-1m.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito32-1m.elmt
deleted file mode 100644
index 4c3f34246..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguito32-1m.elmt
+++ /dev/null
@@ -1,28 +0,0 @@
-<definition width="80" version="0.4" hotspot_x="36" hotspot_y="20" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{A3A979D2-19B4-4354-823E-8A4D00CF0706}"/><names>
-        <name lang="es">Manguito32-1"H</name>
-        <name lang="ca">Mnaguet32-1"H</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="8.44136" x1="24.2026" y2="-9.80647" x2="27.1077"/>
-        <line 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.805" x1="17" y2="7.805" x2="22.67"/>
-        <rect width="5.36313" x="11.2321" y="-10.5422" antialias="false" height="22.3799" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="4.2525" x="19.835" y="7.805" antialias="true" height="9.195" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="3.88427" x="-28.5279" y="-9.5422" antialias="false" height="18.3799" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="32.7399" x="-24.6438" y="-15.0562" antialias="false" height="29.4079" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="11.4307" x="24.2975" y="-8.71425" antialias="false" height="18.1557" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="9.44136" x1="26.2026" y2="-8.80647" x2="29.1077"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="9.44136" x1="29.0603" y2="-8.71425" x2="31.918"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="9.44136" x1="31.918" y2="-8.71425" x2="34.7282"/>
-        <rect width="7.0875" x="17" y="-16.715" antialias="false" height="33.715" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7.52" x1="17" y2="-7.52" x2="22.67"/>
-        <arc width="4.2525" x="19.835" y="-16.715" antialias="true" height="9.195" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="3" x="8" y="-18" antialias="false" height="36" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <arc width="2.835" x="21.2525" y="-7.52" antialias="true" height="15.325" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="-11" y="25" size="4" rotate="true" text="32-1&quot;H" tagg="label"/>
-        <terminal x="-29" y="0" orientation="w"/>
-        <terminal x="36" y="0" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguitoalpex20-1_2h.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguitoalpex20-1_2h.elmt
deleted file mode 100644
index 83b8628ee..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguitoalpex20-1_2h.elmt
+++ /dev/null
@@ -1,28 +0,0 @@
-<definition width="70" version="0.4" hotspot_x="28" hotspot_y="15" height="30" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{10E7E361-B801-432D-821E-8CF7CCE2FF6F}"/><names>
-        <name lang="es">Manguito20-1/2"H</name>
-        <name lang="ca">Manguet20-1/2"H</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="11.424" x="21.61" y="-7.96398" antialias="false" height="16.2165" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="8.064" x="23.97" y="-5.77928" antialias="false" height="11.8471" style="line-style:dashed;line-weight:normal;filling:none;color:red"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="16" y2="5" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="6.06777" x1="25.314" y2="-5.18693" x2="26.658"/>
-        <rect width="6.12995" x="9.94966" y="-6.36337" antialias="false" height="13.2602" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="6.06777" x1="27.33" y2="-5.77928" x2="29.346"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="6.06777" x1="29.346" y2="-5.77928" x2="32.034"/>
-        <arc width="3" x="18" y="5" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="2.74746" x="-19.365" y="-6.36337" antialias="false" height="13.2602" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="24.3672" x="-16.6176" y="-10.3414" antialias="false" height="21.2163" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5" x="16" y="-11" antialias="false" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5" x1="16" y2="-5" x2="20"/>
-        <arc width="3" x="18" y="-11" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="2.2" x="7.6565" y="-13" antialias="false" height="26" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <arc width="2" x="19" y="-5" antialias="true" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="-10" y="18" size="4" rotate="true" text="20-1/2&quot;H" tagg="label"/>
-        <terminal x="-20" y="0" orientation="w"/>
-        <terminal x="33" y="0" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguitoalpex20-3_4h.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguitoalpex20-3_4h.elmt
deleted file mode 100644
index de9a7dd45..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguitoalpex20-3_4h.elmt
+++ /dev/null
@@ -1,28 +0,0 @@
-<definition width="60" version="0.4" hotspot_x="35" hotspot_y="15" height="30" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{AB863892-CB32-4763-9A8A-31700257D50E}"/><names>
-        <name lang="es">Manguito20-3/4"H</name>
-        <name lang="ca">Manget 20-3/4"H</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="6.20909" x1="3" y2="6.20909" x2="7"/>
-        <rect width="4.66359" x="-1.91531" y="-6.36337" antialias="false" height="13.2602" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="3" x="5" y="6.20909" antialias="true" height="6.79091" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="2.49769" x="-29.565" y="-6.36337" antialias="false" height="13.2602" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="23.152" x="-27.0674" y="-10.3414" antialias="false" height="21.2163" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="11.424" x="8.61" y="-8.46378" antialias="false" height="18.3541" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="8.064" x="10.97" y="-5.99109" antialias="false" height="13.4088" style="line-style:dashed;line-weight:normal;filling:none;color:red"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="7.41761" x1="12.314" y2="-5.32066" x2="13.658"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="7.41761" x1="14.33" y2="-5.99109" x2="16.346"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="7.41761" x1="16.346" y2="-5.99109" x2="19.034"/>
-        <rect width="5" x="3" y="-11.9" antialias="false" height="24.9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5.10909" x1="3" y2="-5.10909" x2="7"/>
-        <arc width="3" x="5" y="-11.9" antialias="true" height="6.79091" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="2" x="-4" y="-13" antialias="false" height="26" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <arc width="2" x="6" y="-5.10909" antialias="true" height="11.3182" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="-21" y="16" size="4" rotate="true" text="20-3/4&quot;H" tagg="label"/>
-        <terminal x="-29.565" y="0.266721" orientation="w"/>
-        <terminal x="20" y="0.55" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguitoalpex25-1h.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguitoalpex25-1h.elmt
deleted file mode 100644
index 41264bff1..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/manguitoalpex25-1h.elmt
+++ /dev/null
@@ -1,28 +0,0 @@
-<definition width="80" version="0.4" hotspot_x="34" hotspot_y="20" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{AF841E02-AAC2-4DC4-877B-B3AAA9A76AD4}"/><names>
-        <name lang="es">Manguito25-1"H</name>
-        <name lang="ca">Manguet  25-1"H</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.805" x1="17" y2="7.805" x2="22.67"/>
-        <rect width="5.36313" x="11.2321" y="-10.5422" antialias="false" height="22.3799" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="4.2525" x="19.835" y="7.805" antialias="true" height="9.195" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="3.88427" x="-28.5279" y="-9.5422" antialias="false" height="18.3799" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="32.7399" x="-24.6438" y="-15.0562" antialias="false" height="29.4079" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="16.1935" x="24.5347" y="-12.0623" antialias="false" height="24.8518" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="11.4307" x="28.2975" y="-8.71425" antialias="false" height="18.1557" style="line-style:dashed;line-weight:normal;filling:none;color:red"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="9.44136" x1="30.2026" y2="-7.80647" x2="32.1077"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="9.44136" x1="33.0603" y2="-8.71425" x2="35.918"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dashed;line-weight:normal;filling:none;color:red" y1="9.44136" x1="35.918" y2="-8.71425" x2="39.7282"/>
-        <rect width="7.0875" x="17" y="-16.715" antialias="false" height="33.715" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7.52" x1="17" y2="-7.52" x2="22.67"/>
-        <arc width="4.2525" x="19.835" y="-16.715" antialias="true" height="9.195" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <rect width="3" x="8" y="-18" antialias="false" height="36" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <arc width="2.835" x="21.2525" y="-7.52" antialias="true" height="15.325" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="-17" y="24" size="4" rotate="true" text=" 25-1&quot;H" tagg="label"/>
-        <terminal x="-29" y="0" orientation="w"/>
-        <terminal x="40" y="0" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/qet_directory
deleted file mode 100644
index 32c2a9dfb..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/qet_directory
+++ /dev/null
@@ -1,8 +0,0 @@
-<qet-directory>
-    <names>
-        <name lang="ca">Canonades multicapa</name>
-        <name lang="es">Tuberias multicapa</name>
-        <name lang="en">Multilayer pipes</name>
-        <name lang="fr">Tubes multicouches</name>
-    </names>
-</qet-directory>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/racoralpex16-1_2.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/racoralpex16-1_2.elmt
deleted file mode 100644
index 662f6790a..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/racoralpex16-1_2.elmt
+++ /dev/null
@@ -1,23 +0,0 @@
-<definition width="60" version="0.4" hotspot_x="34" hotspot_y="29" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{9C0183E4-34CF-4FCD-A2F7-B2ED78324EA9}"/><names>
-        <name lang="es">Rácor16-1/2"</name>
-        <name lang="ca">Ràcord 16-1/2"</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <arc width="9" x="-21" y="9" antialias="true" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <rect width="5" x="-12" y="-7" antialias="false" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="17" x="-29" y="-16" antialias="false" height="33" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-9" x1="-16.8382" y2="-9" x2="-28.1494"/>
-        <arc width="8" x="-20" y="-23" antialias="true" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9" x1="-28.0738" y2="9" x2="-16.92"/>
-        <arc width="7" x="-19" y="-9" antialias="true" height="18" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="-20" y="24.5" size="4" rotate="true" text="rá 16-1/2&quot;" tagg="label"/>
-        <rect width="22" x="-5" y="-9" antialias="false" height="18" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3" x="17" y="-6" antialias="false" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="-7" y="-12" antialias="false" height="24" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-29" y="0" orientation="w"/>
-        <terminal x="20.5" y="0" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/racoralpex20-3_4.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/racoralpex20-3_4.elmt
deleted file mode 100644
index f23e0cd56..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/racoralpex20-3_4.elmt
+++ /dev/null
@@ -1,23 +0,0 @@
-<definition width="60" version="0.4" hotspot_x="38" hotspot_y="16" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{D7B9BB83-B6D3-48D7-82D1-1BB6C59EBEAD}"/><names>
-        <name lang="es">Rácor 20-3/"</name>
-        <name lang="ca">Rácord 20-3/"</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <arc width="8.1" x="-23.9" y="15.2863" antialias="true" height="13.3242" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <rect width="4.8" x="-15.8" y="1.96202" antialias="false" height="11.6587" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="15.3" x="-31.1" y="-5.53284" antialias="false" height="27.4812" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0.296492" x1="-20.1544" y2="0.296492" x2="-30.3345"/>
-        <arc width="7.2" x="-23" y="-11.3622" antialias="true" height="11.6587" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15.2863" x1="-30.2665" y2="15.2863" x2="-20.228"/>
-        <arc width="6.3" x="-22.1" y="0.296492" antialias="true" height="14.9898" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="-23" y="25" size="4" rotate="true" text="rá 20-3/4&quot;" tagg="label"/>
-        <rect width="20.85" x="-9.5" y="0.296492" antialias="false" height="14.9898" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.4" x="11.35" y="2.79479" antialias="false" height="9.99317" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1.5" x="-11.15" y="-2.18766" antialias="false" height="19.7515" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-31.1" y="7.79137" orientation="w"/>
-        <terminal x="13.75" y="7.79137" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/racoralpex25-3_4.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/racoralpex25-3_4.elmt
deleted file mode 100644
index eae64dc82..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/racoralpex25-3_4.elmt
+++ /dev/null
@@ -1,23 +0,0 @@
-<definition width="60" version="0.4" hotspot_x="37" hotspot_y="19" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{9F0E7E3F-86F3-4D5A-A33D-8517A876E115}"/><names>
-        <name lang="es">Rácor 25-3/4</name>
-        <name lang="ca">Ràcord 25-3/4</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <arc width="9.315" x="-22.52" y="18.3855" antialias="true" height="15.845" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <rect width="4.995" x="-13.205" y="2.54058" antialias="false" height="13.8643" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="17.595" x="-30.8" y="-6.37214" antialias="false" height="32.6802" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0.559956" x1="-18.2125" y2="0.559956" x2="-29.9197"/>
-        <arc width="8.28" x="-21.485" y="-13.3044" antialias="true" height="13.8643" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="18.3855" x1="-29.8414" y2="18.3855" x2="-18.2972"/>
-        <arc width="7.245" x="-20.45" y="0.559956" antialias="true" height="17.8256" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="-20" y="34.5" size="4" rotate="true" text="rá 25-3/4" tagg="label"/>
-        <rect width="21.165" x="-5.96" y="0.559956" antialias="false" height="17.8256" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1.71" x="15.205" y="3.53089" antialias="false" height="11.8837" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.25" x="-8.075" y="-3.16735" antialias="false" height="24.5021" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-30.8" y="9.47274" orientation="w"/>
-        <terminal x="16.675" y="9.84938" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/racoralpex32-1.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/racoralpex32-1.elmt
deleted file mode 100644
index 76f09dc8d..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/racoralpex32-1.elmt
+++ /dev/null
@@ -1,23 +0,0 @@
-<definition width="80" version="0.4" hotspot_x="47" hotspot_y="34" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{5442DEFB-17DA-4D99-A45B-231CBEE923E7}"/><names>
-        <name lang="es">Rácor 32-1"</name>
-        <name lang="ca">Ràcord 32-1"</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <arc width="11.6503" x="-28.3407" y="11.4477" antialias="true" height="21.2812" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <rect width="6.63139" x="-16.6903" y="-9.83342" antialias="false" height="18.621" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="22.0062" x="-38.6965" y="-21.8041" antialias="false" height="43.8924" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12.4936" x1="-22.9533" y2="-12.4936" x2="-37.5954"/>
-        <arc width="10.3559" x="-27.0462" y="-31.1146" antialias="true" height="18.621" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="11.4477" x1="-37.4975" y2="11.4477" x2="-23.0592"/>
-        <arc width="9.06139" x="-25.7516" y="-12.4936" antialias="true" height="23.9413" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-180"/>
-        <input x="-25.1045" y="26.7694" size="4" rotate="true" text="rá 32-1&quot;" tagg="label"/>
-        <rect width="28.6452" x="-7.62896" y="-12.4936" antialias="false" height="23.9413" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.71688" x="21.0161" y="-8.50334" antialias="false" height="15.9609" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.43" x="-10.1063" y="-16.2193" antialias="false" height="30.7706" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <terminal x="-38.6965" y="-0.522919" orientation="w"/>
-        <terminal x="24.7331" y="-0.522919" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/reduccion20-16.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/reduccion20-16.elmt
deleted file mode 100644
index 55e635d9e..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/reduccion20-16.elmt
+++ /dev/null
@@ -1,22 +0,0 @@
-<definition width="60" version="0.4" hotspot_x="33" hotspot_y="16" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{EA2A0D71-C0E7-4204-93A7-26084F115B4F}"/><names>
-        <name lang="es">Reduccion 20-16</name>
-        <name lang="ca">Reducció 20-16</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="3.91" x="-1.94" y="-5.84453" antialias="false" height="10.4257" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1.91" x="21.565" y="-5.8871" antialias="false" height="10.4257" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.6" x="-29.7" y="-6.37002" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="18.4" x="-27.1" y="-10.3411" antialias="false" height="19.8845" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="17.595" x="3.97" y="-8.1759" antialias="false" height="16.6812" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="-9" y="-13" antialias="false" height="25" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="2" x="2" y="-11" antialias="false" height="22" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="-2" y2="-8" x2="-7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-2" y2="7" x2="-7"/>
-        <input x="-15" y="15" size="4" rotate="true" text="red 20-16" tagg="label"/>
-        <terminal x="-29" y="0" orientation="w"/>
-        <terminal x="23" y="0" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/reduccionalpex25-20.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/reduccionalpex25-20.elmt
deleted file mode 100644
index 083c82f2a..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/reduccionalpex25-20.elmt
+++ /dev/null
@@ -1,21 +0,0 @@
-<definition width="70" version="0.4" hotspot_x="44" hotspot_y="20" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{97A98939-7B92-4898-B90D-6CF806B34741}"/><names>
-        <name lang="es">Reducción25-20</name>
-        <name lang="ca">Reducció 25-20</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="4.048" x="-6.045" y="-4.52362" antialias="false" height="11.2465" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.048" x="19.219" y="-4.6483" antialias="false" height="11.2465" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5.06" x="-11.2" y="-7.3025" antialias="false" height="15.2289" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.06" x="-39.5" y="-7.3025" antialias="false" height="15.2289" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="23.24" x="-36.44" y="-12.394" antialias="false" height="24.3663" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="19.216" x="0.003" y="-8.0222" antialias="false" height="17.9945" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="-13" y="-15" antialias="false" height="29" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="2" x="-2" y="-11" antialias="false" height="23" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <input x="-23" y="18" size="4" rotate="true" text="red 25-20" tagg="label"/>
-        <terminal x="-39.5" y="0.3119" orientation="w"/>
-        <terminal x="21" y="0" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/reduccionalpex32-25.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/reduccionalpex32-25.elmt
deleted file mode 100644
index 4f99f5225..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/reduccionalpex32-25.elmt
+++ /dev/null
@@ -1,22 +0,0 @@
-<definition width="80" version="0.4" hotspot_x="35" hotspot_y="19" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{171CA378-8CF8-4CAC-BB4A-255FA5EBC87A}"/><names>
-        <name lang="es">Reduccion 32-25</name>
-        <name lang="ca">Reducció 32-25</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="5.19346" x="6.6919" y="-6.2118" antialias="false" height="13.3347" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.19346" x="37.2559" y="-6.5453" antialias="false" height="13.3347" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.10995" x="-30.1" y="-8.1421" antialias="false" height="17.4433" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="24.4398" x="-26.9901" y="-13.1194" antialias="false" height="27.9094" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="23.3706" x="13.8854" y="-10.5456" antialias="false" height="21.3356" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3" x="-3" y="-16" antialias="false" height="34" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="2" x="12" y="-13" antialias="false" height="26" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="7" y2="-9" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" x1="7" y2="10" x2="0"/>
-        <input x="-13" y="22" size="4" rotate="true" text="red 32-25" tagg="label"/>
-        <terminal x="-30" y="0" orientation="w"/>
-        <terminal x="40" y="-1" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tealpex16.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tealpex16.elmt
deleted file mode 100644
index cadf92d48..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tealpex16.elmt
+++ /dev/null
@@ -1,29 +0,0 @@
-<definition width="80" version="0.4" hotspot_x="31" hotspot_y="37" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{BD4D829B-29AB-42AB-9137-B6E68E1F7A5E}"/><names>
-        <name lang="es">Te Alpex 16</name>
-        <name lang="ca">Te Alpex 16</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="17" x="-1" y="-30.8835" antialias="false" height="15.8835" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="12" x="2" y="-13" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="20" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="10" x="14" y="-14" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <rect width="2.09" x="42.81" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="11" x="2" y="-33.0013" antialias="false" height="2.1178" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="-5" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="-27" y="-5" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="18" x="-25" y="-8" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="18.81" x="24" y="-8" antialias="false" height="16" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="10" x="-8" y="-14" antialias="true" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="5" x1="-2" y2="5" x2="20"/>
-        <rect width="2" x="-7" y="-10" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="22" x="-3" y="-15" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="2" x="22" y="-10" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <input x="-2" y="11" size="4" rotate="true" text="16" tagg="label"/>
-        <terminal x="-27" y="0" orientation="w"/>
-        <terminal x="8" y="-33.0013" orientation="n"/>
-        <terminal x="44.9" y="0" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tealpex20-16-20.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tealpex20-16-20.elmt
deleted file mode 100644
index 5def70798..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tealpex20-16-20.elmt
+++ /dev/null
@@ -1,29 +0,0 @@
-<definition width="100" version="0.4" hotspot_x="47" hotspot_y="42" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{AA3F23AD-800D-41A3-9F09-938971F27F3A}"/><names>
-        <name lang="es">Te Alpex 20-16-20</name>
-        <name lang="ca">Te Alpex 20-16-20</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="14.8323" x="-6.03731" y="-33.5547" antialias="false" height="16.6377" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="13.8" x="-5.35" y="-16.3123" antialias="false" height="3.72834" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.6" x="15.35" y="-6.37002" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="11.5" x="8.45" y="-17.555" antialias="true" height="11.185" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <rect width="2.73" x="43.685" y="-6.6128" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="9.59738" x="-3.41984" y="-35.8823" antialias="false" height="2.32754" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.6" x="-15.7" y="-6.37002" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2.79693" x="-40.2906" y="-6.37002" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="19.7937" x="-37.4937" y="-10.3411" antialias="false" height="19.8845" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="21.735" x="21.95" y="-10.3411" antialias="false" height="19.8845" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="11.5" x="-16.85" y="-17.555" antialias="true" height="11.185" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6.05777" x1="-9.95" y2="6.05777" x2="15.35"/>
-        <rect width="2" x="-18" y="-13" antialias="false" height="25" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="2" x="20" y="-14" antialias="false" height="27" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="20" x="-9" y="-17" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <input x="-15" y="16" size="4" rotate="true" text=" 20-16-20" tagg="label"/>
-        <terminal x="-40" y="0" orientation="w"/>
-        <terminal x="0.9426" y="-35.8823" orientation="n"/>
-        <terminal x="46.415" y="-0.39891" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tealpex20.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tealpex20.elmt
deleted file mode 100644
index cff0a2cbf..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tealpex20.elmt
+++ /dev/null
@@ -1,29 +0,0 @@
-<definition width="100" version="0.4" hotspot_x="48" hotspot_y="45" height="60" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{82CAE1A1-697C-4064-BB75-E3659D938CCB}"/><names>
-        <name lang="es">Te Alpex 20</name>
-        <name lang="ca">Te Alpex 20</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="3" x="18" y="-13" antialias="false" height="25" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="21.8323" x="-10.0373" y="-37.7314" antialias="false" height="18.8161" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="13.8" x="-6.35" y="-17.3123" antialias="false" height="4.72834" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.6" x="14.35" y="-6.37002" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="11.5" x="7.45" y="-17.555" antialias="true" height="11.185" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <rect width="2.6" x="41.65" y="-6.6128" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="14.5974" x="-6.41984" y="-40.0946" antialias="false" height="2.36322" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4.6" x="-16.7" y="-6.37002" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1.6" x="-39.7" y="-6.37002" antialias="false" height="12.4278" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="18.4" x="-38.1" y="-10.3411" antialias="false" height="19.8845" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="20.7" x="20.95" y="-10.3411" antialias="false" height="19.8845" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="11.5" x="-17.85" y="-17.555" antialias="true" height="11.185" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6.05777" x1="-10.95" y2="6.05777" x2="14.35"/>
-        <rect width="3" x="-20" y="-13" antialias="false" height="25" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="28" x="-13" y="-19" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <input x="-13" y="14" size="4" rotate="true" text="Te 20" tagg="label"/>
-        <terminal x="-40" y="0" orientation="w"/>
-        <terminal x="-0.0574" y="-40.0946" orientation="n"/>
-        <terminal x="44.25" y="-0.39891" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tealpex25-20-25.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tealpex25-20-25.elmt
deleted file mode 100644
index 1f9c43448..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tealpex25-20-25.elmt
+++ /dev/null
@@ -1,29 +0,0 @@
-<definition width="110" version="0.4" hotspot_x="57" hotspot_y="50" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{A0BBA298-82A9-4AB7-9581-DBC4C20B79A8}"/><names>
-        <name lang="es">Te Alpex 25-20-25</name>
-        <name lang="ca">Te Alpex 25-20-25</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="3" x="16" y="-15" antialias="false" height="29" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="15.5671" x="-10.8226" y="-40.0799" antialias="false" height="18.5943" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="11.18" x="-8.815" y="-20.4857" antialias="false" height="4.56867" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5.06" x="10.955" y="-8.3025" antialias="false" height="15.2289" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="14.65" x="2.365" y="-22.0085" antialias="true" height="13.706" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <rect width="2.163" x="42.9235" y="-7.8254" antialias="false" height="15.2289" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="10.0728" x="-8.07545" y="-41.7989" antialias="false" height="1.71887" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5.06" x="-22.2" y="-8.3025" antialias="false" height="15.2289" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.29352" x="-50.2781" y="-7.3025" antialias="false" height="15.2289" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="21.7846" x="-46.9846" y="-12.394" antialias="false" height="24.3663" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="23.9085" x="19.015" y="-12.394" antialias="false" height="24.3663" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="14.65" x="-23.465" y="-22.0085" antialias="true" height="13.706" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6.92635" x1="-15.875" y2="6.92635" x2="11.955"/>
-        <rect width="3" x="-25" y="-15" antialias="false" height="29" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="21" x="-14" y="-22" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <input x="-24" y="16" size="4" rotate="true" text="25-20-25" tagg="label"/>
-        <terminal x="-50.2781" y="0.3119" orientation="w"/>
-        <terminal x="-3.4969" y="-41.7989" orientation="n"/>
-        <terminal x="45.0865" y="-0.21099" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tealpex25.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tealpex25.elmt
deleted file mode 100644
index bbec57367..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tealpex25.elmt
+++ /dev/null
@@ -1,29 +0,0 @@
-<definition width="110" version="0.4" hotspot_x="57" hotspot_y="52" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{A22B7257-75B0-4073-AE5D-94E7255C57C4}"/><names>
-        <name lang="es">Te Alpex 25</name>
-        <name lang="ca">Te Alpex 25</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="3" x="16" y="-16" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="21.505" x="-15.61" y="-44.3289" antialias="false" height="22.8433" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="15.18" x="-11.815" y="-19.4857" antialias="false" height="4.56867" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5.06" x="10.955" y="-7.3025" antialias="false" height="15.2289" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="12.65" x="3.365" y="-21.0085" antialias="true" height="13.706" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <rect width="2.06" x="41.785" y="-7.8254" antialias="false" height="15.2289" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="13.915" x="-11.815" y="-46.8977" antialias="false" height="2.56867" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="5.06" x="-23.2" y="-7.3025" antialias="false" height="15.2289" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.289" x="-49.2" y="-7.3025" antialias="false" height="15.2289" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="20.24" x="-46.44" y="-12.394" antialias="false" height="24.3663" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="22.77" x="19.015" y="-12.394" antialias="false" height="24.3663" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="12.65" x="-24.465" y="-21.0085" antialias="true" height="13.706" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.92635" x1="-16.875" y2="7.92635" x2="10.955"/>
-        <rect width="3" x="-27" y="-15" antialias="false" height="30" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="27" x="-18" y="-22" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <input x="-12" y="16" size="4" rotate="true" text="Te 25" tagg="label"/>
-        <terminal x="-49.2" y="0.3119" orientation="w"/>
-        <terminal x="-5.49" y="-46.8977" orientation="n"/>
-        <terminal x="43.845" y="-0.21099" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tealpex32-25-32.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tealpex32-25-32.elmt
deleted file mode 100644
index 8f194784d..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tealpex32-25-32.elmt
+++ /dev/null
@@ -1,29 +0,0 @@
-<definition width="120" version="0.4" hotspot_x="55" hotspot_y="56" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{424C67B2-A9FA-4BD8-A245-4494F3E6829F}"/><names>
-        <name lang="es">Te Alpex 32-25-32</name>
-        <name lang="ca">Te Alpex 32-25-32</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="3" x="27" y="-18" antialias="false" height="34" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="23.2254" x="-7.632" y="-45.8467" antialias="false" height="21.0697" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="18.216" x="-5.078" y="-22.7772" antialias="false" height="5.3143" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6.072" x="21.246" y="-8.60561" antialias="false" height="17.7143" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="15.18" x="13.138" y="-24.5485" antialias="true" height="15.9429" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <rect width="3.072" x="56.642" y="-9.3771" antialias="false" height="17.7143" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="15.0282" x="-3.5334" y="-47.7791" antialias="false" height="1.9322" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6.072" x="-18.74" y="-8.60561" antialias="false" height="17.7143" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.3396" x="-50" y="-8.60561" antialias="false" height="17.7143" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="24.288" x="-46.028" y="-14.6913" antialias="false" height="28.343" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="27.324" x="29.318" y="-14.6913" antialias="false" height="28.343" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="15.18" x="-20.258" y="-24.5485" antialias="true" height="15.9429" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9.10868" x1="-11.15" y2="9.10868" x2="22.246"/>
-        <rect width="3" x="-22" y="-17" antialias="false" height="34" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="30" x="-11" y="-25" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <input x="-16" y="14" size="4" rotate="true" text=" 32-25-32" tagg="label"/>
-        <terminal x="-50" y="0.251509" orientation="w"/>
-        <terminal x="3.2976" y="-47.7791" orientation="n"/>
-        <terminal x="59.714" y="-0.51993" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tealpex32.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tealpex32.elmt
deleted file mode 100644
index 9dfc6ce44..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tealpex32.elmt
+++ /dev/null
@@ -1,29 +0,0 @@
-<definition width="120" version="0.4" hotspot_x="54" hotspot_y="60" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{1B86CA5D-35EC-4B9F-8101-4CEC7E62B32B}"/><names>
-        <name lang="es">Te Alpex 32</name>
-        <name lang="ca">Te Alpex 32</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="3" x="28" y="-19" antialias="false" height="35" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="25.806" x="-9.632" y="-53.3485" antialias="false" height="26.5715" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="18.216" x="-5.078" y="-23.7772" antialias="false" height="5.3143" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6.072" x="22.246" y="-9.60561" antialias="false" height="17.7143" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="15.18" x="13.138" y="-25.5485" antialias="true" height="15.9429" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-90"/>
-        <rect width="3.072" x="57.642" y="-9.3771" antialias="false" height="17.7143" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="16.698" x="-5.078" y="-55.663" antialias="false" height="2.3143" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6.072" x="-18.74" y="-9.60561" antialias="false" height="17.7143" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="3.6432" x="-49.9" y="-8.60561" antialias="false" height="17.7143" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="24.288" x="-46.028" y="-14.6913" antialias="false" height="28.343" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="27.324" x="30.318" y="-14.6913" antialias="false" height="28.343" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="15.18" x="-20.258" y="-25.5485" antialias="true" height="15.9429" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="8.10868" x1="-11.15" y2="8.10868" x2="22.246"/>
-        <rect width="32" x="-12" y="-27" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="3" x="-22" y="-18" antialias="false" height="35" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <input x="-15" y="15" size="4" rotate="true" text="Te 32" tagg="label"/>
-        <terminal x="-49.9" y="0.251509" orientation="w"/>
-        <terminal x="2.512" y="-55.663" orientation="n"/>
-        <terminal x="60.714" y="-0.51993" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tuboalpex16.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tuboalpex16.elmt
deleted file mode 100644
index 2247296de..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tuboalpex16.elmt
+++ /dev/null
@@ -1,14 +0,0 @@
-<definition width="90" version="0.4" hotspot_x="45" hotspot_y="15" height="20" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{B3BFD6EB-E70F-459F-8078-9AD9C87B9817}"/><names>
-        <name lang="es">Tubo Alpex 16</name>
-        <name lang="ca">Tub Alpex 16</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="79" x="-39" y="-10" antialias="false" height="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-13" y="-6" size="4" rotate="true" text="Alpex 16" tagg="label"/>
-        <terminal x="-39" y="-5" orientation="w"/>
-        <terminal x="39" y="-5" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tuboalpex20.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tuboalpex20.elmt
deleted file mode 100644
index 90f95af38..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tuboalpex20.elmt
+++ /dev/null
@@ -1,14 +0,0 @@
-<definition width="90" version="0.4" hotspot_x="46" hotspot_y="9" height="20" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{382A8C37-B113-4DD7-8A91-B424ED88C0E3}"/><names>
-        <name lang="es">Tubo Alpex 20</name>
-        <name lang="ca">Tub Alpex 20</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="79" x="-40" y="-7" antialias="false" height="15" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-15" y="-1" size="4" rotate="true" text="Alpex 20" tagg="label"/>
-        <terminal x="-40" y="0" orientation="w"/>
-        <terminal x="38" y="0" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tuboalpex25.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tuboalpex25.elmt
deleted file mode 100644
index e30a599ec..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tuboalpex25.elmt
+++ /dev/null
@@ -1,14 +0,0 @@
-<definition width="90" version="0.4" hotspot_x="46" hotspot_y="15" height="30" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{BA2E3631-4767-4986-A235-25BF691AD568}"/><names>
-        <name lang="es">Tubo Alpex 25</name>
-        <name lang="ca">Tub Alpex 25</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="79" x="-40" y="-10" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-15" y="0" size="4" rotate="true" text="Alpex 25" tagg="label"/>
-        <terminal x="-40" y="0" orientation="w"/>
-        <terminal x="38" y="0" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tuboalpex32.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tuboalpex32.elmt
deleted file mode 100644
index 18979feb2..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/tub-multicapa/tuboalpex32.elmt
+++ /dev/null
@@ -1,14 +0,0 @@
-<definition width="90" version="0.4" hotspot_x="46" hotspot_y="20" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{7605E837-ACD4-4F76-BCB0-F1A0D18B95FE}"/><names>
-        <name lang="es">Tubo Alpex 32</name>
-        <name lang="ca">Tub Alpex 32</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="79" x="-40" y="-14" antialias="false" height="28" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-18" y="1" size="4" rotate="true" text="Alpex 32" tagg="label"/>
-        <terminal x="-40" y="0" orientation="w"/>
-        <terminal x="38" y="0" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/control-camara1.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/control-camara1.elmt
deleted file mode 100644
index f98c9cad7..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/control-camara1.elmt
+++ /dev/null
@@ -1,32 +0,0 @@
-<definition width="60" version="0.4" hotspot_x="32" hotspot_y="31" height="50" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{C0D8D3A0-8E7F-4C5F-805E-5544CDBD2B8B}"/><names>
-        <name lang="es">Controlador servicio 1</name>
-    </names>
-    <informations></informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2.90147" x1="19.1" y2="10.1147" x2="19.1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2.90147" x1="-10.8" y2="10.1147" x2="-10.8"/>
-        <text x="-17.3" y="7.22941" size="3" text="na"/>
-        <text x="12.6" y="7.22941" size="3" text="s1"/>
-        <line 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.90147" x1="0.9" y2="10.1147" x2="0.9"/>
-        <text x="-5.6" y="7.22941" size="3" text="nc"/>
-        <polygon x4="-6.9" y5="-12.9676" x5="-4.3" y6="-12.9676" x6="-4.3" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:red" closed="false" y1="-12.9676" x1="-4.3" y2="-12.9676" x2="2.2" y3="-4.31176" x3="-0.4" y4="-4.31176"/>
-        <rect width="28.6" x="-19.9" y="-17.2956" antialias="false" height="17.3118" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y1="-8.6397" x1="-5.6" y2="-8.6397" x2="0.9"/>
-        <polygon x4="-17.3" y5="-12.9676" x5="-14.7" y6="-12.9676" x6="-14.7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:red" closed="false" y1="-12.9676" x1="-14.7" y2="-12.9676" x2="-8.2" y3="-4.31176" x3="-10.8" y4="-4.31176"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y1="-8.6397" x1="-16" y2="-8.6397" x2="-9.5"/>
-        <polygon x4="15.2" y5="-14.4103" x5="11.3" y6="-11.525" x6="11.3" y7="-11.525" x7="11.3" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:red" closed="false" y1="-11.525" x1="12.6" y2="-11.525" x2="19.1" y3="-14.4103" x3="19.1" y4="-17.2956"/>
-        <polygon x4="15.2" y5="-5.75441" x5="11.3" y6="-8.6397" x6="11.3" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:blue" closed="false" y1="-8.6397" x1="11.3" y2="-8.6397" x2="19.1" y3="-5.75441" x3="19.1" y4="-2.86912"/>
-        <rect width="46.8" x="-25.1" y="-21.6235" antialias="false" height="24.525" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="21.7" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-21.6235" x1="-25.1" y2="-24.5088" x2="-19.9" y3="-24.5088" x3="24.3" y4="-21.6235"/>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-24.5088" x1="24.3" y2="0.0161783" x2="24.3" y3="2.90147" x3="21.7"/>
-        <ellipse width="1.3" x="4.8" y="-12.9676" antialias="true" height="1.44265" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="3.9" x="3.5" y="-8.6397" antialias="true" height="4.32794" 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="2.90147" x1="-22.5" y2="10.1147" x2="-22.5"/>
-        <text x="-27.7" y="7.22941" size="3" text="c"/>
-        <terminal x="-22.5" y="10.1147" orientation="s"/>
-        <terminal x="-10.8" y="10.1147" orientation="s"/>
-        <terminal x="19.1" y="10.1147" orientation="s"/>
-        <terminal x="0.9" y="10.1147" orientation="s"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/controlador-digital.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/controlador-digital.elmt
deleted file mode 100644
index 98c9fb936..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/controlador-digital.elmt
+++ /dev/null
@@ -1,41 +0,0 @@
-<definition width="50" version="0.4" hotspot_x="21" hotspot_y="19" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{728D3DDC-D98B-4BA5-AF3B-DD07A455EBED}"/><names>
-        <name lang="es">Indicador-controlador</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="14.3211" x1="-14.22" y2="14.3211" x2="16.02"/>
-        <line 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.67399" x1="-3.16739" y2="-5.67399" x2="4.95636"/>
-        <line 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.67399" x1="5.1" y2="-7.74376" x2="8.25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="11.7253" x1="19.8" y2="-0.388555" x2="19.8"/>
-        <polygon x4="-2.124" y5="10.0235" x5="-5.148" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="10.86" x1="-4.14" y2="10.86" x2="1.908" y3="0.822834" x3="4.932" y4="0.822834"/>
-        <line 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.67399" x1="-3.3" y2="-7.74376" x2="-0.15"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="12.7495" x1="-11.906" y2="12.7495" x2="13.6619"/>
-        <polygon x4="6.948" y5="10.0235" x5="3.924" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="10.86" x1="4.932" y2="10.86" x2="10.98" y3="0.822834" x3="14.004" y4="0.822834"/>
-        <arc width="8.82" x="10.98" y="9.99477" antialias="true" height="4.32637" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-90"/>
-        <arc width="8.82" x="-18" y="-2.98438" antialias="true" height="4.32637" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-90"/>
-        <arc width="8.82" x="10.98" y="-2.98438" antialias="true" height="4.32637" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <arc width="8.82" x="-18" y="9.99477" antialias="true" height="4.32637" 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="5.84143" x1="-2.124" y2="5.84143" x2="1.908"/>
-        <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.84143" x1="6.948" y2="5.84143" x2="10.98"/>
-        <line 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.98438" x1="-14.22" y2="-2.98438" x2="16.02"/>
-        <arc width="7.45731" x="-15.102" y="9.31902" antialias="true" height="3.43055" style="line-style:normal;line-weight:thin;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="11.7253" x1="-18" y2="-0.388555" x2="-18"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="10.6912" x1="16.8579" y2="1.0857" x2="16.8579"/>
-        <arc width="7.45731" x="-15.102" y="-0.972616" antialias="true" height="3.43055" style="line-style:normal;line-weight:thin;filling:none;color:black" start="-180" angle="-90"/>
-        <arc width="7.45731" x="9.40059" y="9.31902" antialias="true" height="3.43055" style="line-style:normal;line-weight:thin;filling:none;color:black" start="0" angle="-90"/>
-        <arc width="7.45731" x="9.40059" y="-0.972616" antialias="true" height="3.43055" style="line-style:normal;line-weight:thin;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="-0.972616" x1="-11.906" y2="-0.972616" x2="13.6619"/>
-        <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="10.6912" x1="-15.102" y2="1.0857" x2="-15.102"/>
-        <polygon x4="-11.196" y5="10.0235" x5="-14.22" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="10.86" x1="-13.212" y2="10.86" x2="-7.164" y3="0.822834" x3="-4.14" y4="0.822834"/>
-        <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.84143" x1="-11.196" y2="5.84143" x2="-7.164"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="19.8" x2="25.05" x3="25.05" x4="24" antialias="false" x5="21.9" x6="-7.5" x7="-10.65" x8="-16.95" x9="-16.95" closed="false" y1="12.9539" y2="8.81438" y3="-5.67399" y4="-6.70887" y5="-7.74376" y6="-7.74376" y7="-6.70887" y8="-2.56934" y9="-2.56934"/>
-        <line 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.67399" x1="9.43264" y2="-5.67399" x2="17.5564"/>
-        <line 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.67399" x1="17.7" y2="-7.74376" x2="20.85"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-5.67399" x1="9.3" y2="-7.74376" x2="12.45"/>
-        <terminal x="0.9" y="-10.8484" orientation="n"/>
-        <terminal x="11.4" y="-10.8484" orientation="n"/>
-        <terminal x="19.8" y="-10.8484" orientation="n"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/termometro-digi.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/termometro-digi.elmt
deleted file mode 100644
index 8f42c2dfb..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/termometro-digi.elmt
+++ /dev/null
@@ -1,22 +0,0 @@
-<definition width="50" version="0.4" hotspot_x="28" hotspot_y="20" height="30" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{B849FD85-9307-4510-A026-A63F13B51976}"/><names>
-        <name lang="es">Indicador temperatura</name>
-    </names>
-    <informations></informations>
-    <description>
-        <rect width="2" x="10" y="3" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="-8" y5="-9" x5="-6" y6="-9" x6="-6" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:red" closed="false" y1="-9" x1="-6" y2="-9" x2="-1" y3="-3" x3="-3" y4="-3"/>
-        <rect width="22" x="-18" y="-12" antialias="false" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y1="-6" x1="-7" y2="-6" x2="-2"/>
-        <polygon x4="-16" y5="-9" x5="-14" y6="-9" x6="-14" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:red" closed="false" y1="-9" x1="-14" y2="-9" x2="-9" y3="-3" x3="-11" y4="-3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y1="-6" x1="-15" y2="-6" x2="-10"/>
-        <polygon x4="9" y5="-10" x5="6" y6="-8" x6="6" y7="-8" x7="6" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:red" closed="false" y1="-8" x1="7" y2="-8" x2="12" y3="-10" x3="12" y4="-12"/>
-        <polygon x4="9" y5="-4" x5="6" y6="-6" x6="6" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:blue" closed="false" y1="-6" x1="6" y2="-6" x2="12" y3="-4" x3="12" y4="-2"/>
-        <rect width="36" x="-22" y="-15" antialias="false" height="17" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="14" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-15" x1="-22" y2="-17" x2="-18" y3="-17" x3="16" y4="-15"/>
-        <polygon antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-17" x1="16" y2="0" x2="16" y3="2" x3="14"/>
-        <circle x="1" y="-9" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1"/>
-        <arc width="3" x="0" y="-6" antialias="true" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-180"/>
-        <terminal x="11" y="5" orientation="s"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/termostato-bulbo2.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/termostato-bulbo2.elmt
deleted file mode 100644
index c2e4c9a1e..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Frio/equipo-frigorifico/controles/termostato-bulbo2.elmt
+++ /dev/null
@@ -1,31 +0,0 @@
-<definition hotspot_x="14" hotspot_y="17" width="70" version="0.5" type="element" orientation="dyyy" height="60" link_type="simple">
-<uuid uuid="{461C5EFF-366A-4512-875D-531D86940E91}"/><names>
-        <name lang="es">Termostato bulbo</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="24" x="-12" y="-12" height="29"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="14" x="-7" y="-8"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y1="-4" length1="1.5" y2="0" length2="1.5" x1="-4" x2="1" end1="none" end2="none"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="1" x="-8" y="4"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="1" x="-9" y="-3"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="1" x="-7" y="-8"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="1" x="4" y="-9"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" diameter="1" x="-2" y="-10"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="7" x="-8" y="12" height="2"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" y1="13" length1="1.5" y2="13" length2="1.5" x1="-4" x2="-2" end1="none" end2="none"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="0" x="5" y="20" height="1"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="4" x="7" y="17" height="3"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:red" antialias="true" start="0" width="11" angle="-180" x="9" y="22" height="18"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:red" antialias="false" y1="30" length1="1.5" y2="21" length2="1.5" x1="9" x2="9" end1="none" end2="none"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:red" antialias="false" y1="29.8575" length1="1.5" y2="-7.86849" length2="1.5" x1="20" x2="20" end1="none" end2="none"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:red" antialias="true" diameter="7" x="20" y="-11"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:red" antialias="false" y1="-11" length1="1.5" y2="-11" length2="1.5" x1="24.7968" x2="36.2032" end1="none" end2="none"/>
-        <polygon antialias="false" closed="false" y1="-11" y2="-14" y3="-14" y4="-11" y5="-9" y6="-9" x1="36" y7="-11" x2="39" y8="-11" x3="50" y9="-11" x4="52" style="line-style:normal;line-weight:normal;filling:none;color:red" x5="50" x6="38" x7="36" x8="36" x9="36" y10="-11" x10="36"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" width="3" x="-11" y="17" height="4"/>
-        <input text="_" x="-13" y="-14" tagg="label" rotate="true" size="4"/>
-        <terminal x="50" y="-11" orientation="e"/>
-        <terminal x="-10" y="20" orientation="s"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/instalaciones-gas/contador-gas.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/instalaciones-gas/contador-gas.elmt
deleted file mode 100644
index a2ae24613..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/instalaciones-gas/contador-gas.elmt
+++ /dev/null
@@ -1,21 +0,0 @@
-<definition link_type="simple" type="element" hotspot_x="15" hotspot_y="16" version="0.5" width="30" height="40" orientation="dyyy">
-<uuid uuid="{C74D6206-4E3B-45DC-B7DC-25DF90E5354C}"/><names>
-        <name lang="es">Contador gas</name>
-        <name lang="fr">Compteur GAZ</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect y="-9.87031" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" width="2.175" height="2.34336" x="6.575"/>
-        <rect y="-9.87031" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" width="2.175" height="2.34336" x="-8.65"/>
-        <polygon x2="-10.825" y5="-5.1836" x3="10.925" antialias="false" x4="10.925" x5="-10.825" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-5.1836" y2="18.25" y3="18.25" x1="-10.825" y4="-5.1836"/>
-        <rect y="6.5332" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" width="26.1" height="1.17168" x="-13"/>
-        <rect y="-7.52696" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" width="4.35" height="2.34336" x="5.4875"/>
-        <rect y="-7.52696" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" width="4.35" height="2.34336" x="-9.7375"/>
-        <rect y="-1.66856" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" width="6.525" height="3.51504" x="1.1375"/>
-        <rect y="-2.84024" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" width="8.7" height="5.8584" x="0.05"/>
-        <input y="13" tagg="label" size="4" rotate="true" x="-9" text="GLP"/>
-        <terminal y="-10" orientation="n" x="-10"/>
-        <terminal y="-10" orientation="n" x="10"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/instalaciones-gas/tuberia-vaina-acero.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/instalaciones-gas/tuberia-vaina-acero.elmt
deleted file mode 100644
index 25babd909..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/instalaciones-gas/tuberia-vaina-acero.elmt
+++ /dev/null
@@ -1,26 +0,0 @@
-<definition link_type="simple" version="0.5" width="50" height="20" hotspot_x="24" type="element" hotspot_y="9" orientation="dyyy">
-<uuid uuid="{CEA6828B-AC78-42A5-B6B9-4536F6FF3729}"/><names>
-        <name lang="es">Tuberia vaina acero</name>
-        <name lang="ca">Canonada acer</name>
-    </names>
-    <informations></informations>
-    <description>
-        <line x2="11.625" length1="1.5" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" end1="none" end2="none" y1="4" y2="4" x1="-5.625"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" start="-270" antialias="true" width="3.56" height="5.83305" angle="-180" x="16.13" y="-1.83301"/>
-        <line x2="13.625" length1="1.5" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" end1="none" end2="none" y1="-1" y2="-1" x1="-3.625"/>
-        <line x2="13.625" length1="1.5" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" end1="none" end2="none" y1="2" y2="2" x1="-3.625"/>
-        <line x2="17.1783" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end1="none" end2="none" y1="-1.83301" y2="-1.83301" x1="15.4373"/>
-        <line x2="17.1783" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end1="none" end2="none" y1="4.00002" y2="4.00002" x1="15.4373"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" start="-270" antialias="true" width="6" height="10.3911" angle="-180" x="9.75" y="-4.39106"/>
-        <line x2="-8" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end1="none" end2="none" y1="4" y2="4" x1="-17"/>
-        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="true" width="3.3" height="6.38775" x="-19.575" y="-2.38775"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" start="-230" antialias="true" width="5" height="10.3911" angle="-260" x="-12" y="-4.39106"/>
-        <line x2="12.25" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end1="none" end2="none" y1="-4.39106" y2="-4.39106" x1="-9.5"/>
-        <line x2="12.25" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end1="none" end2="none" y1="6" y2="6" x1="-9.5"/>
-        <line x2="-8.17857" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" end1="none" end2="none" y1="-2.5" y2="-2.5" x1="-17.8214"/>
-        <input text="_" tagg="label" rotate="true" x="-3" y="-10" size="4"/>
-        <line x2="12.625" length1="1.5" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" end1="none" end2="none" y1="-3" y2="-3" x1="-4.625"/>
-        <terminal x="-20" y="0" orientation="w"/>
-        <terminal x="20" y="0" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/bomba-circuladora-2.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/bomba-circuladora-2.elmt
deleted file mode 100644
index bf76d2f6e..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/bomba-circuladora-2.elmt
+++ /dev/null
@@ -1,33 +0,0 @@
-<definition width="50" version="0.4" hotspot_x="24" hotspot_y="27" height="40" link_type="simple" type="element" orientation="dyyy">
-<uuid uuid="{A7353DB5-36A2-46F8-9F00-FBF0FBC74D4F}"/><names>
-        <name lang="es">Bomba circuladora-2</name>
-        <name lang="en">Circulation pump-2</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="14" y2="2" x2="17"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="-17" y2="2" x2="-14"/>
-        <polygon x4="9" y5="-5" x5="9" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-4" x1="-8" y2="-21" x2="-6" y3="-21" x3="7" y4="-5"/>
-        <rect width="3" x="11" y="-2" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="14" y="-4" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" x1="14" y2="-2" x2="17"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="-10" y2="-3" x2="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" x1="-4" y2="-6" x2="-5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" x1="5" y2="-6" x2="7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" x1="3" y2="-6" x2="4"/>
-        <rect width="3" x="-13" y="-2" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="-17" y="-4" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" x1="-1" y2="-6" x2="-2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" x1="-17" y2="-2" x2="-14"/>
-        <rect width="4" x="8" y="-19" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-19.52" x1="-6" y2="-19.52" x2="7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-5.52" x1="-8" y2="-5.52" x2="7"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" x2="-7" x3="8" x4="11" antialias="false" x5="11" x6="9" x7="-7" x8="-10" x9="-10" closed="false" y1="-3" y10="-3" y2="-5" y11="-3" y3="-5" y4="-3" y5="3" x10="-10" y6="5" x11="-10" y7="5" y8="3" y9="-3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" x1="6" y2="7" x2="-3"/>
-        <input x="-7" y="6" size="6" rotate="true" text="_" tagg="label"/>
-        <terminal x="-17" y="0" orientation="w"/>
-        <terminal x="18" y="0" orientation="e"/>
-        <terminal x="12" y="-17" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/bomba-circuladora-iz.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/bomba-circuladora-iz.elmt
deleted file mode 100644
index 7ca8a35ff..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/bomba-circuladora-iz.elmt
+++ /dev/null
@@ -1,33 +0,0 @@
-<definition width="50" version="0.4" hotspot_x="24" hotspot_y="27" height="40" link_type="simple" type="element" orientation="dyyy">
-<uuid uuid="{6D1E6FEC-7EE4-4E6B-BEA3-5EBA076F70B5}"/><names>
-        <name lang="es">Bomba circuladora-2</name>
-        <name lang="en">Circulation pump-left</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="14" y2="2" x2="17"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" x1="-17" y2="2" x2="-14"/>
-        <polygon x4="9" y5="-5" x5="9" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-4" x1="-8" y2="-21" x2="-6" y3="-21" x3="7" y4="-5"/>
-        <rect width="3" x="11" y="-2" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="14" y="-4" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" x1="14" y2="-2" x2="17"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="-10" y2="-3" x2="11"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" x1="-4" y2="-6" x2="-5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" x1="5" y2="-6" x2="7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" x1="3" y2="-6" x2="4"/>
-        <rect width="3" x="-13" y="-2" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="-17" y="-4" antialias="false" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-19" x1="-1" y2="-6" x2="-2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-2" x1="-17" y2="-2" x2="-14"/>
-        <rect width="4" x="8" y="-19" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-19.52" x1="-6" y2="-19.52" x2="7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-5.52" x1="-8" y2="-5.52" x2="7"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" x2="-7" x3="8" x4="11" antialias="false" x5="11" x6="9" x7="-7" x8="-10" x9="-10" closed="false" y1="-3" y10="-3" y2="-5" y11="-3" y3="-5" y4="-3" y5="3" x10="-10" y6="5" x11="-10" y7="5" y8="3" y9="-3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="simple" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7" x1="6" y2="7" x2="-3"/>
-        <input x="-7" y="6" size="6" rotate="true" text="_" tagg="label"/>
-        <terminal x="-17" y="0" orientation="w"/>
-        <terminal x="18" y="0" orientation="e"/>
-        <terminal x="12" y="-17" orientation="e"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/bomba-circuladora.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/bomba-circuladora.elmt
deleted file mode 100644
index a2fca3fd5..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/bomba-circuladora.elmt
+++ /dev/null
@@ -1,35 +0,0 @@
-<definition orientation="dyyy" link_type="simple" type="element" hotspot_x="24" hotspot_y="29" width="50" height="40" version="0.5">
-<uuid uuid="{33F87AEE-BD92-47FF-8849-EFEA2CF0D4DC}"/><names>
-        <name lang="ca">Bomba circuladora</name>
-        <name lang="es">Bomba circuladora</name>
-        <name lang="en">Circulating pump</name>
-        <name lang="it">Pompa circolazione</name>
-        <name lang="fr">Pompe de circulation</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <line x2="18" y2="2" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" y1="2" length2="1.5" x1="15" length1="1.5" end1="none"/>
-        <line x2="-15" y2="2" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" y1="2" length2="1.5" x1="-18" length1="1.5" end1="none"/>
-        <polygon x2="-6" y4="-7" y5="-7" y2="-23" x3="7" x5="9" style="line-style:normal;line-weight:normal;filling:none;color:black" y3="-23" closed="false" antialias="false" y1="-6" x1="-8" x4="9"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-2" antialias="false" width="4" height="4" x="11"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4" antialias="false" width="4" height="8" x="15"/>
-        <line x2="18" y2="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" y1="-2" length2="1.5" x1="15" length1="1.5" end1="none"/>
-        <line x2="-5" y2="-8" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" y1="-21" length2="1.5" x1="-4" length1="1.5" end1="none"/>
-        <line x2="7" y2="-8" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" y1="-21" length2="1.5" x1="5" length1="1.5" end1="none"/>
-        <line x2="4" y2="-8" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" y1="-21" length2="1.5" x1="3" length1="1.5" end1="none"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-2" antialias="false" width="4" height="4" x="-14"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-4" antialias="false" width="4" height="8" x="-18"/>
-        <line x2="-2" y2="-8" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" y1="-21" length2="1.5" x1="-1" length1="1.5" end1="none"/>
-        <line x2="-15" y2="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" y1="-2" length2="1.5" x1="-18" length1="1.5" end1="none"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-21" antialias="false" width="3" height="3" x="7"/>
-        <line x2="7" y2="-21" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" y1="-21" length2="1.5" x1="-6" length1="1.5" end1="none"/>
-        <line x2="9" y2="-8" style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" antialias="false" y1="-8" length2="1.5" x1="-8" length1="1.5" end1="none"/>
-        <polygon y4="3" x1="-10" y2="4" x7="10" x5="11" y8="-6" y1="2" x8="-8" y5="2" y7="-6" y9="-4" x3="6" x10="-10" y6="-2" y10="2" x2="-5" x9="-10" closed="false" antialias="false" y3="4" x6="11" x4="8" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x2="1" y4="-14" y5="-14" y2="-16" x3="3" x5="2" style="line-style:normal;line-weight:normal;filling:none;color:black" y3="-18" closed="false" antialias="false" y1="-19" x1="2" x4="2"/>
-        <input size="4" text="_" tagg="label" y="9.5" rotate="true" x="-7"/>
-        <terminal orientation="w" y="0" x="-20"/>
-        <terminal orientation="e" y="0" x="20"/>
-        <terminal orientation="e" y="-20" x="10"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/bomba-piscina.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/bomba-piscina.elmt
deleted file mode 100644
index 058a3127d..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/bomba-piscina.elmt
+++ /dev/null
@@ -1,33 +0,0 @@
-<definition width="40" version="0.4" hotspot_x="15" hotspot_y="21" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{490C94E2-3F8E-4566-A289-A61DA1F4E1FC}"/><names>
-        <name lang="es">Bomba de piscina</name>
-        <name lang="ca">Bomba piscina</name>
-        <name lang="en">Pool pump</name>
-        <name lang="it">Pompa per piscina</name>
-        <name lang="fr">Pompe de piscine</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect width="6" x="15" y="7" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-13" x1="5.5" y2="2" x2="5.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="-13" x1="11.5" y2="2" x2="11.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-13" x1="1.5" y2="2" x2="1.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="-13" x1="8.5" y2="2" x2="8.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="-13" x1="-0.5" y2="2" x2="-0.5"/>
-        <rect width="19" x="-4" y="3" antialias="false" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="13" y2="2" x2="13"/>
-        <rect width="6" x="-10" y="7" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="17" x="-3" y="-18" antialias="false" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-13" x1="-2" y2="2" x2="-2"/>
-        <rect width="4" x="-7" y="-17" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-3" y="22.5" size="4" rotate="true" text="_" tagg="label"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="5" x1="-3.94146" y2="5" x2="14.9366"/>
-        <rect width="2" x="4" y="2" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="12" y="2" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="-3" y="2" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <terminal x="-10" y="10" orientation="w"/>
-        <terminal x="20" y="10" orientation="e"/>
-        <terminal x="-7" y="-15" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/bomba-sumegida.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/bomba-sumegida.elmt
deleted file mode 100644
index f46ce4b40..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/bomba-sumegida.elmt
+++ /dev/null
@@ -1,37 +0,0 @@
-<definition link_type="simple" hotspot_x="18" orientation="dyyy" hotspot_y="34" version="0.5" type="element" height="60" width="30">
-<uuid uuid="{E1046D2D-4DB2-4F26-BB70-84BB600E26B2}"/><names>
-        <name lang="es">Bomba sumergida</name>
-        <name lang="en">Submerged pump</name>
-        <name lang="ca">Bomba sumergida</name>
-        <name lang="it">Pompa a immersione</name>
-        <name lang="fr">Pompe immergée</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <rect antialias="false" x="-3.12009" y="-28.605" height="11.2863" style="line-style:normal;line-weight:normal;filling:none;color:black" width="5.76908"/>
-        <line x1="-2.697" length1="1.5" x2="-2.697" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-11.0485" y2="4"/>
-        <line x1="4.2259" length1="1.5" x2="4.2259" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-11.0485" y2="4"/>
-        <line x1="-7.31226" length1="1.5" x2="-7.31226" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-11.0485" y2="4"/>
-        <line x1="0.76445" length1="1.5" x2="0.76445" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-11.0485" y2="4"/>
-        <line x1="-9.61989" length1="1.5" x2="-9.61989" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-11.0485" y2="4"/>
-        <line x1="5.95662" length1="1.5" x2="5.95662" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11.0485" y2="4"/>
-        <rect antialias="false" x="-10.043" y="-17.3187" height="6.27019" style="line-style:normal;line-weight:normal;filling:none;color:black" width="14.692"/>
-        <line x1="-11.3506" length1="1.5" x2="-11.3506" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11.0485" y2="4"/>
-        <rect antialias="false" x="-10.043" y="-21.0808" height="3.76212" style="line-style:normal;line-weight:normal;filling:none;color:black" width="1.61526"/>
-        <line x1="-11.3506" length1="1.5" x2="5.95662" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-11.0485" y2="-11.0485"/>
-        <rect antialias="false" x="-12" y="4" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" width="19"/>
-        <line x1="-10.6" length1="1.5" x2="-13" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15.6" y2="17.2"/>
-        <line x1="4.6" length1="1.5" x2="7" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15.6" y2="17.2"/>
-        <line x1="-13" length1="1.5" x2="7" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="17.2" y2="17.2"/>
-        <line x1="-10.6" length1="1.5" x2="4.6" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15.6" y2="15.6"/>
-        <line x1="-12" length1="1.5" x2="-10" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" y2="15.6"/>
-        <line x1="7" length1="1.5" x2="5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" y2="15.6"/>
-        <input text="_" x="-10" tagg="label" y="14.5" rotate="true" size="4"/>
-        <polygon x1="-9" y4="-16" x2="-8" y5="-16" antialias="false" x3="-7" x4="-6" x5="-6" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-12" y2="-15" closed="false" y3="-13"/>
-        <line x1="-3.22727" length1="1.5" x2="2.22727" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-24" y2="-24"/>
-        <terminal orientation="s" x="0" y="20"/>
-        <terminal orientation="n" x="0" y="-30"/>
-        <terminal orientation="n" x="-9" y="-20"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/caldera-mixta.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/caldera-mixta.elmt
deleted file mode 100644
index a9be97a2e..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/caldera-mixta.elmt
+++ /dev/null
@@ -1,41 +0,0 @@
-<definition width="40" version="0.4" hotspot_x="20" hotspot_y="35" height="70" link_type="simple" type="element" orientation="dyyy">
-<uuid uuid="{CD0C4B2B-B740-441C-817A-5E2F8ED02D69}"/><names>
-        <name lang="es">Caldera mural mixta</name>
-        <name lang="en">mixed mural boiler</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <circle x="-1" y="14" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="2"/>
-        <arc width="9" x="-5" y="-33" antialias="true" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" angle="-280"/>
-        <arc width="5" x="-3" y="-30" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <circle x="4" y="14" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:blue" y1="23" x1="-7" y2="30" x2="-7"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="24" x1="4" y2="26" x2="4"/>
-        <text x="-14" y="22" size="4" text="CAL."/>
-        <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="24" x1="-16" y2="26" x2="-16"/>
-        <text x="4" y="22" size="4" text="ACS"/>
-        <rect width="31" x="-16" y="-17" antialias="false" height="40" 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:blue" y1="23" x1="13" y2="30" x2="13"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-9" y2="-22" x2="-3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-22" x1="-3" y2="-27" x2="-3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y1="23" x1="7" y2="30" x2="7"/>
-        <polygon x4="16" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="25" x1="16" y2="27" x2="15" y3="27" x3="17" y4="25"/>
-        <polygon x4="3" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="26" x1="3" y2="26" x2="5" y3="28" x3="4" y4="26"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-27" x1="2" y2="-22" x2="2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-22" x1="2" y2="-17" x2="8"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="27" x1="16" y2="29" x2="16"/>
-        <rect width="8" x="-5" y="6" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <circle x="-6" y="14" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y1="23" x1="-13" y2="30" x2="-13"/>
-        <polygon x4="-4" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="25" x1="-4" y2="27" x2="-5" y3="27" x3="-3" y4="25"/>
-        <polygon x4="-17" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="26" x1="-17" y2="26" x2="-15" y3="28" x3="-16" y4="26"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="27" x1="-4" y2="29" x2="-4"/>
-        <input x="-13" y="-8" size="6" rotate="true" text="_" tagg="label"/>
-        <terminal x="-13" y="31" orientation="s"/>
-        <terminal x="-7" y="31" orientation="s"/>
-        <terminal x="7" y="31" orientation="s"/>
-        <terminal x="13" y="31" orientation="s"/>
-        <terminal x="0" y="24" orientation="s"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/caldera-mural.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/caldera-mural.elmt
deleted file mode 100644
index 35576c3f0..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/caldera-mural.elmt
+++ /dev/null
@@ -1,33 +0,0 @@
-<definition width="40" version="0.4" hotspot_x="20" hotspot_y="35" height="70" link_type="simple" type="element" orientation="dyyy">
-<uuid uuid="{203F1D9F-DFEC-4777-A0AF-45934D1D9B72}"/><names>
-        <name lang="es">Caldera mural</name>
-        <name lang="ca">Caldera mural</name>
-        <name lang="en">Mural boiler</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="24" x1="-13" y2="26" x2="-13"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:blue" y1="23" x1="10" y2="30" x2="10"/>
-        <circle x="-1" y="17" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="2"/>
-        <circle x="4" y="17" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="2"/>
-        <rect width="31" x="-16" y="-17" antialias="false" height="40" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-17" x1="-9" y2="-22" x2="-3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-22" x1="-3" y2="-27" x2="-3"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-27" x1="2" y2="-22" x2="2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-22" x1="2" y2="-17" x2="8"/>
-        <rect width="8" x="-5" y="6" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="17" x="-8" y="15" antialias="false" height="5" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <circle x="-6" y="17" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y1="23" x1="-10" y2="30" x2="-10"/>
-        <polygon x4="13" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="25" x1="13" y2="27" x2="12" y3="27" x3="14" y4="25"/>
-        <polygon x4="-14" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="26" x1="-14" y2="26" x2="-12" y3="28" x3="-13" y4="26"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="27" x1="13" y2="29" x2="13"/>
-        <arc width="9" x="-5" y="-33" antialias="true" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-130" angle="-280"/>
-        <arc width="5" x="-3" y="-30" antialias="true" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <input x="-8" y="-5" size="6" rotate="true" text="_" tagg="label"/>
-        <terminal x="-10" y="31" orientation="s"/>
-        <terminal x="10" y="31" orientation="s"/>
-        <terminal x="0" y="25" orientation="s"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/caldera-pie-mixta.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/caldera-pie-mixta.elmt
deleted file mode 100644
index 9065c7492..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/caldera-pie-mixta.elmt
+++ /dev/null
@@ -1,45 +0,0 @@
-<definition width="90" version="0.4" hotspot_x="50" hotspot_y="46" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{048A1230-11D2-4962-99B8-AFA6950EE848}"/><names>
-        <name lang="es">Caldera de pié mixta</name>
-        <name lang="en">Mix floor boiler</name>
-        <name lang="ca">Caldera peu mixta</name>
-        <name lang="fr">Chaudiére au sol mixte</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="-37.6854" x1="13.075" y2="-34.7661" x2="13.075"/>
-        <text x="10" y="-21" size="4" text="ACS"/>
-        <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="-37.6854" x1="-18.925" y2="-34.7661" x2="-18.925"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y1="-38.1451" x1="-12.875" y2="-27.9274" x2="-12.875"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y1="-38.1451" x1="19.125" y2="-27.9274" x2="19.125"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:blue" y1="-38.1451" x1="8.35" y2="-27.9274" x2="8.35"/>
-        <rect width="48.375" x="-25.95" y="-28.9274" antialias="false" height="56.9274" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="11.5" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-34.7661" x1="11.5" y2="-34.7661" x2="14.65" y3="-31.8467" x3="13.075" y4="-34.7661"/>
-        <rect width="6.3" x="-32.25" y="1.72582" antialias="false" height="13.1371" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:red;color:black" x1="-32.25" x2="-32.25" x3="-43.275" x4="-48" antialias="false" x5="-48" x6="-32.25" x7="-32.25" x8="-32.25" y1="1.72582" y2="-2.65321" y3="-2.65321" y4="10.4839" y5="17.7823" y6="17.7823" y7="1.72582" y8="1.72582"/>
-        <polygon x4="23.85" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-37.6854" x1="23.85" y2="-34.7661" x2="22.275" y3="-34.7661" x3="25.425" y4="-37.6854"/>
-        <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.7661" x1="23.85" y2="-31.8467" x2="23.85"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-2.65321" x1="-36.975" y2="16.3226" x2="-36.975"/>
-        <rect width="4.725" x="23.425" y="0.72582" antialias="false" height="11.6774" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="9.45" x="28.15" y="-12.4113" antialias="false" height="29.1935" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <polygon x4="-14.925" y5="-28.9274" x5="-25.95" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-28.9274" x1="-25.95" y2="-18.7096" x2="-25.95" y3="-18.7096" x3="-19.65" y4="-28.9274"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18.7096" x1="-19.65" y2="26.5403" x2="-19.65"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:blue" y1="-38.1451" x1="-23.65" y2="-27.9274" x2="-23.65"/>
-        <polygon x4="-20.5" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-34.7661" x1="-20.5" y2="-34.7661" x2="-17.35" y3="-31.8467" x3="-18.925" y4="-34.7661"/>
-        <polygon x4="-8.15" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-37.6854" x1="-8.15" y2="-34.7661" x2="-9.725" y3="-34.7661" x3="-6.575" y4="-37.6854"/>
-        <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.7661" x1="-8.15" y2="-31.8467" x2="-8.15"/>
-        <text x="-17" y="-21" size="4" text="Cal"/>
-        <circle x="-15" y="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
-        <rect width="2" x="-41" y="18" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="-18" y5="-12" x5="-18" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-9" x1="-25" y2="-12" x2="-21" y3="-9" x3="-22" y4="-12"/>
-        <input x="-14" y="-3" size="4" rotate="true" text="Mod." tagg="label"/>
-        <terminal x="-23.65" y="-38.1451" orientation="n"/>
-        <terminal x="-12.875" y="-38.1451" orientation="n"/>
-        <terminal x="8.35" y="-38.1451" orientation="n"/>
-        <terminal x="19.125" y="-38.1451" orientation="n"/>
-        <terminal x="-40" y="22" orientation="s"/>
-        <terminal x="-13" y="25" orientation="s"/>
-        <terminal x="-28" y="-14" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/caldera-pie.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/caldera-pie.elmt
deleted file mode 100644
index f95c095e9..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/caldera-pie.elmt
+++ /dev/null
@@ -1,36 +0,0 @@
-<definition width="90" version="0.4" hotspot_x="53" hotspot_y="45" height="80" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{8EAF31DE-66CB-4DFA-BCDF-E9907BC31B72}"/><names>
-        <name lang="es">Caldera de pié</name>
-        <name lang="en">Floor boiler</name>
-        <name lang="ca">Caldera peu</name>
-        <name lang="fr">Chaudiére au sol</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="-37.6854" x1="-3.925" y2="-34.7661" x2="-3.925"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:red" y1="-39.1451" x1="2.125" y2="-28.9274" x2="2.125"/>
-        <rect width="42.375" x="-25.95" y="-28.9274" antialias="false" height="56.9274" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="6.3" x="-32.25" y="1.72582" antialias="false" height="13.1371" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:red;color:black" x1="-32.25" x2="-32.25" x3="-43.275" x4="-48" antialias="false" x5="-48" x6="-32.25" x7="-32.25" x8="-32.25" y1="1.72582" y2="-2.65321" y3="-2.65321" y4="10.4839" y5="17.7823" y6="17.7823" y7="1.72582" y8="1.72582"/>
-        <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.65321" x1="-36.975" y2="16.3226" x2="-36.975"/>
-        <rect width="4.725" x="16.425" y="0.72582" antialias="false" height="11.6774" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <rect width="9.45" x="21.15" y="-12.4113" antialias="false" height="29.1935" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <polygon x4="-14.925" y5="-28.9274" x5="-25.95" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-28.9274" x1="-25.95" y2="-18.7096" x2="-25.95" y3="-18.7096" x3="-19.65" y4="-28.9274"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-18.7096" x1="-19.65" y2="26.5403" x2="-19.65"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:blue" y1="-39.1451" x1="-8.65" y2="-28.9274" x2="-8.65"/>
-        <polygon x4="-5.5" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-34.7661" x1="-5.5" y2="-34.7661" x2="-2.35" y3="-31.8467" x3="-3.925" y4="-34.7661"/>
-        <polygon x4="6.85" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" closed="false" y1="-37.6854" x1="6.85" y2="-34.7661" x2="5.275" y3="-34.7661" x3="8.425" y4="-37.6854"/>
-        <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.7661" x1="6.85" y2="-31.8467" x2="6.85"/>
-        <circle x="-16" y="25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1"/>
-        <rect width="1" x="-41" y="18" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="50" x="-30" y="29" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon x4="-19" y5="-24" x5="-19" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-21" x1="-25" y2="-23" x2="-22" y3="-21" x3="-22" y4="-24"/>
-        <input x="-14" y="-9" size="4" rotate="true" text="Mod." tagg="label"/>
-        <terminal x="-8.65" y="-39.1451" orientation="n"/>
-        <terminal x="2.125" y="-39.1451" orientation="n"/>
-        <terminal x="-40" y="20" orientation="s"/>
-        <terminal x="-15" y="25" orientation="s"/>
-        <terminal x="-28" y="-24" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/manometro.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/manometro.elmt
deleted file mode 100644
index ceb14b873..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/a-esquemas-agua/manometro.elmt
+++ /dev/null
@@ -1,17 +0,0 @@
-<definition link_type="simple" ic="true" height="30" width="20" version="0.4" hotspot_y="15" type="element" hotspot_x="10" orientation="dyyy">
-<uuid uuid="{62A6BBC9-3927-4D3B-8A02-C9B5CD65C726}"/><names>
-        <name lang="es">Termómetro</name>
-        <name lang="ca">Termómetre</name>
-        <name lang="fr">Thermométre</name>
-	<name lang="en">Termometer</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" x="-8" antialias="true" height="15" width="16" y="-11"/>
-        <line length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" end2="none" x2="0" antialias="false" y1="4" x1="0" length1="1.5"/>
-        <text text="T" x="-4" size="9" y="1"/>
-        <input text="_" x="-9" tagg="label" size="4" y="-14.5" rotate="true"/>
-        <terminal x="0" y="10" orientation="s"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/plomberie_chauffage/chaufferie/pompe_chauffage.elmt b/elements/60_energy/11_water/plomberie_chauffage/chaufferie/pompe_chauffage.elmt
deleted file mode 100644
index f6ef355e8..000000000
--- a/elements/60_energy/11_water/plomberie_chauffage/chaufferie/pompe_chauffage.elmt
+++ /dev/null
@@ -1,105 +0,0 @@
-<definition hotspot_y="70" type="element" link_type="simple" orientation="dyyy" hotspot_x="35" width="70" height="140" version="0.51">
-    <uuid uuid="{12aeb76b-2bff-4736-80a2-46086170fe24}"/>
-    <names>
-        <name lang="fr">Pompe chauffage</name>
-        <name lang="it">Pompa di circolazione<e>
-    </names>
-    <informations>Baboune41-2016</informations>
-    <description>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-59" antialias="false" x="-11" width="22" height="7"/>
-        <arc start="0" style="line-style:normal;line-weight:normal;filling:none;color:black" y="29" antialias="true" x="-8" angle="90" width="4" height="14"/>
-        <arc start="90" style="line-style:normal;line-weight:normal;filling:none;color:black" y="29" antialias="true" x="4" angle="90" width="4" height="14"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-68" antialias="false" x="-7" width="14" height="9"/>
-        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" y="-27" antialias="false" x="-27" diameter="54"/>
-        <line y2="-61" x2="-3" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-68" end1="none" length1="1.5" end2="none" x1="-3"/>
-        <line y2="-61" x2="3" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-68" end1="none" length1="1.5" end2="none" x1="3"/>
-        <arc start="0" style="line-style:normal;line-weight:normal;filling:none;color:black" y="21" antialias="true" x="-20" angle="-180" width="40" height="8"/>
-        <rect style="line-style:normal;line-weight:thin;filling:gray;color:black" y="24" antialias="false" x="-4" width="8" height="8"/>
-        <line y2="-52" x2="-5" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-59" end1="none" length1="1.5" end2="none" x1="-5"/>
-        <line y2="32" x2="2" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="24" end1="none" length1="1.5" end2="none" x1="2"/>
-        <line y2="-52" x2="5" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-59" end1="none" length1="1.5" end2="none" x1="5"/>
-        <line y2="32" x2="-2" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="24" end1="none" length1="1.5" end2="none" x1="-2"/>
-        <line y2="-61" x2="7" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-61" end1="none" length1="1.5" end2="none" x1="-7"/>
-        <circle style="line-style:normal;line-weight:thin;filling:gray;color:black" y="-25" antialias="false" x="-25" diameter="50"/>
-        <line y2="-2" x2="3" style="line-style:normal;line-weight:normal;filling:none;color:green" antialias="false" length2="1.5" y1="-2" end1="none" length1="1.5" end2="none" x1="1"/>
-        <arc start="-130" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-26" antialias="true" x="-26" angle="-188" width="6" height="6"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="44" antialias="false" x="-9" width="18" height="5"/>
-        <arc start="-220" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-26" antialias="true" x="20" angle="-180" width="6" height="6"/>
-        <line y2="45" x2="-9" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="44" end1="none" length1="1.5" end2="none" x1="0"/>
-        <line y2="46" x2="-9" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="44" end1="none" length1="1.5" end2="none" x1="9"/>
-        <arc start="59" style="line-style:normal;line-weight:normal;filling:none;color:black" y="20" antialias="true" x="20" angle="-198" width="6" height="6"/>
-        <line y2="47" x2="-9" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="45" end1="none" length1="1.5" end2="none" x1="9"/>
-        <arc start="-40" style="line-style:normal;line-weight:normal;filling:none;color:black" y="20" antialias="true" x="-26" angle="-190" width="6" height="6"/>
-        <arc start="-90" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-20" antialias="true" x="-29" angle="-180" width="8" height="40"/>
-        <line y2="48" x2="-9" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="46" end1="none" length1="1.5" end2="none" x1="9"/>
-        <arc start="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-29" antialias="true" x="-20" angle="-180" width="40" height="8"/>
-        <line y2="49" x2="-9" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="47" end1="none" length1="1.5" end2="none" x1="9"/>
-        <arc start="90" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-20.5" antialias="true" x="21" angle="-180" width="8" height="40"/>
-        <line y2="49" x2="0" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="48" end1="none" length1="1.5" end2="none" x1="9"/>
-        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" y="-25" antialias="false" x="21" diameter="4"/>
-        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" y="21" antialias="false" x="21" diameter="4"/>
-        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" y="21" antialias="false" x="-25" diameter="4"/>
-        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" y="-25" antialias="false" x="-25" diameter="4"/>
-        <input text="_" size="9" y="-33" x="-61" tagg="label" rotate="true"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-42" antialias="false" x="-5" width="10" height="6"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="36" antialias="false" x="-5" width="10" height="6"/>
-        <arc start="180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-43.5" antialias="true" x="4" angle="90" width="14" height="15"/>
-        <arc start="270" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-43" antialias="true" x="-6" angle="90" width="2" height="14"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="-49" antialias="false" x="-9" width="18" height="5"/>
-        <line y2="-48" x2="-9" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-49" end1="none" length1="1.5" end2="none" x1="0"/>
-        <line y2="-47" x2="-9" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-49" end1="none" length1="1.5" end2="none" x1="9"/>
-        <line y2="-46" x2="-9" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-48" end1="none" length1="1.5" end2="none" x1="9"/>
-        <line y2="-45" x2="-9" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-47" end1="none" length1="1.5" end2="none" x1="9"/>
-        <line y2="-44" x2="-9" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-46" end1="none" length1="1.5" end2="none" x1="9"/>
-        <line y2="-44" x2="0" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="-45" end1="none" length1="1.5" end2="none" x1="9"/>
-        <arc start="90" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-44" antialias="true" x="5" angle="90" width="2" height="2"/>
-        <arc start="0" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-44" antialias="true" x="-7" angle="90" width="2" height="4"/>
-        <arc start="270" style="line-style:normal;line-weight:normal;filling:none;color:black" y="42" antialias="true" x="-7" angle="90" width="2" height="2"/>
-        <arc start="180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="42" antialias="true" x="5" angle="90" width="2" height="2"/>
-        <circle style="line-style:normal;line-weight:thin;filling:lightgray;color:black" y="11" antialias="false" x="-4" diameter="8"/>
-        <line y2="15" x2="2" style="line-style:normal;line-weight:normal;filling:none;color:white" antialias="false" length2="1.5" y1="13" end1="none" length1="1.5" end2="none" x1="-1"/>
-        <line y2="15" x2="2" style="line-style:normal;line-weight:normal;filling:none;color:white" antialias="false" length2="1.5" y1="17" end1="none" length1="1.5" end2="none" x1="-1"/>
-        <rect style="line-style:normal;line-weight:normal;filling:green;color:green" y="-8" antialias="false" x="-17" width="8" height="6"/>
-        <polygon y2="-2" x2="-9" style="line-style:normal;line-weight:normal;filling:green;color:green" x3="-3" y5="-7" antialias="false" y1="-7" x4="-9" y4="-8" closed="false" y3="-5" x5="-9" x1="-9"/>
-        <line y2="-5" x2="-4" style="line-style:normal;line-weight:normal;filling:none;color:green" antialias="false" length2="1.5" y1="-7" end1="none" length1="1.5" end2="none" x1="-9"/>
-        <line y2="-3" x2="-8" style="line-style:normal;line-weight:normal;filling:none;color:green" antialias="false" length2="1.5" y1="-6" end1="none" length1="1.5" end2="none" x1="-8"/>
-        <line y2="-4" x2="-7" style="line-style:normal;line-weight:normal;filling:none;color:green" antialias="false" length2="1.5" y1="-6" end1="none" length1="1.5" end2="none" x1="-7"/>
-        <line y2="-4" x2="-6" style="line-style:normal;line-weight:normal;filling:none;color:green" antialias="false" length2="1.5" y1="-6" end1="none" length1="1.5" end2="none" x1="-6"/>
-        <line y2="-5" x2="-5" style="line-style:normal;line-weight:normal;filling:none;color:green" antialias="false" length2="1.5" y1="-3" end1="none" length1="1.5" end2="none" x1="-9"/>
-        <text text="A" size="6" y="-2" color="white" x="-15"/>
-        <line y2="-5" x2="3" style="line-style:normal;line-weight:normal;filling:none;color:green" antialias="false" length2="1.5" y1="-8" end1="none" length1="1.5" end2="none" x1="3"/>
-        <line y2="-5" x2="6" style="line-style:normal;line-weight:normal;filling:none;color:green" antialias="false" length2="1.5" y1="-8" end1="none" length1="1.5" end2="none" x1="6"/>
-        <line y2="-5" x2="9" style="line-style:normal;line-weight:normal;filling:none;color:green" antialias="false" length2="1.5" y1="-5" end1="none" length1="1.5" end2="none" x1="6"/>
-        <line y2="-8" x2="9" style="line-style:normal;line-weight:normal;filling:none;color:green" antialias="false" length2="1.5" y1="-8" end1="none" length1="1.5" end2="none" x1="6"/>
-        <line y2="-2" x2="9" style="line-style:normal;line-weight:normal;filling:none;color:green" antialias="false" length2="1.5" y1="-8" end1="none" length1="1.5" end2="none" x1="9"/>
-        <line y2="-8" x2="2" style="line-style:normal;line-weight:normal;filling:none;color:green" antialias="false" length2="1.5" y1="-8" end1="none" length1="1.5" end2="none" x1="0"/>
-        <line y2="-5" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:green" antialias="false" length2="1.5" y1="-5" end1="none" length1="1.5" end2="none" x1="2"/>
-        <line y2="-2" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:green" antialias="false" length2="1.5" y1="-5" end1="none" length1="1.5" end2="none" x1="0"/>
-        <line y2="-2" x2="9" style="line-style:normal;line-weight:normal;filling:none;color:green" antialias="false" length2="1.5" y1="-2" end1="none" length1="1.5" end2="none" x1="6"/>
-        <text text="W" size="6" y="-1" color="white" x="12"/>
-        <rect style="line-style:normal;line-weight:thin;filling:gray;color:black" y="32" antialias="false" x="-3" width="6" height="1"/>
-        <rect style="line-style:normal;line-weight:thin;filling:gray;color:black" y="33" antialias="false" x="-4" width="8" height="1"/>
-        <line y2="34" x2="-2" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="33" end1="none" length1="1.5" end2="none" x1="-2"/>
-        <line y2="34" x2="2" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="33" end1="none" length1="1.5" end2="none" x1="2"/>
-        <polygon y2="7" x2="7" style="line-style:normal;line-weight:thin;filling:none;color:black" x3="7" y5="8" antialias="false" y1="8" x4="4" y4="8" closed="false" y3="8" x5="4" x1="4"/>
-        <polygon y2="6" x2="11" style="line-style:normal;line-weight:thin;filling:none;color:black" x3="11" y5="7" antialias="false" y1="7" x4="8" y4="8" closed="false" y3="8" x5="8" x1="8"/>
-        <polygon y2="6" x2="12" style="line-style:normal;line-weight:thin;filling:green;color:black" x3="15" y5="8" antialias="true" y1="8" x4="15" y4="8" closed="false" y3="5" x5="12" x1="12"/>
-        <polygon y2="5" x2="16" style="line-style:normal;line-weight:thin;filling:none;color:black" x3="19" y5="8" antialias="false" y1="8" x4="19" y4="8" closed="false" y3="4" x5="16" x1="16"/>
-        <text text="Power" size="3" y="5" color="white" x="-4"/>
-        <line y2="8" x2="-20" style="line-style:normal;line-weight:normal;filling:none;color:lightgray" antialias="false" length2="1.5" y1="5" end1="none" length1="1.5" end2="none" x1="-20"/>
-        <line y2="8" x2="-18" style="line-style:normal;line-weight:normal;filling:none;color:lightgray" antialias="false" length2="1.5" y1="5" end1="none" length1="1.5" end2="none" x1="-18"/>
-        <line y2="8" x2="-16" style="line-style:normal;line-weight:normal;filling:none;color:lightgray" antialias="false" length2="1.5" y1="5" end1="none" length1="1.5" end2="none" x1="-16"/>
-        <line y2="8" x2="-12" style="line-style:normal;line-weight:normal;filling:none;color:green" antialias="false" length2="1.5" y1="5" end1="none" length1="1.5" end2="none" x1="-12"/>
-        <line y2="8" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:green" antialias="false" length2="1.5" y1="5" end1="none" length1="1.5" end2="none" x1="-10"/>
-        <line y2="8" x2="-6" style="line-style:normal;line-weight:normal;filling:none;color:lightgray" antialias="false" length2="1.5" y1="5" end1="none" length1="1.5" end2="none" x1="-6"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="52" antialias="false" x="-11" width="22" height="7"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" y="59" antialias="false" x="-7" width="14" height="9"/>
-        <line y2="68" x2="-3" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="61" end1="none" length1="1.5" end2="none" x1="-3"/>
-        <line y2="68" x2="3" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="61" end1="none" length1="1.5" end2="none" x1="3"/>
-        <line y2="59" x2="-5" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="52" end1="none" length1="1.5" end2="none" x1="-5"/>
-        <line y2="59" x2="5" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="52" end1="none" length1="1.5" end2="none" x1="5"/>
-        <line y2="61" x2="7" style="line-style:normal;line-weight:thin;filling:none;color:black" antialias="false" length2="1.5" y1="61" end1="none" length1="1.5" end2="none" x1="-7"/>
-        <terminal y="-49" x="0" orientation="n"/>
-        <terminal y="49" x="0" orientation="s"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/plomberie_chauffage/chaufferie/robinet_boisseau_df_nf.elmt b/elements/60_energy/11_water/plomberie_chauffage/chaufferie/robinet_boisseau_df_nf.elmt
deleted file mode 100644
index d99d49f45..000000000
--- a/elements/60_energy/11_water/plomberie_chauffage/chaufferie/robinet_boisseau_df_nf.elmt
+++ /dev/null
@@ -1,40 +0,0 @@
-<definition width="50" version="0.51" orientation="dyyy" link_type="simple" hotspot_x="24" hotspot_y="15" type="element" height="30">
-    <uuid uuid="{f1c18027-1ae1-46ef-85cf-6fdf5d055efa}"/>
-    <names>
-        <name lang="fr">Vanne à boisseau DF NF</name>
-        <name lang="it">Valvola a sfera DF CF</name>
-    </names>
-    <informations></informations>
-    <description>
-        <polygon style="line-style:normal;line-weight:thin;filling:gray;color:black" y1="-6" antialias="false" y2="-6" y3="-2" y4="3" y5="6" y6="6" x1="-3" y7="3" x2="3" y8="-2" x3="6" y9="-6" x4="6" x5="3" x6="-3" x7="-6" x8="-6" x9="-3"/>
-        <arc start="-90" width="4" angle="-180" x="9" y="-7" antialias="true" height="4" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="11" x="-20" y="-7" antialias="false" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc start="0" width="18" angle="-180" x="-9" y="-2" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="11" x="9" y="-7" antialias="false" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc start="-90" width="4" angle="-180" x="-20" y="3" antialias="true" height="4" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc start="-90" width="4" angle="-180" x="-20" y="-7" antialias="true" height="4" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc start="-90" width="4" angle="-180" x="-20" y="-3" antialias="true" height="6" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <input size="9" x="-11" y="24" text="NF" tagg="label" rotate="true"/>
-        <arc start="90" width="4" angle="-180" x="16" y="3" antialias="true" height="4" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc start="90" width="4" angle="-180" x="16" y="-7" antialias="true" height="4" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc start="-180" width="18" angle="-180" x="-9" y="-10" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc start="-90" width="4" angle="-180" x="9" y="3" antialias="true" height="4" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc start="90" width="4" angle="-180" x="-13" y="3" antialias="true" height="4" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="-3" y2="-3" x1="11" x2="20" antialias="false" end1="none" end2="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="3" y2="3" x1="11" x2="18" antialias="false" end1="none" end2="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc start="-90" width="4" angle="-180" x="9" y="-3" antialias="true" height="6" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="-3" y2="-3" x1="-18" x2="-11" antialias="false" end1="none" end2="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="3" y2="3" x1="-18" x2="-11" antialias="false" end1="none" end2="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc start="90" width="4" angle="-180" x="-13" y="-3" antialias="true" height="6" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc start="90" width="4" angle="-180" x="-13" y="-7" antialias="true" height="4" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc start="90" width="4" angle="-180" x="16" y="-3" antialias="true" height="6" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <circle x="-4.5" y="-4.5" antialias="false" diameter="9" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="0" y2="-4" x1="-4" x2="0" antialias="false" end1="none" end2="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="-4" y2="0" x1="0" x2="4" antialias="false" end1="none" end2="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="0" y2="4" x1="4" x2="0" antialias="false" end1="none" end2="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="4" y2="0" x1="0" x2="-4" antialias="false" end1="none" end2="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="-3" y2="3" x1="0" x2="0" antialias="false" end1="none" end2="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:red"/>
-        <terminal x="20" y="0" orientation="e"/>
-        <terminal x="-20" y="0" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/plomberie_chauffage/chaufferie/robinet_boisseau_df_no.elmt b/elements/60_energy/11_water/plomberie_chauffage/chaufferie/robinet_boisseau_df_no.elmt
deleted file mode 100644
index 7d5c28bcf..000000000
--- a/elements/60_energy/11_water/plomberie_chauffage/chaufferie/robinet_boisseau_df_no.elmt
+++ /dev/null
@@ -1,40 +0,0 @@
-<definition width="50" version="0.51" orientation="dyyy" link_type="simple" hotspot_x="24" hotspot_y="15" type="element" height="30">
-    <uuid uuid="{a45d3d96-e737-4d47-b52c-08203b62561c}"/>
-    <names>
-        <name lang="fr">Vanne à boisseau DF NO</name>
-        <name lang="it">Valvola a sfera DF NO</name>
-    </names>
-    <informations></informations>
-    <description>
-        <polygon style="line-style:normal;line-weight:thin;filling:gray;color:black" y1="-6" antialias="false" y2="-6" y3="-2" y4="3" y5="6" y6="6" x1="-3" y7="3" x2="3" y8="-2" x3="6" y9="-6" x4="6" x5="3" x6="-3" x7="-6" x8="-6" x9="-3"/>
-        <arc start="-90" width="4" angle="-180" x="9" y="-7" antialias="true" height="4" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <rect width="11" x="-20" y="-7" antialias="false" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc start="0" width="18" angle="-180" x="-9" y="-2" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="11" x="9" y="-7" antialias="false" height="14" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc start="-90" width="4" angle="-180" x="-20" y="3" antialias="true" height="4" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc start="-90" width="4" angle="-180" x="-20" y="-7" antialias="true" height="4" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc start="-90" width="4" angle="-180" x="-20" y="-3" antialias="true" height="6" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <input size="9" x="-11" y="24" text="NO" tagg="label" rotate="true"/>
-        <arc start="90" width="4" angle="-180" x="16" y="3" antialias="true" height="4" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc start="90" width="4" angle="-180" x="16" y="-7" antialias="true" height="4" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc start="-180" width="18" angle="-180" x="-9" y="-10" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc start="-90" width="4" angle="-180" x="9" y="3" antialias="true" height="4" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc start="90" width="4" angle="-180" x="-13" y="3" antialias="true" height="4" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="-3" y2="-3" x1="11" x2="20" antialias="false" end1="none" end2="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="3" y2="3" x1="11" x2="18" antialias="false" end1="none" end2="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc start="-90" width="4" angle="-180" x="9" y="-3" antialias="true" height="6" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="-3" y2="-3" x1="-18" x2="-11" antialias="false" end1="none" end2="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="3" y2="3" x1="-18" x2="-11" antialias="false" end1="none" end2="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc start="90" width="4" angle="-180" x="-13" y="-3" antialias="true" height="6" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc start="90" width="4" angle="-180" x="-13" y="-7" antialias="true" height="4" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc start="90" width="4" angle="-180" x="16" y="-3" antialias="true" height="6" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <circle x="-4.5" y="-4.5" antialias="false" diameter="9" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <line y1="0" y2="-4" x1="-4" x2="0" antialias="false" end1="none" end2="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="-4" y2="0" x1="0" x2="4" antialias="false" end1="none" end2="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="0" y2="4" x1="4" x2="0" antialias="false" end1="none" end2="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="4" y2="0" x1="0" x2="-4" antialias="false" end1="none" end2="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line y1="0" y2="0" x1="-3" x2="3" antialias="false" end1="none" end2="none" length1="1.5" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:red"/>
-        <terminal x="20" y="0" orientation="e"/>
-        <terminal x="-20" y="0" orientation="w"/>
-    </description>
-</definition>