diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/qet_directory
index 4df8316f4..e37515a1d 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/qet_directory
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/a-esquemas-agua/qet_directory
@@ -3,6 +3,7 @@
         <name lang="ca">Esquemes de fluids</name>
         <name lang="es">Esquemas de fluidos</name>
         <name lang="en">Schemes of fluids</name>
+        <name lang="de">Flussdiagramm</name>
         <name lang="fr">Schéma fluide</name>
     </names>
 </qet-directory>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/qet_directory
index cd5e2398b..671c0237c 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/qet_directory
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/qet_directory
@@ -3,6 +3,7 @@
         <name lang="es">Bombas Colectores</name>
         <name lang="ca">Bombes Col.lectors</name>
         <name lang="en">Collector pumps</name>
+        <name lang="de">Kollektor-Pumpen</name>
         <name lang="fr">Pompes pour collecteurs</name>
         <name lang="it">Pompe di circolazione</name>
     </names>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/calderas/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/calderas/qet_directory
index dbb28ca54..bc1d04161 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/calderas/qet_directory
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/calderas/qet_directory
@@ -3,6 +3,7 @@
         <name lang="es">Calderas</name>
         <name lang="ca">Calderes</name>
         <name lang="en">Boilers</name>
+        <name lang="de">Heizkessel</name>
         <name lang="fr">Chaudières</name>
         <name lang="it">Caldaie</name>
     </names>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/calderas/tolva-pellet/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/calderas/tolva-pellet/qet_directory
index 560571f4b..237815f5e 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/calderas/tolva-pellet/qet_directory
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/calderas/tolva-pellet/qet_directory
@@ -3,6 +3,7 @@
         <name lang="es">Biomasa</name>
         <name lang="ca">Biomassa</name>
         <name lang="en">Biomass</name>
+        <name lang="de">Biomasse</name>
         <name lang="fr">Biomasse</name>
         <name lang="it">Biomassa</name>
     </names>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/combustible/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/combustible/qet_directory
index 36d20fb9f..6263a6d9b 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/combustible/qet_directory
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/combustible/qet_directory
@@ -3,6 +3,7 @@
         <name lang="es">Gasóleo</name>
         <name lang="ca">Gasoil</name>
         <name lang="en">Diesel fuel</name>
+        <name lang="de">Diesel</name>
         <name lang="fr">Gas-oil</name>
     </names>
 </qet-directory>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/controles-cal/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/controles-cal/qet_directory
index 4bc1cb271..80528215c 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/controles-cal/qet_directory
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/controles-cal/qet_directory
@@ -3,6 +3,7 @@
         <name lang="es">Indicación y control</name>
         <name lang="ca">Indicació i control</name>
         <name lang="en">Display and control</name>
+        <name lang="de">Anzeige und Steuerung</name>
         <name lang="fr">Affichage et contrôle</name>
     </names>
 </qet-directory>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/qet_directory
index b89989090..23b51cc48 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/qet_directory
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/depositos-intercam/qet_directory
@@ -1,6 +1,7 @@
 <qet-directory>
     <names>
         <name lang="es">Depósitos-Intercambiadores</name>
+        <name lang="de">Tanks/Tauscher</name>
         <name lang="en">Tanks-Exchangers</name>
         <name lang="ca">Dipòsits-intercanvi</name>
         <name lang="fr">Ballon-Echangeurs</name>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/qet_directory
index c5c43302e..921300f1b 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/qet_directory
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/qet_directory
@@ -2,6 +2,7 @@
     <names>
         <name lang="es">Emisores</name>
         <name lang="ca">Emisors</name>
+        <name lang="de">Heizkörper</name>
         <name lang="fr">Emetteurs</name>
         <name lang="en">Heater transmiters</name>
     </names>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/qet_directory
index a176dfcd3..00075a04a 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/qet_directory
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/qet_directory
@@ -3,6 +3,7 @@
         <name lang="es">Equipos de calefacción</name>
         <name lang="ca">Equips calefacció</name>
         <name lang="en">Heating equipment</name>
+        <name lang="de">Heizungstechnik</name>
         <name lang="fr">Matériel de chauffage</name>
         <name lang="it">Impianti di riscaldamento</name>
     </names>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/qet_directory
index 9b8c1e7db..cb5cad982 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/qet_directory
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/qet_directory
@@ -4,5 +4,6 @@
         <name lang="ca">Vàlvules-aparells</name>
         <name lang="en">Valves-Equipment</name>
         <name lang="fr">Vannes</name>
+        <name lang="de">Ventile</name>
     </names>
 </qet-directory>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/valv-equilib-1.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/valv-equilib-1.elmt
index 3756dcfc7..a831e10f7 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/valv-equilib-1.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/valv-equilib-1.elmt
@@ -2,6 +2,7 @@
 <uuid uuid="{E3B1E62F-3AB4-4443-AD01-C7FA4494C88D}"/><names>
         <name lang="ca">Vàlv.equilibrat TA</name>
         <name lang="es">Valv.equilibrado TA</name>
+        <name lang="de">Abgleichventil TA</name>
         <name lang="fr">Vanne d'équilibrage TA</name>
     </names>
     <informations>Rafael Ferrando.
