diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/derivacion-te.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/derivacion-te.elmt
deleted file mode 100644
index 169a807db..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/bombas-cir/derivacion-te.elmt
+++ /dev/null
@@ -1,19 +0,0 @@
-<definition width="30" version="0.4" hotspot_x="15" hotspot_y="14" height="20" link_type="simple" type="element" orientation="dyyy">
-<uuid uuid="{23F64793-ACD2-4F42-8010-91679E914060}"/><names>
-        <name lang="es">Derivación-T</name>
-        <name lang="en">T- branch</name>
-        <name lang="ca">Derivació-Te</name>
-        <name lang="it">Derivazione a T (3 vie)</name>
-        <name lang="fr">Té de dérivation</name>
-    </names>
-    <informations></informations>
-    <description>
-        <input x="-1" y="8" size="6" rotate="true" text="Te" tagg="label"/>
-        <circle x="-3" y="-3" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="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="-10" x1="0" y2="0" 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="0" x1="-10" y2="0" x2="10"/>
-        <terminal x="0" y="-10" orientation="n"/>
-        <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/combustible/derivacion-te.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/combustible/derivacion-te.elmt
deleted file mode 100644
index f8406a545..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/combustible/derivacion-te.elmt
+++ /dev/null
@@ -1,18 +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="{DF182BD9-2799-46A7-AC6D-A2FF6F105794}"/><names>
-        <name lang="es">Derivación-Te</name>
-        <name lang="en">T-branch</name>
-        <name lang="ca">Derivació-Te</name>
-        <name lang="fr">Té dérivation</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/Calefaccion/equipos-calefaccion/emisores/derivacion-te.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/derivacion-te.elmt
deleted file mode 100644
index 6892e1103..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/emisores/derivacion-te.elmt
+++ /dev/null
@@ -1,17 +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="{5A1C43AC-2943-4AB1-8875-0F5932CA79AE}"/><names>
-        <name lang="es">Derivación-Te</name>
-        <name lang="ca">Derivació-Te</name>
-        <name lang="fr">Té de dérivation</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/Calefaccion/equipos-calefaccion/valvulas-varios/derivacion-te.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/derivacion-te.elmt
deleted file mode 100644
index 9731e3a97..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Calefaccion/equipos-calefaccion/valvulas-varios/derivacion-te.elmt
+++ /dev/null
@@ -1,17 +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="{0761B657-12F5-4CE3-B078-C601005395FB}"/><names>
-        <name lang="es">Derivación-Te</name>
-        <name lang="ca">Derivació-Te</name>
-        <name lang="fr">Té dérivation</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/Eficiencia/generador.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Eficiencia/generador.elmt
deleted file mode 100644
index 05fbe930e..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Eficiencia/generador.elmt
+++ /dev/null
@@ -1,29 +0,0 @@
-<definition width="40" version="0.4" hotspot_x="26" hotspot_y="23" height="40" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{D00106FF-CF5A-44B1-A46A-7B2B15EE6F95}"/><names>
-        <name lang="es">Generador eléctrico</name>
-        <name lang="ca">Generador elèctric</name>
-    </names>
-    <informations></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="-7" x1="-10" y2="-7" x2="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-8.93514" x1="5" y2="7.92973" x2="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-1" x1="-10" y2="-1" x2="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="5" x1="-10" y2="5" x2="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="7" x1="-10" y2="7" x2="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="3" x1="-10" y2="3" x2="5"/>
-        <rect width="4" x="4" y="8" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="-15" y="-5" antialias="false" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="22" x="-13" y="-9" antialias="false" height="17" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="-12" y="8" 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:thin;filling:none;color:black" y1="-8.93514" x1="-10" y2="7.92973" x2="-10"/>
-        <rect width="1" x="9" y="-3" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="9" x="-5" y="-13" 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="-11" x1="-5" y2="-11" x2="4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-5" x1="-10" y2="-5" x2="5"/>
-        <rect width="3" x="-18.5" y="-1.25" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1" x="-19.5" y="-5.25" antialias="false" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-12" y="0" size="4" rotate="true" text="kW:_" tagg="label"/>
-        <terminal x="2" y="-15" orientation="n"/>
-        <terminal x="-20" y="0" 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 b67b32232..670edcc06 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,29 +1,35 @@
-<definition width="40" version="0.4" hotspot_x="15" hotspot_y="18" height="30" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{596B432B-F635-47E9-BA5D-053358AE8427}"/><names>
-        <name lang="es">Motor eléctrico</name>
+<definition hotspot_y="23" hotspot_x="15" height="40" orientation="dyyy" width="40" version="0.80" type="element" link_type="simple">
+    <uuid uuid="{d23a549f-61ae-4aca-93e0-a8377b442352}"/>
+    <names>
         <name lang="ca">Motor elèctric</name>