@@ -18,7 +19,7 @@ Mantenimiento de Instalaciones Térmicas</informations>
         <polygon y3="-0.266935" y4="5.9509" x1="-2.95145" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0.621328" x4="-3.71003" y1="6.83916" x2="1.6" antialias="false" x3="0.841424"/>
         <input tagg="label" x="-8" text="_" rotate="true" size="4" y="-10.5"/>
         <line x1="3" length2="1.5" end1="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="4" length1="1.5" y1="2" x2="5" antialias="false" end2="none"/>
-        <terminal x="10.7" y="-0.0679127" orientation="e"/>
-        <terminal x="-9.6" y="-0.0679127" orientation="w"/>
+        <terminal x="10" y="0" orientation="e"/>
+        <terminal x="-10" y="0" orientation="w"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/valv-mariposa.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/valv-mariposa.elmt
index ba64c0e05..0f02e54f8 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/valv-mariposa.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/valv-mariposa.elmt
@@ -2,6 +2,7 @@
 <uuid uuid="{75A29DC9-849A-43AF-9802-253543636D18}"/><names>
         <name lang="ca">Valv papallona</name>
         <name lang="es">Valv mariposa</name>
+        <name lang="de">drosselklappe</name>
         <name lang="fr">Vanne papillon</name>
     </names>
     <informations></informations>
@@ -17,7 +18,7 @@
         <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-2" y2="-4" end1="none" x1="-8" 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="-2" y2="0" end1="none" x1="-8" y1="0" length1="1.5"/>
         <line length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" antialias="false" x2="-2" y2="4" end1="none" x1="-8" y1="4" length1="1.5"/>
-        <terminal y="0.135663" x="-0.37912" orientation="e"/>
-        <terminal y="0.135663" x="-10.091" orientation="w"/>
+        <terminal y="0" x="0" orientation="e"/>
+        <terminal y="0" x="-10" orientation="w"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/qet_directory
index 0b9f1c6a3..95c8d2dfc 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/qet_directory
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/qet_directory
@@ -3,6 +3,7 @@
         <name lang="es">Calefacción</name>
         <name lang="ca">Calefacció</name>
         <name lang="en">Heating</name>
+        <name lang="de">Heizung</name>
         <name lang="fr">Chauffage</name>
         <name lang="it">Riscaldamento</name>
     </names>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Eficiencia/geotermia-pozo.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Eficiencia/geotermia-pozo.elmt
index 6a984ffdc..6d6bccf19 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Eficiencia/geotermia-pozo.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Eficiencia/geotermia-pozo.elmt
@@ -1,74 +1,75 @@
-<definition width="60" hotspot_y="44" link_type="simple" version="0.80" height="100" hotspot_x="39" type="element">
-    <uuid uuid="{8485b6b5-43e9-41c8-bc08-71e2a071589e}"/>
+<definition height="100" type="element" link_type="simple" width="60" hotspot_x="40" version="0.100.0" hotspot_y="46">
+    <uuid uuid="{ecadc650-f488-4a8d-aae7-75bcca654fc6}"/>
     <names>
-        <name lang="fr">Puit géothermique</name>
         <name lang="ca">Geotèrmia pou</name>
         <name lang="es">Geotérmia pozo</name>
+        <name lang="fr">Puit géothermique</name>
+        <name lang="de">Geothermische Quelle</name>
     </names>
     <elementInformations/>
     <informations></informations>
     <description>
-        <rect width="17" ry="0" style="line-style:normal;line-weight:thin;filling:blue;color:blue" x="-17" y="3" height="40" rx="0" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="0" y1="38" y2="42" x2="8" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="-25" y1="23" y2="27" x2="-17" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="-1" y1="43" y2="47" x2="7" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="0" y1="19" y2="23" x2="8" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="-25" y1="-16" y2="-12" x2="-17" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="-25" y1="31" y2="35" x2="-17" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="0" y1="2" y2="6" x2="8" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="0" y1="27" y2="31" x2="8" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="-25" y1="19" y2="23" x2="-17" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="6" y1="-20" y2="-16" x2="14" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="0" y1="23" y2="27" x2="8" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="0" y1="-15" y2="-11" x2="8" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="-25" y1="27" y2="31" x2="-17" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="0" y1="32" y2="36" x2="8" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="-25" y1="36" y2="40" x2="-17" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="0" y1="-7" y2="-3" x2="8" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="0" y1="10" y2="14" x2="8" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <arc width="9" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90" x="-13" y="-35" height="9" antialias="true"/>
-        <arc width="3" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180" x="-13" y="25" height="8" antialias="true"/>
-        <rect width="6" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-29" y="-28" height="3" rx="0" antialias="false"/>
-        <arc width="3" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180" x="-7" y="25" height="8" antialias="true"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5" x1="-10" y1="28.9823" y2="17.0933" x2="-10" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="-17" y1="45" y2="49" x2="-9" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <arc width="3" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180" x="-10" y="13" height="8" antialias="true"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="-33" y1="-20" y2="-16" x2="-25" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="0" y1="-2" y2="2" x2="8" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="-25" y1="1" y2="5" x2="-17" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="-11" y1="43" y2="47" x2="-3" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5" x1="-13" y1="28.3468" y2="-24.397" x2="-13" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5" x1="-4" y1="28.2601" y2="-29.317" x2="-4" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="0" y1="-11" y2="-7" x2="8" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="-25" y1="9" y2="13" x2="-17" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5" x1="-7" y1="28.9984" y2="17.0785" x2="-7" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="0" y1="6" y2="10" x2="8" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="0" y1="15" y2="19" x2="8" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="-25" y1="-8" y2="-4" x2="-17" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <arc width="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90" x="-18" y="-27" height="4" antialias="true"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="-25" y1="-3" y2="1" x2="-17" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5" x1="-9.63774" y1="-35" y2="-35" x2="-22.3344" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="-25" y1="-12" y2="-8" x2="-17" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5" x1="-16" y1="-27" y2="-27" x2="-22" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="-29.3682" y1="-20" y2="-20" x2="15.3155" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="-25" y1="41" y2="45" x2="-17" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="0" y1="-19" y2="-15" x2="8" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="-25" y1="5" y2="9" x2="-17" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="-25" y1="14" y2="18" x2="-17" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5" x1="-25" y1="-20" y2="-16" x2="-17" end2="none" length1="1.5" end1="none" antialias="false"/>
-        <rect width="6" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-29" y="-37" height="3" rx="0" antialias="false"/>
-        <rect width="17" ry="0" style="line-style:normal;line-weight:thin;filling:none;color:black" x="-17" y="-20" height="63" rx="0" antialias="false"/>
-        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="1" x="-17" y="8" antialias="true"/>
-        <ellipse width="2" style="line-style:normal;line-weight:thin;filling:none;color:black" x="-8" height="1" y="9" antialias="true"/>
-        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="1" x="-16" y="34" antialias="true"/>
-        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="1" x="-6" y="37" antialias="true"/>
-        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="1" x="-13" y="38" antialias="true"/>
-        <circle style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="1" x="-10" y="4" antialias="true"/>
-        <dynamic_text frame="false" Valignment="AlignTop" x="-16" text_width="-1" uuid="{d39e2dc9-6d57-4114-aaaf-42d602873a74}" y="34.5" rotation="0" font="Sans Serif,4,-1,5,25,0,0,0,0,0" text_from="ElementInfo" Halignment="AlignLeft" z="57">
+        <rect height="40" antialias="false" style="line-style:normal;line-weight:thin;filling:blue;color:blue" y="3" width="17" x="-17" ry="0" rx="0"/>
+        <line antialias="false" length2="1.5" x1="0" x2="8" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="42" end1="none" y1="38"/>
+        <line antialias="false" length2="1.5" x1="-25" x2="-17" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="27" end1="none" y1="23"/>
+        <line antialias="false" length2="1.5" x1="-1" x2="7" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="47" end1="none" y1="43"/>
+        <line antialias="false" length2="1.5" x1="0" x2="8" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="23" end1="none" y1="19"/>
+        <line antialias="false" length2="1.5" x1="-25" x2="-17" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="-12" end1="none" y1="-16"/>
+        <line antialias="false" length2="1.5" x1="-25" x2="-17" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="35" end1="none" y1="31"/>
+        <line antialias="false" length2="1.5" x1="0" x2="8" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="6" end1="none" y1="2"/>
+        <line antialias="false" length2="1.5" x1="0" x2="8" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="31" end1="none" y1="27"/>
+        <line antialias="false" length2="1.5" x1="-25" x2="-17" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="23" end1="none" y1="19"/>
+        <line antialias="false" length2="1.5" x1="6" x2="14" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="-16" end1="none" y1="-20"/>
+        <line antialias="false" length2="1.5" x1="0" x2="8" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="27" end1="none" y1="23"/>
+        <line antialias="false" length2="1.5" x1="0" x2="8" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="-11" end1="none" y1="-15"/>
+        <line antialias="false" length2="1.5" x1="-25" x2="-17" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="31" end1="none" y1="27"/>
+        <line antialias="false" length2="1.5" x1="0" x2="8" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="36" end1="none" y1="32"/>
+        <line antialias="false" length2="1.5" x1="-25" x2="-17" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="40" end1="none" y1="36"/>
+        <line antialias="false" length2="1.5" x1="0" x2="8" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="-3" end1="none" y1="-7"/>
+        <line antialias="false" length2="1.5" x1="0" x2="8" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="14" end1="none" y1="10"/>
+        <arc height="9" antialias="true" start="90" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-40" width="9" x="-13" angle="-90"/>
+        <arc height="8" antialias="true" start="0" style="line-style:normal;line-weight:normal;filling:none;color:black" y="25" width="3" x="-13" angle="-180"/>
+        <rect height="3" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-31.5" width="6" x="-29" ry="0" rx="0"/>
+        <arc height="8" antialias="true" start="0" style="line-style:normal;line-weight:normal;filling:none;color:black" y="25" width="3" x="-7" angle="-180"/>
+        <line antialias="false" length2="1.5" x1="-10" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end2="none" y2="17.1" end1="none" y1="28.9823"/>
+        <line antialias="false" length2="1.5" x1="-17" x2="-9" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="49" end1="none" y1="45"/>
+        <arc height="8" antialias="true" start="-180" style="line-style:normal;line-weight:normal;filling:none;color:black" y="13" width="3" x="-10" angle="-180"/>
+        <line antialias="false" length2="1.5" x1="-33" x2="-25" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="-16" end1="none" y1="-20"/>
+        <line antialias="false" length2="1.5" x1="0" x2="8" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="2" end1="none" y1="-2"/>
+        <line antialias="false" length2="1.5" x1="-25" x2="-17" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="5" end1="none" y1="1"/>
+        <line antialias="false" length2="1.5" x1="-11" x2="-3" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="47" end1="none" y1="43"/>
+        <line antialias="false" length2="1.5" x1="-13" x2="-13" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end2="none" y2="-28" end1="none" y1="28.3468"/>
+        <line antialias="false" length2="1.5" x1="-4" x2="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end2="none" y2="-35" end1="none" y1="28.2601"/>
+        <line antialias="false" length2="1.5" x1="0" x2="8" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="-7" end1="none" y1="-11"/>
+        <line antialias="false" length2="1.5" x1="-25" x2="-17" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="13" end1="none" y1="9"/>
+        <line antialias="false" length2="1.5" x1="-7" x2="-7" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end2="none" y2="17.1" end1="none" y1="28.9984"/>
+        <line antialias="false" length2="1.5" x1="0" x2="8" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="10" end1="none" y1="6"/>
+        <line antialias="false" length2="1.5" x1="0" x2="8" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="19" end1="none" y1="15"/>
+        <line antialias="false" length2="1.5" x1="-25" x2="-17" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="-4" end1="none" y1="-8"/>
+        <arc height="4" antialias="true" start="90" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-30" width="5" x="-18" angle="-90"/>
+        <line antialias="false" length2="1.5" x1="-25" x2="-17" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="1" end1="none" y1="-3"/>
+        <line antialias="false" length2="1.5" x1="-9" x2="-23" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end2="none" y2="-40" end1="none" y1="-40"/>
+        <line antialias="false" length2="1.5" x1="-25" x2="-17" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="-8" end1="none" y1="-12"/>
+        <line antialias="false" length2="1.5" x1="-16" x2="-23" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end2="none" y2="-30" end1="none" y1="-30"/>
+        <line antialias="false" length2="1.5" x1="-35" x2="15" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="-20" end1="none" y1="-20"/>
+        <line antialias="false" length2="1.5" x1="-25" x2="-17" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="45" end1="none" y1="41"/>
+        <line antialias="false" length2="1.5" x1="0" x2="8" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="-15" end1="none" y1="-19"/>
+        <line antialias="false" length2="1.5" x1="-25" x2="-17" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="9" end1="none" y1="5"/>
+        <line antialias="false" length2="1.5" x1="-25" x2="-17" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="18" end1="none" y1="14"/>
+        <line antialias="false" length2="1.5" x1="-25" x2="-17" style="line-style:normal;line-weight:thin;filling:none;color:black" length1="1.5" end2="none" y2="-16" end1="none" y1="-20"/>
+        <rect height="3" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y="-41.5" width="6" x="-29" ry="0" rx="0"/>
+        <rect height="63" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" y="-20" width="17" x="-17" ry="0" rx="0"/>
+        <circle antialias="true" diameter="1" style="line-style:normal;line-weight:thin;filling:none;color:black" y="8" x="-17"/>
+        <ellipse height="1" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" width="2" y="9" x="-8"/>
+        <circle antialias="true" diameter="1" style="line-style:normal;line-weight:thin;filling:none;color:black" y="34" x="-16"/>
+        <circle antialias="true" diameter="1" style="line-style:normal;line-weight:thin;filling:none;color:black" y="37" x="-6"/>
+        <circle antialias="true" diameter="1" style="line-style:normal;line-weight:thin;filling:none;color:black" y="38" x="-13"/>
+        <circle antialias="true" diameter="1" style="line-style:normal;line-weight:thin;filling:none;color:black" y="4" x="-10"/>
+        <dynamic_text uuid="{d39e2dc9-6d57-4114-aaaf-42d602873a74}" frame="false" Valignment="AlignTop" text_width="-1" z="57" rotation="0" y="34.5" keep_visual_rotation="true" x="-16" Halignment="AlignLeft" text_from="ElementInfo" font="Sans Serif,4,-1,5,25,0,0,0,0,0">
             <text></text>
             <info_name>label</info_name>
         </dynamic_text>