+        <name lang="fr">Moteur électrique</name>
+        <name lang="es">Motor eléctrico</name>
     </names>
+    <elementInformations/>
     <informations></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="-7" x1="1" y2="-7" x2="16"/>
-        <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.93514" x1="16" y2="7.92973" x2="16"/>
-        <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" x1="1" y2="-1" x2="16"/>
-        <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="1" y2="5" x2="16"/>
-        <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" x1="1" y2="7" x2="16"/>
-        <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" x1="1" y2="3" x2="16"/>
-        <rect width="4" x="15" y="8" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="2" x="-4" y="-5" antialias="false" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="22" x="-2" y="-9" antialias="false" height="17" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="4" x="-1" y="8" 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:thin;filling:none;color:black" y1="-8.93514" x1="1" y2="7.92973" x2="1"/>
-        <rect width="1" x="20" y="-3" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="9" x="6" y="-13" 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="-11" x1="6" y2="-11" x2="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="-5" x1="1" y2="-5" x2="16"/>
-        <rect width="3" x="-7.5" y="-1.25" antialias="false" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="1" x="-8.5" y="-5.25" antialias="false" height="9" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-1" y="15.5" size="4" rotate="true" text="kW:_" tagg="label"/>
-        <terminal x="11" y="-14" orientation="n"/>
-        <terminal x="-9" y="0" orientation="w"/>
+        <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">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal y="-14" orientation="n" x="11"/>
+        <terminal y="0" orientation="w" x="-9"/>
     </description>
 </definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/esquemas-gas/derivacion-te.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/esquemas-gas/derivacion-te.elmt