-        <terminal orientation="w" x="-30" uuid="{d3aee18e-0ab8-4a5b-ad96-83ef2d128823}" y="-36" name=""/>
-        <terminal orientation="w" x="-30" uuid="{d2c002b1-2ca5-461b-8727-89a7175a9b9b}" y="-27" name=""/>
+        <terminal uuid="{d3aee18e-0ab8-4a5b-ad96-83ef2d128823}" name="" type="Generic" y="-40" x="-30" orientation="w"/>
+        <terminal uuid="{d2c002b1-2ca5-461b-8727-89a7175a9b9b}" name="" type="Generic" y="-30" x="-30" orientation="w"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Eficiencia/motor-electr.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Eficiencia/motor-electr.elmt
index 274b3e81e..b71270ea5 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Eficiencia/motor-electr.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Eficiencia/motor-electr.elmt
@@ -1,35 +1,37 @@
-<definition hotspot_y="23" hotspot_x="15" height="40" width="40" version="0.80" type="element" link_type="simple">
-    <uuid uuid="{d23a549f-61ae-4aca-93e0-a8377b442352}"/>
+<definition hotspot_y="16" hotspot_x="16" type="element" height="30" version="0.100.0" width="40" link_type="simple">
+    <uuid uuid="{92029d4d-60a9-430b-a1ea-404f5238bc39}"/>
     <names>
         <name lang="ca">Motor elèctric</name>
+        <name lang="de">Elektromotor</name>
+        <name lang="en">Electrical motor</name>
         <name lang="fr">Moteur électrique</name>
         <name lang="es">Motor eléctrico</name>
     </names>
     <elementInformations/>
     <informations></informations>
     <description>
-        <line x2="16" x1="1" end2="none" antialias="false" y1="-7" end1="none" length1="1.5" y2="-7" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
-        <line x2="16" x1="16" end2="none" antialias="false" y1="-8.93514" end1="none" length1="1.5" y2="7.92973" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
-        <line x2="16" x1="1" end2="none" antialias="false" y1="-1" end1="none" length1="1.5" y2="-1" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
-        <line x2="16" x1="1" end2="none" antialias="false" y1="5" end1="none" length1="1.5" y2="5" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
-        <line x2="16" x1="1" end2="none" antialias="false" y1="7" end1="none" length1="1.5" y2="7" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
-        <line x2="16" x1="1" end2="none" antialias="false" y1="3" end1="none" length1="1.5" y2="3" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
-        <rect rx="0" y="8" height="2" antialias="false" x="15" width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" ry="0"/>
-        <rect rx="0" y="-5" height="9" antialias="false" x="-4" width="2" style="line-style:normal;line-weight:normal;filling:none;color:black" ry="0"/>
-        <rect rx="0" y="-9" height="17" antialias="false" x="-2" width="22" style="line-style:normal;line-weight:normal;filling:none;color:black" ry="0"/>
-        <rect rx="0" y="8" height="2" antialias="false" x="-1" width="4" style="line-style:normal;line-weight:normal;filling:none;color:black" ry="0"/>
-        <line x2="1" x1="1" end2="none" antialias="false" y1="-8.93514" end1="none" length1="1.5" y2="7.92973" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
-        <rect rx="0" y="-3" height="6" antialias="false" x="20" width="1" style="line-style:normal;line-weight:normal;filling:none;color:black" ry="0"/>
-        <rect rx="0" y="-13" height="4" antialias="false" x="6" width="9" style="line-style:normal;line-weight:normal;filling:none;color:black" ry="0"/>
-        <line x2="15" x1="6" end2="none" antialias="false" y1="-11" end1="none" length1="1.5" y2="-11" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
-        <line x2="16" x1="1" end2="none" antialias="false" y1="-5" end1="none" length1="1.5" y2="-5" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
-        <rect rx="0" y="-1.25" height="2" antialias="false" x="-7.5" width="3" style="line-style:normal;line-weight:normal;filling:none;color:black" ry="0"/>
-        <rect rx="0" y="-5.25" height="9" antialias="false" x="-8.5" width="1" style="line-style:normal;line-weight:normal;filling:none;color:black" ry="0"/>
-        <dynamic_text uuid="{c2d64935-800c-4230-9db8-57c34f7bac94}" y="8.5" Halignment="AlignLeft" font="Sans Serif,4,-1,5,25,0,0,0,0,0" x="-1" rotation="0" Valignment="AlignTop" text_from="ElementInfo" z="18" frame="false" text_width="-1">
+        <line style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-7" x2="15" y2="-7" end2="none" antialias="false" length2="1.5" length1="1.5" end1="none" x1="0"/>
+        <line style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-9" x2="15" y2="8" end2="none" antialias="false" length2="1.5" length1="1.5" end1="none" x1="15"/>
+        <line style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-1" x2="15" y2="-1" end2="none" antialias="false" length2="1.5" length1="1.5" end1="none" x1="0"/>
+        <line style="line-style:normal;line-weight:thin;filling:none;color:black" y1="5" x2="15" y2="5" end2="none" antialias="false" length2="1.5" length1="1.5" end1="none" x1="0"/>
+        <line style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x2="15" y2="7" end2="none" antialias="false" length2="1.5" length1="1.5" end1="none" x1="0"/>
+        <line style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3" x2="15" y2="3" end2="none" antialias="false" length2="1.5" length1="1.5" end1="none" x1="0"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" height="2" y="8" antialias="false" ry="0" x="14" width="4"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" height="9" y="-5" antialias="false" ry="0" x="-5" width="2"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" height="17" y="-9" antialias="false" ry="0" x="-3" width="22"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" height="2" y="8" antialias="false" ry="0" x="-2" width="4"/>
+        <line style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-9" x2="0" y2="8" end2="none" antialias="false" length2="1.5" length1="1.5" end1="none" x1="0"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" height="6" y="-3" antialias="false" ry="0" x="19" width="1"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" height="3" y="-12" antialias="false" ry="0" x="5.5" width="9"/>
+        <line style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-10" x2="14.5" y2="-10" end2="none" antialias="false" length2="1.5" length1="1.5" end1="none" x1="5.5"/>
+        <line style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-5" x2="15" y2="-5" end2="none" antialias="false" length2="1.5" length1="1.5" end1="none" x1="0"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" height="2" y="-1.25" antialias="false" ry="0" x="-8.5" width="3"/>
+        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" rx="0" height="9" y="-5" antialias="false" ry="0" x="-10" width="1"/>
+        <dynamic_text frame="false" text_width="-1" Halignment="AlignLeft" font="Sans Serif,4,-1,5,25,0,0,0,0,0" uuid="{c2d64935-800c-4230-9db8-57c34f7bac94}" keep_visual_rotation="true" y="8.5" Valignment="AlignTop" z="18" text_from="ElementInfo" x="-2" rotation="0">
             <text></text>
             <info_name>label</info_name>
         </dynamic_text>