deleted file mode 100644
index 2a36762d5..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/esquemas-gas/derivacion-te.elmt
+++ /dev/null
@@ -1,17 +0,0 @@
-<definition width="30" version="0.4" hotspot_x="15" hotspot_y="14" height="20" link_type="simple" type="element" orientation="dyyy">
-<uuid uuid="{AD18F08B-4E2E-4117-A3C9-C590DCBAD739}"/><names>
-        <name lang="es">Derivación-Te</name>
-        <name lang="ca">Derivació-Te</name>
-        <name lang="fr">Té de dérivation</name>
-    </names>
-    <informations/>
-    <description>
-        <input x="-1" y="8" size="6" rotate="true" text="Te" tagg="label"/>
-        <circle x="-3" y="-3" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="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="-10" x1="0" y2="0" 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="0" x1="-10" y2="0" x2="10"/>
-        <terminal x="0" y="-10" orientation="n"/>
-        <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/Gas/instalaciones-gas/calentador-gas.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/instalaciones-gas/calentador-gas.elmt
deleted file mode 100644
index d353a32e9..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Gas/instalaciones-gas/calentador-gas.elmt
+++ /dev/null
@@ -1,40 +0,0 @@
-<definition width="50" version="0.4" hotspot_x="24" hotspot_y="34" height="70" link_type="simple" type="element" ic="true" orientation="dyyy">
-<uuid uuid="{F4CF1A2F-07B3-4A6F-AE22-E96632AD1C8F}"/><names>
-        <name lang="es">Calentador ACS-gas</name>
-    </names>
-    <informations>Rafael Ferrando.
-Mantenimiento de Instalaciones Térmicas</informations>
-    <description>
-        <arc width="10.1049" x="0.353766" y="11.9242" antialias="true" height="7.21036" 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="28.1476" x1="8.1886" y2="27.697" x2="12.3224"/>
-        <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.1476" x1="-13.09" y2="27.697" x2="-8.95617"/>
-        <line 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.345" x1="-5.09617" y2="29.9502" x2="-5.09617"/>
-        <rect width="36.8829" x="-18.4781" y="-22.636" antialias="false" height="43.7584" 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="28.5983" x1="-4.17754" y2="30.4008" x2="-5.09617"/>
-        <rect width="4.59314" x="-13.09" y="24.5423" antialias="false" height="5.85842" style="line-style:normal;line-weight:normal;filling:red;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="28.5983" x1="-6.0148" y2="30.4008" x2="-5.09617"/>
-        <rect width="4.59314" x="8.1886" y="24.5423" antialias="false" height="5.85842" style="line-style:normal;line-weight:normal;filling:blue;color:black"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="29.9502" x1="-13.09" y2="29.4996" x2="-8.95617"/>
-        <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.9502" x1="8.1886" y2="29.4996" x2="12.3224"/>
-        <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.0489" x1="-13.09" y2="28.5983" x2="-8.95617"/>
-        <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.0489" x1="8.1886" y2="28.5983" x2="12.3224"/>
-        <ellipse width="1.83726" x="-10.2105" y="15.5294" antialias="true" height="1.35194" style="line-style:normal;line-weight:normal;filling:red;color:black"/>
-        <rect width="0.918628" x="-5.61731" y="15.0788" antialias="false" height="1.8026" 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="26.345" x1="17.0039" y2="29.9502" x2="17.0039"/>
-        <rect width="29.3961" x="-14.3443" y="21.3879" antialias="false" height="3.15453" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="6.43039" x="2.65034" y="12.8255" antialias="true" height="5.40777" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <rect width="9.64559" x="-4.23937" y="6.06584" antialias="false" height="1.8026" 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="15.5294" x1="5.86553" y2="13.7269" x2="8.1621"/>
-        <arc width="8.26765" x="1.73171" y="11.9242" antialias="true" height="7.21036" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-22.7757" x1="-9.29182" y2="-27.2821" x2="-4.23937"/>
-        <rect width="9.18628" x="-4.23937" y="-31.7886" antialias="false" height="4.50648" 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="-27.2821" x1="4.9469" y2="-22.7757" x2="11.3773"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="28.2994" x1="15.7496" y2="26.0484" x2="16.8537"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="28.2994" x1="17.9579" y2="26.0484" x2="16.8537"/>
-        <rect width="2" x="-1" y="25" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <input x="-18" y="-13" size="4" rotate="true" text="Calentador" tagg="label"/>
-        <terminal x="10.229" y="31.6757" orientation="s"/>
-        <terminal x="-10.7493" y="31.6757" orientation="s"/>
-        <terminal x="0" y="27" orientation="s"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/derivacion-te.elmt b/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/derivacion-te.elmt
deleted file mode 100644
index 169a807db..000000000
--- a/elements/60_energy/11_water/01_Termicas-Fluidos2_Rafa/Solar-termica/derivacion-te.elmt
+++ /dev/null
@@ -1,19 +0,0 @@
-<definition width="30" version="0.4" hotspot_x="15" hotspot_y="14" height="20" link_type="simple" type="element" orientation="dyyy">
-<uuid uuid="{23F64793-ACD2-4F42-8010-91679E914060}"/><names>
-        <name lang="es">Derivación-T</name>
-        <name lang="en">T- branch</name>
-        <name lang="ca">Derivació-Te</name>
-        <name lang="it">Derivazione a T (3 vie)</name>
-        <name lang="fr">Té de dérivation</name>
-    </names>
-    <informations></informations>
-    <description>
-        <input x="-1" y="8" size="6" rotate="true" text="Te" tagg="label"/>
-        <circle x="-3" y="-3" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="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="-10" x1="0" y2="0" 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="0" x1="-10" y2="0" x2="10"/>
-        <terminal x="0" y="-10" orientation="n"/>
-        <terminal x="10" y="0" orientation="e"/>
-        <terminal x="-10" y="0" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/derivacion-te.elmt b/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/derivacion-te.elmt
deleted file mode 100644
index 1627a6825..000000000
--- a/elements/60_energy/11_water/plomberie_chauffage/raccords_cu/derivacion-te.elmt
+++ /dev/null
@@ -1,17 +0,0 @@
-<definition width="30" hotspot_y="14" hotspot_x="15" type="element" version="0.4" orientation="dyyy" link_type="simple" height="20">
-<uuid uuid="{B2281D80-0A0A-40BE-A45C-2FFDE293830A}"/><names>
-        <name lang="es">Derivación-Te</name>
-        <name lang="ca">Derivació-Te</name>
-        <name lang="fr">Té de dérivation</name>
-    </names>
-    <informations/>
-    <description>
-        <input size="6" text="Te" y="8" tagg="label" x="-1" rotate="true"/>
-        <circle style="line-style:normal;line-weight:normal;filling:black;color:black" y="-3" x="-3" diameter="6" antialias="false"/>
-        <line end1="none" y1="-10" x1="0" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" antialias="false" x2="0" length2="1.5" y2="0"/>
-        <line end1="none" y1="0" x1="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" length1="1.5" antialias="false" x2="10" length2="1.5" y2="0"/>
-        <terminal y="-10" orientation="n" x="0"/>
-        <terminal y="0" orientation="e" x="10"/>
-        <terminal y="0" orientation="w" x="-10"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/rejilla-sobrepresion.elmt b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/rejilla-sobrepresion.elmt
index 20cc5d32d..ed9f3120f 100644
--- a/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/rejilla-sobrepresion.elmt
+++ b/elements/60_energy/21_refrigeration/Climatizacion/ventilacion/rejilla-sobrepresion.elmt
@@ -1,28 +1,28 @@
-<definition hotspot_y="28" link_type="simple" height="50" width="30" type="element" version="0.80" hotspot_x="13" orientation="dyyy">
-    <uuid uuid="{8e6047ee-b4bc-4b23-adb1-88aa35464dbc}"/>
+<definition hotspot_y="28" hotspot_x="13" height="50" orientation="dyyy" width="30" version="0.80" type="element" link_type="simple">
+    <uuid uuid="{f7d969f6-26c3-471f-9976-73e6a6bb87f9}"/>
     <names>