-        <terminal y="-14" orientation="n" x="11"/>
-        <terminal y="0" orientation="w" x="-9"/>
+        <terminal uuid="{a8087077-7509-4b82-8bbc-0a8fbb803531}" type="Generic" y="0" name="" x="-10" orientation="w"/>
+        <terminal uuid="{79cf34a4-a81a-481f-bc69-1937fae1a77e}" type="Generic" y="-10" name="" x="10" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Eficiencia/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Eficiencia/qet_directory
index d9d89da29..76eb61083 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Eficiencia/qet_directory
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Eficiencia/qet_directory
@@ -3,6 +3,7 @@
         <name lang="es">Eficiencia energética</name>
         <name lang="ca">Eficiencia energetica</name>
         <name lang="en">Energy efficency</name>
+        <name lang="de">Energie-Effizienz</name>
         <name lang="fr">Efficience énergétique</name>
     </names>
 </qet-directory>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Eficiencia/recup-chimenea.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Eficiencia/recup-chimenea.elmt
index aca73bb7f..0ef96c3d0 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Eficiencia/recup-chimenea.elmt
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Eficiencia/recup-chimenea.elmt
@@ -1,40 +1,47 @@
-<definition width="70" version="0.4" hotspot_x="33" hotspot_y="53" height="80" link_type="simple" type="element" ic="true">
-<uuid uuid="{CB726C77-F69F-417F-905D-0778264E3FDE}"/><names>
-        <name lang="es">Recuperador humos</name>
+<definition hotspot_y="53" link_type="simple" height="80" type="element" width="70" hotspot_x="33" version="0.100.0">
+    <uuid uuid="{b29a5d15-e264-4596-bfbd-8d2f2542f0ac}"/>
+    <names>
         <name lang="ca">Recuperador de fums</name>
+        <name lang="es">Recuperador humos</name>
+        <name lang="fr">Récupérateur de fumée</name>
+        <name lang="en">Smoke recuperator</name>
+        <name lang="de">Rauchgas-Rekuperator</name>
     </names>
+    <elementInformations/>
     <informations></informations>
     <description>
-        <arc width="14" x="1" y="-18" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="70" angle="-160"/>
-        <rect width="6" x="23" y="-4" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <arc width="20" x="-10" y="14" antialias="true" height="6" style="line-style:normal;line-weight:thin;filling:none;color:black" start="0" angle="-180"/>
-        <polygon style="line-style:normal;line-weight:thin;filling:red;color:black" x1="2" x2="0" x3="2" x4="1" antialias="false" x5="1" x6="2" x7="3" x8="3" x9="4" y1="-34" y10="-38" y2="-38" y11="-34" y3="-40" y4="-43" y12="-34" y5="-48" x10="3" y6="-50" x11="3" y7="-46" x12="2" y8="-44" y9="-42"/>
-        <ellipse width="5" x="-22" y="2" antialias="true" height="12" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <arc width="7" x="-13" y="0" antialias="true" height="16" style="line-style:normal;line-weight:thin;filling:none;color:black" start="90" angle="-180"/>
-        <ellipse width="20" x="-10" y="-28" antialias="true" height="6" 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="16" x1="-19" y2="16" x2="-10"/>
-        <arc width="14" x="-15" y="-8" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-160"/>
-        <line 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="22.2172" y2="-3" x2="15.8764"/>
-        <arc width="14" x="-15" y="-15" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-160"/>
-        <line 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="-8" y2="-13" x2="7"/>
-        <arc width="14" x="1" y="-11" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="70" angle="-160"/>
-        <line 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="-8" y2="-6" 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="-25.0171" x1="10" y2="19.0185" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-25.5305" x1="-10" y2="-0.425263" x2="-10"/>
-        <arc width="20" x="-10" y="17" antialias="true" height="6" 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="0" x1="-19" y2="0" x2="-10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="21.0545" x1="-10" y2="15.8727" x2="-10"/>
-        <ellipse width="7" x="-23" y="0" antialias="true" height="16" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <polygon style="line-style:normal;line-weight:thin;filling:red;color:black" x1="-3" x2="-5" x3="-3" x4="-4" antialias="false" x5="-4" x6="-3" x7="-2" x8="-2" x9="-1" y1="-32" y10="-36" y2="-36" y11="-32" y3="-38" y4="-41" y12="-32" y5="-46" x10="-2" y6="-48" x11="-2" y7="-44" x12="-3" y8="-42" y9="-40"/>
-        <rect width="6" x="23" y="-22" antialias="false" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-21" x1="22.8659" y2="-21" x2="14.2007"/>
-        <arc width="14" x="-15" y="-21" antialias="true" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-160"/>
-        <line 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="-8" y2="-21" x2="14"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-4" x1="10" y2="-3" x2="16"/>
-        <ellipse width="14" x="-7" y="-27" antialias="true" height="4" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:red;color:red" x1="-26.32" x2="-28" x3="-26.88" x4="-27.44" antialias="false" x5="-26.32" x6="-25.76" x7="-24.64" x8="-25.2" x9="-24.08" y1="14" y10="10.9316" y2="10.9316" y11="10.9316" y3="10.9316" y4="7.86319" y12="14" y5="4.79478" x10="-25.2" y13="14" y6="3.56742" x11="-24.64" y7="6.63582" x12="-25.2" y8="8.47687" x13="-26.32" y9="7.86319"/>
-        <input x="-1" y="18" size="4" rotate="true" text="_" tagg="label"/>
-        <terminal x="30" y="-21" orientation="e"/>
-        <terminal x="30" y="-3" orientation="e"/>
+        <arc x="1" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="70" angle="-160" width="14" y="-18" antialias="true"/>
+        <rect x="23" ry="0" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" width="6" y="-1.5" rx="0" antialias="false"/>
+        <arc x="-10" height="6" style="line-style:normal;line-weight:thin;filling:none;color:black" start="0" angle="-180" width="20" y="14" antialias="true"/>
+        <polygon x1="2" x2="0" x3="2" style="line-style:normal;line-weight:thin;filling:red;color:black" x4="1" x12="2" x5="1" y9="-42" x6="2" y1="-34" x10="3" y10="-38" y12="-34" y8="-44" y6="-50" x7="3" y5="-48" y3="-40" x11="3" x9="4" y4="-43" y2="-38" antialias="false" x8="3" y7="-46" y11="-34"/>
+        <ellipse x="-22" height="12" style="line-style:normal;line-weight:thin;filling:none;color:black" width="5" y="2" antialias="true"/>
+        <arc x="-13" height="16" style="line-style:normal;line-weight:thin;filling:none;color:black" start="90" angle="-180" width="7" y="0" antialias="true"/>
+        <ellipse x="-10" height="6" style="line-style:normal;line-weight:thin;filling:none;color:black" width="20" y="-28" antialias="true"/>
+        <line y2="16" x1="-19" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" length1="1.5" x2="-10" y1="16" end2="none" antialias="false"/>
+        <arc x="-15" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-160" width="14" y="-8" antialias="true"/>
+        <arc x="-15" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-160" width="14" y="-15" antialias="true"/>
+        <line y2="-13" x1="-8" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" length1="1.5" x2="7" y1="-10" end2="none" antialias="false"/>
+        <arc x="1" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="70" angle="-160" width="14" y="-11" antialias="true"/>
+        <line y2="-6" x1="-8" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" length1="1.5" x2="7" y1="-3" end2="none" antialias="false"/>
+        <line y2="19.0185" x1="10" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" length1="1.5" x2="10" y1="-25.0171" end2="none" antialias="false"/>
+        <line y2="-0.425263" x1="-10" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" length1="1.5" x2="-10" y1="-25.5305" end2="none" antialias="false"/>
+        <arc x="-10" height="6" style="line-style:normal;line-weight:thin;filling:none;color:black" start="0" angle="-180" width="20" y="17" antialias="true"/>
+        <line y2="0" x1="-19" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" length1="1.5" x2="-10" y1="0" end2="none" antialias="false"/>
+        <line y2="15.8727" x1="-10" length2="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" end1="none" length1="1.5" x2="-10" y1="21.0545" end2="none" antialias="false"/>
+        <ellipse x="-23" height="16" style="line-style:normal;line-weight:thin;filling:none;color:black" width="7" y="0" antialias="true"/>
+        <polygon x1="-3" x2="-5" x3="-3" style="line-style:normal;line-weight:thin;filling:red;color:black" x4="-4" x12="-3" x5="-4" y9="-40" x6="-3" y1="-32" x10="-2" y10="-36" y12="-32" y8="-42" y6="-48" x7="-2" y5="-46" y3="-38" x11="-2" x9="-1" y4="-41" y2="-36" antialias="false" x8="-2" y7="-44" y11="-32"/>
+        <rect x="23" ry="0" height="3" style="line-style:normal;line-weight:normal;filling:none;color:black" width="6" y="-21.5" rx="0" antialias="false"/>
+        <line y2="-20" x1="22.8659" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" length1="1.5" x2="14.2007" y1="-20" end2="none" antialias="false"/>
+        <arc x="-15" height="5" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-90" angle="-160" width="14" y="-21" antialias="true"/>
+        <line y2="-20" x1="-8" length2="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" length1="1.5" x2="14" y1="-16" end2="none" antialias="false"/>
+        <ellipse x="-7" height="4" style="line-style:normal;line-weight:thin;filling:none;color:black" width="14" y="-27" antialias="true"/>
+        <polygon x1="-26.32" x2="-28" x3="-26.88" y13="14" style="line-style:normal;line-weight:normal;filling:red;color:red" x4="-27.44" x12="-25.2" x5="-26.32" y9="7.86319" x6="-25.76" y1="14" x10="-25.2" x13="-26.32" y10="10.9316" y12="14" y8="8.47687" y6="3.56742" x7="-24.64" y5="4.79478" y3="10.9316" x11="-24.64" x9="-24.08" y4="7.86319" y2="10.9316" antialias="false" x8="-25.2" y7="6.63582" y11="10.9316"/>
+        <dynamic_text uuid="{fbd7015c-a265-4033-ae67-bb0ead8655b4}" keep_visual_rotation="false" Halignment="AlignLeft" x="-1" z="29" frame="false" text_width="-1" text_from="ElementInfo" rotation="0" Valignment="AlignTop" font="Sans Serif,4,-1,5,25,0,0,0,0,0" y="10">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <polygon y2="0" closed="false" x1="23" style="line-style:normal;line-weight:normal;filling:none;color:black" x2="16" x3="10" y1="0" y3="-3" antialias="false"/>
+        <terminal uuid="{5073a10f-2715-4fe9-a731-adbcdc069bc6}" x="30" orientation="e" name="" type="Generic" y="0"/>
+        <terminal uuid="{2a43e9a7-d2fd-4832-8ee9-98a0ab0ad9e8}" x="30" orientation="e" name="" type="Generic" y="-20"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Flechas/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Flechas/qet_directory
index 126f5c12d..18f9dcd3c 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Flechas/qet_directory
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Flechas/qet_directory
@@ -2,6 +2,7 @@
     <names>
         <name lang="ca">FLETXES FLUX</name>
         <name lang="en">Flow arrows</name>