-        <name lang="fr">Grillle</name>
         <name lang="ca">Eeixa sobrepresió</name>
+        <name lang="fr">Grille</name>
         <name lang="es">Rejilla sobrepresión</name>
     </names>
     <elementInformations/>
     <informations></informations>
     <description>
-        <polygon y5="-2.02043" y3="-14.313" x1="10.4375" antialias="false" x5="-4.5625" x3="13.25" y1="-19.0408" x2="13.25" x4="-4.5625" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-17.1497" y4="-1.07486"/>
-        <polygon y5="4.59862" y3="-7.69391" x1="10.4375" antialias="false" x5="-4.5625" x3="13.25" y1="-12.4218" x2="13.25" x4="-4.5625" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10.5307" y4="5.54421"/>
-        <line end2="none" x1="13.25" antialias="false" y1="-10.5307" end1="none" x2="-4.5625" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="1.76188" length2="1.5"/>
-        <polygon y5="12.1633" y3="-0.129274" x1="10.4375" antialias="false" x5="-4.5625" x3="13.25" y1="-4.85717" x2="13.25" x4="-4.5625" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-2.96601" y4="13.1088"/>
-        <line end2="none" x1="13.25" antialias="false" y1="-2.96601" end1="none" x2="-4.5625" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="9.32652" length2="1.5"/>
-        <line end2="none" x1="-9.25" antialias="false" y1="-8.63949" end1="none" x2="-4.5625" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8.63949" length2="1.5"/>
-        <line end2="none" x1="-9.25" antialias="false" y1="15" end1="none" x2="-4.5625" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="15" length2="1.5"/>
-        <polygon y5="-21.8776" y3="15" x1="14.1875" antialias="false" x5="14.1875" x3="-4.5625" y1="-21.8776" x2="-4.5625" x4="14.1875" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8.63949" y4="0.816305"/>
-        <line end2="none" x1="9.5" antialias="false" y1="-21.8776" end1="none" x2="14.1875" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-21.8776" length2="1.5"/>
-        <polygon y3="15" x1="9.5" antialias="false" x3="-9.25" y1="-21.8776" x2="-9.25" x4="-9.25" closed="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-8.63949" y4="15"/>
-        <line end2="none" x1="13.25" antialias="false" y1="-17.1497" end1="none" x2="-4.5625" length1="1.5" style="line-style:normal;line-weight:thin;filling:none;color:black" y2="-4.85717" length2="1.5"/>
-        <dynamic_text x="12.3125" z="12" frame="false" text_from="ElementInfo" y="-8.54765" font="Sans Serif,4,-1,5,25,0,0,0,0,0" Valignment="AlignTop" rotation="0" Halignment="AlignLeft" text_width="-1" uuid="{7da47692-80ae-4fe4-95b8-88a3bb8dc945}">
+        <polygon x2="13.25" x1="10.4375" x5="-4.5625" y5="-2.02043" antialias="false" closed="false" y3="-14.313" x4="-4.5625" y1="-19.0408" x3="13.25" y2="-17.1497" style="line-style:normal;line-weight:normal;filling:none;color:black" y4="-1.07486"/>
+        <polygon x2="13.25" x1="10.4375" x5="-4.5625" y5="4.59862" antialias="false" closed="false" y3="-7.69391" x4="-4.5625" y1="-12.4218" x3="13.25" y2="-10.5307" style="line-style:normal;line-weight:normal;filling:none;color:black" y4="5.54421"/>
+        <line x2="-4.5625" x1="13.25" end2="none" antialias="false" y1="-10.5307" end1="none" length1="1.5" y2="1.76188" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
+        <polygon x2="13.25" x1="10.4375" x5="-4.5625" y5="12.1633" antialias="false" closed="false" y3="-0.129274" x4="-4.5625" y1="-4.85717" x3="13.25" y2="-2.96601" style="line-style:normal;line-weight:normal;filling:none;color:black" y4="13.1088"/>
+        <line x2="-4.5625" x1="13.25" end2="none" antialias="false" y1="-2.96601" end1="none" length1="1.5" y2="9.32652" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
+        <line x2="-4.5625" x1="-9.25" end2="none" antialias="false" y1="-8.63949" end1="none" length1="1.5" y2="-8.63949" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5"/>
+        <line x2="-4.5625" x1="-9.25" end2="none" antialias="false" y1="15" end1="none" length1="1.5" y2="15" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5"/>
+        <polygon x2="-4.5625" x1="14.1875" x5="14.1875" y5="-21.8776" antialias="false" closed="false" y3="15" x4="14.1875" y1="-21.8776" x3="-4.5625" y2="-8.63949" style="line-style:normal;line-weight:normal;filling:none;color:black" y4="0.816305"/>
+        <line x2="14.1875" x1="9.5" end2="none" antialias="false" y1="-21.8776" end1="none" length1="1.5" y2="-21.8776" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5"/>
+        <polygon x2="-9.25" x1="9.5" antialias="false" closed="false" y3="15" x4="-9.25" y1="-21.8776" x3="-9.25" y2="-8.63949" style="line-style:normal;line-weight:normal;filling:none;color:black" y4="15"/>
+        <line x2="-4.5625" x1="13.25" end2="none" antialias="false" y1="-17.1497" end1="none" length1="1.5" y2="-4.85717" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
+        <dynamic_text uuid="{7da47692-80ae-4fe4-95b8-88a3bb8dc945}" y="-8.54765" Halignment="AlignLeft" font="Sans Serif,4,-1,5,25,0,0,0,0,0" x="12.3125" rotation="0" Valignment="AlignTop" text_from="ElementInfo" z="12" frame="false" text_width="-1">
             <text></text>
             <info_name>label</info_name>
         </dynamic_text>
-        <terminal x="-9" y="0" orientation="w"/>
+        <terminal y="0" orientation="w" x="-9"/>
     </description>
 </definition>
diff --git a/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/derivacion-te.elmt b/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/derivacion-te.elmt
deleted file mode 100644
index f120029d2..000000000
--- a/elements/60_energy/21_refrigeration/Frio/equipo-frigorifico/valvulas/derivacion-te.elmt
+++ /dev/null
@@ -1,22 +0,0 @@
-<definition hotspot_y="14" link_type="simple" height="20" width="30" type="element" version="0.80" hotspot_x="14" orientation="dyyy">
-    <uuid uuid="{55242ec8-ffd7-4541-ac8e-2118256ce51b}"/>
-    <names>
-        <name lang="fr">Té-derivation</name>
-        <name lang="ca">Derivació-Te</name>
-        <name lang="es">Derivación-Te</name>
-    </names>
-    <elementInformations/>
-    <informations></informations>
-    <description>
-        <dynamic_text x="-1" z="1" frame="false" text_from="ElementInfo" y="-1" font="Sans Serif,6,-1,5,50,0,0,0,0,0" Valignment="AlignTop" rotation="0" Halignment="AlignLeft" text_width="-1" uuid="{5a098aa2-2e08-4976-aadd-0f156be9348b}">
-            <text></text>
-            <info_name>label</info_name>
-        </dynamic_text>
-        <circle diameter="6" x="-3" y="-3" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <line end2="none" x1="0" antialias="false" y1="-10" end1="none" x2="0" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" length2="1.5"/>
-        <line end2="none" x1="-10" antialias="false" y1="0" end1="none" x2="10" length1="1.5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" length2="1.5"/>
-        <terminal x="0" y="-10" orientation="n"/>
-        <terminal x="10" y="0" orientation="e"/>
-        <terminal x="-10" y="0" orientation="w"/>
-    </description>
-</definition>
diff --git a/elements/60_energy/31_solar_thermal/ballon_echangeur/derivacion-te.elmt b/elements/60_energy/31_solar_thermal/ballon_echangeur/derivacion-te.elmt
deleted file mode 100644
index 7bdaebf4b..000000000
--- a/elements/60_energy/31_solar_thermal/ballon_echangeur/derivacion-te.elmt
+++ /dev/null
@@ -1,18 +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="{F1F28CF4-A0F4-459E-8D95-8696ADD8EE85}"/><names>
-        <name lang="es">Derivación-Te</name>
-        <name lang="en">T-branch</name>
-        <name lang="ca">Derivació-Te</name>
-        <name lang="fr">Té de dérivation</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/31_solar_thermal/eau_sanitaire/termo-electrico.elmt b/elements/60_energy/31_solar_thermal/eau_sanitaire/termo-electrico.elmt
index 0fb3bf85a..0a44daef9 100644
--- a/elements/60_energy/31_solar_thermal/eau_sanitaire/termo-electrico.elmt
+++ b/elements/60_energy/31_solar_thermal/eau_sanitaire/termo-electrico.elmt
@@ -1,42 +1,47 @@
-<definition type="element" hotspot_x="29" orientation="dyyy" width="50" height="80" link_type="simple" hotspot_y="34" version="0.4" ic="true">
-<uuid uuid="{D2F1A489-F9A4-4A36-B85E-4DF2C9BB9EB2}"/><names>
-        <name lang="es">Calentador Termo Electrico</name>
-        <name lang="en">Thermo electric heater</name>
+<definition hotspot_y="34" hotspot_x="29" height="80" orientation="dyyy" width="50" version="0.80" type="element" link_type="simple">
+    <uuid uuid="{1441f41a-d87e-458e-a563-d7d887d78ca9}"/>
+    <names>
         <name lang="ca">Escalfador eléctric</name>
         <name lang="it">Boiler elettrico</name>