+        <name lang="de">Strömungspfeile</name>
         <name lang="es">Flechas de flujos</name>
         <name lang="fr">Fléches d'écoulements</name>
     </names>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/qet_directory
index 2a9ef319d..52ce1b172 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/qet_directory
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Fontaneria/qet_directory
@@ -3,6 +3,7 @@
         <name lang="ca">INSTAL.LACIONS D'AIGUA</name>
         <name lang="es">Instalaciones de agua</name>
         <name lang="en">Water installations</name>
+        <name lang="de">Wasser-Installationen</name>
         <name lang="fr">Equipement de l'eau</name>
     </names>
 </qet-directory>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/esquemas-gas/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/esquemas-gas/qet_directory
index b2fa331aa..1c2aacf91 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/esquemas-gas/qet_directory
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/esquemas-gas/qet_directory
@@ -3,6 +3,7 @@
         <name lang="es">Esquemas gases</name>
         <name lang="ca">Esquemes gasos</name>
         <name lang="en">Gas schemes</name>
+        <name lang="de">Gas-Diagramme</name>
         <name lang="fr">Schémas gaz</name>
     </names>
 </qet-directory>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/instalaciones-gas/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/instalaciones-gas/qet_directory
index fb1863bc3..86f9cc72a 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/instalaciones-gas/qet_directory
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/instalaciones-gas/qet_directory
@@ -3,6 +3,7 @@
         <name lang="es">Instalaciones gases</name>
         <name lang="ca">Instal·lacions gasos</name>
         <name lang="en">Gas installations</name>
+        <name lang="de">Gas-Installation</name>
         <name lang="fr">Installations gaz</name>
     </names>
 </qet-directory>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/qet_directory
index b2f03511e..976f3b7ea 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/qet_directory
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/qet_directory
@@ -3,6 +3,7 @@
         <name lang="es">Gases combustibles</name>
         <name lang="ca">Gasos combustibles</name>
         <name lang="en">Fuel gases</name>
+        <name lang="de">Brenngase</name>
         <name lang="fr">Combustible gaz</name>
     </names>
 </qet-directory>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/qet_directory
index 25dfc96c0..a477eae41 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/qet_directory
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/qet_directory
@@ -3,6 +3,7 @@
         <name lang="es">Solar Térmica</name>
         <name lang="ca">SOLAR TÈRMICA</name>
         <name lang="en">Solar thermal</name>
+        <name lang="de">Solarthermie</name>
         <name lang="fr">Thermique Solaire</name>
     </names>
 </qet-directory>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/qet_directory b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/qet_directory
index cb498e1fd..63fd2451e 100644
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/qet_directory
+++ b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/qet_directory
@@ -2,6 +2,7 @@
     <names>
         <name lang="ca">Tèrmiques-Fluids</name>
         <name lang="en">Thermal-Fluids</name>
+        <name lang="de">thermischer Fluss</name>
         <name lang="es">Térmicas-Fluidos</name>
         <name lang="fr">Thermique-fluide</name>
         <name lang="it">Termica Fluidi</name>
diff --git a/elements/60_energy/11_water/plomberie_chauffage/qet_directory b/elements/60_energy/11_water/plomberie_chauffage/qet_directory
index 477f0dbdb..4003e5175 100644
--- a/elements/60_energy/11_water/plomberie_chauffage/qet_directory
+++ b/elements/60_energy/11_water/plomberie_chauffage/qet_directory
@@ -3,5 +3,6 @@
         <name lang="fr">Plomberie Chauffage</name>
 	<name lang="es">Calefacción de fontanería</name>
 	<name lang="en">Plumbing heating</name>
+	<name lang="de">Heizungs-Installation</name>
     </names>
 </qet-directory>