-        <name lang="fr">Chauffe eau électriqe</name>
+        <name lang="en">Thermo electric heater</name>
+        <name lang="fr">Chauffe eau électrique</name>
+        <name lang="es">Calentador Termo Electrico</name>
     </names>
-    <informations>Rafael Ferrando.
+    <elementInformations/>
+    <informations>Rafael Ferrando.&#xd;
 Mantenimiento de Instalaciones Térmicas</informations>
     <description>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" x1="7.4" x2="11.18" y2="38.4249" antialias="false" end1="none" length2="1.5" length1="1.5" y1="38.8288"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" x="-10.62" antialias="true" width="9.786" height="2.57749" angle="-180" start="0" y="39.3811"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" x1="-22.18" x2="-18.4" y2="38.4249" antialias="false" end1="none" length2="1.5" length1="1.5" y1="38.8288"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15.88" x2="-15.88" y2="40.4441" antialias="false" end1="none" length2="1.5" length1="1.5" y1="37.2133"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="14.118" antialias="false" width="4.158" height="6.46153" y="-4.38275"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-22.842" antialias="false" width="37.0986" height="59.4061" y="-26.4691"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" x="-22.3338" antialias="true" width="37.0986" height="6.5043" angle="-180" start="-180" y="-29.5048"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-15.04" x2="-15.88" y2="40.848" antialias="false" end1="none" length2="1.5" length1="1.5" y1="39.2326"/>
-        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" x="15.504" antialias="true" width="1.848" height="1.21154" y="-1.55583"/>
-        <rect style="line-style:normal;line-weight:normal;filling:red;color:black" x="-22.18" antialias="false" width="4.2" height="5.25" y="35.598"/>
-        <arc style="line-style:normal;line-weight:normal;filling:none;color:black" x="-22.842" antialias="true" width="37.0986" height="6.5043" angle="-180" start="0" y="29.9013"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-16.72" x2="-15.88" y2="40.848" antialias="false" end1="none" length2="1.5" length1="1.5" y1="39.2326"/>
-        <rect style="line-style:normal;line-weight:normal;filling:blue;color:black" x="7.4" antialias="false" width="4.2" height="5.25" y="35.598"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" x1="-22.18" x2="-18.4" y2="40.0403" antialias="false" end1="none" length2="1.5" length1="1.5" y1="40.4441"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" x1="7.4" x2="11.18" y2="40.0403" antialias="false" end1="none" length2="1.5" length1="1.5" y1="40.4441"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" x1="-22.18" x2="-18.4" y2="39.2326" antialias="false" end1="none" length2="1.5" length1="1.5" y1="39.6364"/>
-        <line style="line-style:normal;line-weight:thin;filling:none;color:black" end2="none" x1="7.4" x2="11.18" y2="39.2326" antialias="false" end1="none" length2="1.5" length1="1.5" y1="39.6364"/>
-        <ellipse style="line-style:normal;line-weight:normal;filling:red;color:black" x="-8.52" antialias="true" width="1.68" height="1.51442" y="37.9201"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-2.8" antialias="false" width="0.16" height="2.01922" y="37.9201"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-10.62" x2="-10.62" y2="36.4056" antialias="false" end1="none" length2="1.5" length1="1.5" y1="40.949"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="-0.96" x2="-0.96" y2="36.4056" antialias="false" end1="none" length2="1.5" length1="1.5" y1="40.949"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="4.88" x2="4.88" y2="40.4441" antialias="false" end1="none" length2="1.5" length1="1.5" y1="37.2133"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="4.88" x2="4.04" y2="38.4249" antialias="false" end1="none" length2="1.5" length1="1.5" y1="36.8095"/>
-        <line style="line-style:normal;line-weight:normal;filling:none;color:black" end2="none" x1="4.88" x2="5.72" y2="38.4249" antialias="false" end1="none" length2="1.5" length1="1.5" y1="36.8095"/>
-        <rect style="line-style:normal;line-weight:normal;filling:none;color:black" x="-27" antialias="false" width="4.158" height="6.46153" y="-5.19046"/>
-        <ellipse style="line-style:normal;line-weight:normal;filling:none;color:black" x="-25.614" antialias="true" width="1.848" height="1.21154" y="-2.36352"/>
-        <input rotate="true" x="-10" tagg="label" size="4" text="_L" y="6"/>
-        <terminal x="9.5" orientation="s" y="40.4441"/>
-        <terminal x="-20.08" orientation="s" y="40.0403"/>
+        <line x2="11.18" x1="7.4" end2="none" antialias="false" y1="38.8288" end1="none" length1="1.5" y2="38.4249" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
+        <arc y="39.3811" height="2.57749" antialias="true" x="-10.62" width="9.786" start="0" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line x2="-18.4" x1="-22.18" end2="none" antialias="false" y1="38.8288" end1="none" length1="1.5" y2="38.4249" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
+        <line x2="-15.88" x1="-15.88" end2="none" antialias="false" y1="37.2133" end1="none" length1="1.5" y2="40.4441" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5"/>
+        <rect rx="0" y="-4.38275" height="6.46153" antialias="false" x="14.118" width="4.158" style="line-style:normal;line-weight:normal;filling:none;color:black" ry="0"/>
+        <rect rx="0" y="-26.4691" height="59.4061" antialias="false" x="-22.842" width="37.0986" style="line-style:normal;line-weight:normal;filling:none;color:black" ry="0"/>
+        <arc y="-29.5048" height="6.5043" antialias="true" x="-22.3338" width="37.0986" start="-180" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line x2="-15.88" x1="-15.04" end2="none" antialias="false" y1="39.2326" end1="none" length1="1.5" y2="40.848" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5"/>
+        <circle diameter="1.5" y="-1.7" antialias="true" x="15.68" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <rect rx="0" y="35.598" height="5.25" antialias="false" x="-22.18" width="4.2" style="line-style:normal;line-weight:normal;filling:red;color:black" ry="0"/>
+        <arc y="29.9013" height="6.5043" antialias="true" x="-22.842" width="37.0986" start="0" angle="-180" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line x2="-15.88" x1="-16.72" end2="none" antialias="false" y1="39.2326" end1="none" length1="1.5" y2="40.848" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5"/>
+        <rect rx="0" y="35.598" height="5.25" antialias="false" x="7.4" width="4.2" style="line-style:normal;line-weight:normal;filling:blue;color:black" ry="0"/>
+        <line x2="-18.4" x1="-22.18" end2="none" antialias="false" y1="40.4441" end1="none" length1="1.5" y2="40.0403" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
+        <line x2="11.18" x1="7.4" end2="none" antialias="false" y1="40.4441" end1="none" length1="1.5" y2="40.0403" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
+        <line x2="-18.4" x1="-22.18" end2="none" antialias="false" y1="39.6364" end1="none" length1="1.5" y2="39.2326" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
+        <line x2="11.18" x1="7.4" end2="none" antialias="false" y1="39.6364" end1="none" length1="1.5" y2="39.2326" style="line-style:normal;line-weight:thin;filling:none;color:black" length2="1.5"/>
+        <ellipse y="37.9201" height="1.51442" antialias="true" x="-8.52" width="1.68" style="line-style:normal;line-weight:normal;filling:red;color:black"/>
+        <rect rx="0" y="37.9201" height="2.01922" antialias="false" x="-2.8" width="0.16" style="line-style:normal;line-weight:normal;filling:none;color:black" ry="0"/>
+        <line x2="-10.62" x1="-10.62" end2="none" antialias="false" y1="40.949" end1="none" length1="1.5" y2="36.4056" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5"/>
+        <line x2="-0.96" x1="-0.96" end2="none" antialias="false" y1="40.949" end1="none" length1="1.5" y2="36.4056" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5"/>
+        <line x2="4.88" x1="4.88" end2="none" antialias="false" y1="37.2133" end1="none" length1="1.5" y2="40.4441" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5"/>
+        <line x2="4.04" x1="4.88" end2="none" antialias="false" y1="36.8095" end1="none" length1="1.5" y2="38.4249" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5"/>
+        <line x2="5.72" x1="4.88" end2="none" antialias="false" y1="36.8095" end1="none" length1="1.5" y2="38.4249" style="line-style:normal;line-weight:normal;filling:none;color:black" length2="1.5"/>
+        <rect rx="0" y="-5.19046" height="6.46153" antialias="false" x="-27" width="4.158" style="line-style:normal;line-weight:normal;filling:none;color:black" ry="0"/>
+        <circle diameter="1.5" y="-2.51" antialias="true" x="-25.44" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <dynamic_text uuid="{3d22b4ec-72c7-43ff-9a7f-b292aca2d911}" y="-1" Halignment="AlignLeft" font="Sans Serif,4,-1,5,25,0,0,0,0,0" x="-10" rotation="0" Valignment="AlignTop" text_from="ElementInfo" z="27" frame="false" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <terminal y="40.4441" orientation="s" x="9.5"/>
+        <terminal y="40.0403" orientation="s" x="-20.08"/>
     </description>
 </definition>