diff --git a/elements/energie/solaire/ballon_echangeur/ballon_demi_strat.elmt b/elements/energie/solaire/ballon_echangeur/ballon_demi_strat.elmt
index d9087713f..957474f5f 100644
--- a/elements/energie/solaire/ballon_echangeur/ballon_demi_strat.elmt
+++ b/elements/energie/solaire/ballon_echangeur/ballon_demi_strat.elmt
@@ -1,38 +1,39 @@
 <definition width="150" version="0.3" hotspot_x="75" hotspot_y="125" height="260" type="element" orientation="dyyy">
     <names>
+        <name lang="en">Stratification storage tank 1000L</name>
         <name lang="fr">ballon 1000L chicane et strat</name>
         <name lang="cs">Balón 1000L hradítko a vrstva</name>
     </names>
     <informations></informations>
     <description>
+        <rect width="20" x="-10" y="-1" antialias="false" height="100" style="line-style:dotted;line-weight:normal;filling:none;color:black"/>
+        <arc width="120" x="-60" y="-117.5" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-100" x1="60" y2="101" x2="60"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-99" x1="-60" y2="101" x2="-60"/>
-        <rect width="20" x="-10" y="0" antialias="false" height="100" style="line-style:dotted;line-weight:normal;filling:none;color:black"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:black" y1="100" x1="-60" y2="100" x2="60"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:normal;filling:none;color:black" y1="-70" x1="-60" y2="-70" x2="59"/>
         <polygon x4="20" y5="-116" x5="20" antialias="false" style="line-style:dotted;line-weight:normal;filling:none;color:black" closed="false" y1="-116" x1="-20" y2="-100" x2="-20" y3="-100" x3="20" y4="-116"/>
-        <circle x="-2.75" y="76.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
-        <circle x="-2.75" y="21.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
-        <circle x="-2.75" y="-93.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
-        <arc width="120" x="-60" y="-117.5" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
+        <circle x="-2.75" y="77.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
+        <circle x="-2.75" y="17.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
+        <circle x="-2.75" y="-92.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
         <input x="-37" y="-36" size="7" rotate="true" text="       Ballon&#xa;Stratificateur &#xa;     Stockage&#xa;       1000L"/>
         <circle x="-3.75" y="-112.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
         <circle x="-43" y="-2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <circle x="-2.75" y="-80.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
+        <circle x="-2.75" y="-82.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
         <polygon x4="40" y5="114" x5="40" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="109" x1="55" y2="124" x2="55" y3="124" x3="40" y4="114"/>
         <polygon x4="-40" y5="114" x5="-40" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="109" x1="-55" y2="124" x2="-55" y3="124" x3="-40" y4="114"/>
-        <arc width="120" x="-60" y="82" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
+        <arc width="120" x="-60" y="83" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
         <circle x="-3.75" y="106.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="-41" y="106" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="-42" y="108" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
         <circle x="-42" y="-92" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
         <terminal x="-40" y="-90" orientation="w"/>
-        <terminal x="0" y="-78" orientation="e"/>
+        <terminal x="0" y="-80" orientation="e"/>
         <terminal x="0" y="110" orientation="s"/>
         <terminal x="0" y="-109" orientation="n"/>
-        <terminal x="0" y="79" orientation="e"/>
-        <terminal x="-1" y="-91" orientation="e"/>
-        <terminal x="-1" y="24" orientation="e"/>
+        <terminal x="0" y="80" orientation="e"/>
+        <terminal x="-1" y="-90" orientation="e"/>
+        <terminal x="-1" y="20" orientation="e"/>
         <terminal x="-41" y="0" orientation="w"/>
-        <terminal x="-39" y="108" orientation="w"/>
+        <terminal x="-40" y="110" orientation="w"/>
     </description>
 </definition>
diff --git a/elements/energie/solaire/ballon_echangeur/ballon_stock1000l.elmt b/elements/energie/solaire/ballon_echangeur/ballon_stock1000l.elmt
index 69401af7e..be0d887bf 100644
--- a/elements/energie/solaire/ballon_echangeur/ballon_stock1000l.elmt
+++ b/elements/energie/solaire/ballon_echangeur/ballon_stock1000l.elmt
@@ -1,10 +1,12 @@
 <definition width="150" version="0.3" hotspot_x="75" hotspot_y="65" height="260" type="element" orientation="ndny">
     <names>
+        <name lang="en">Storage tank 1000L</name>
         <name lang="fr">Ballon Stockage 1000L</name>
         <name lang="cs">Balónová nádržka 1000L</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
+        <rect width="120" x="-60" y="-39" antialias="false" height="201" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <input x="-55" y="36.5" size="7" rotate="true" text="  Ballon&#xa;Stockage&#xa;  1000L"/>
         <circle x="-63.75" y="-33.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
         <circle x="38" y="-12" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
@@ -12,18 +14,17 @@
         <circle x="-2.75" y="-53.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5.5"/>
         <polygon x4="40" y5="174" x5="40" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="169" x1="55" y2="184" x2="55" y3="184" x3="40" y4="174"/>
         <polygon x4="-40" y5="174" x5="-40" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="169" x1="-55" y2="184" x2="-55" y3="184" x3="-40" y4="174"/>
-        <rect width="120" x="-60" y="-40" antialias="false" height="201" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <arc width="120" x="-60" y="142.5" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
         <arc width="120" x="-60" y="-57.5" antialias="true" height="36" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
         <circle x="-63.75" y="146.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="7.5"/>
-        <circle x="38" y="129" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
-        <circle x="38" y="56" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="38" y="128" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
+        <circle x="38" y="58" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4"/>
         <terminal x="-60" y="-30" orientation="w"/>
         <terminal x="-60" y="150" orientation="w"/>
         <terminal x="0" y="-51" orientation="n"/>
         <terminal x="0" y="178" orientation="s"/>
         <terminal x="40" y="-10" orientation="e"/>
-        <terminal x="40" y="58" orientation="e"/>
-        <terminal x="40" y="131" orientation="e"/>
+        <terminal x="40" y="60" orientation="e"/>
+        <terminal x="40" y="130" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/energie/solaire/ballon_echangeur/echangeur_plaque.elmt b/elements/energie/solaire/ballon_echangeur/echangeur_plaque.elmt
index 9bab93aeb..535ed15c2 100644
--- a/elements/energie/solaire/ballon_echangeur/echangeur_plaque.elmt
+++ b/elements/energie/solaire/ballon_echangeur/echangeur_plaque.elmt
@@ -1,17 +1,18 @@
 <definition width="50" version="0.3" hotspot_x="25" hotspot_y="50" height="100" type="element" orientation="ndny">
     <names>
-        <name lang="fr">echangeur à Plaques</name>
+        <name lang="en">Plate heat exchanger</name>
+        <name lang="fr">Echangeur à Plaques</name>
         <name lang="cs">Deskový výměník</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
         <text x="17" y="13" size="4" rotation="-90" text="Secondaire"/>
         <text x="-14" y="9" size="4" rotation="-90" text="Primaire"/>
         <text x="-16" y="-39" size="6" text="Plaques"/>
         <rect width="40" x="-20" y="-36" antialias="true" height="71" style="line-style:normal;line-weight:thin;filling:none;color:black"/>
         <circle x="18.75" y="28.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" x2="10" x3="-5" x4="10" antialias="true" x5="-5" x6="10" x7="-5" x8="10" x9="20" closed="false" y1="-30" y10="30" y2="-30" y3="-20" y4="-10" y5="0" x10="20" y6="10" y7="20" y8="30" y9="30"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" x2="5" x3="-10" x4="5" antialias="true" x5="-10" x6="5" x7="-10" x8="5" x9="-20" closed="false" y1="-30" y10="30" y2="-30" y3="-20" y4="-10" y5="0" x10="-20" y6="10" y7="20" y8="30" y9="30"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="20" x2="10" x3="-5" x4="10" antialias="true" x5="-5" x6="10" x7="-5" x8="10" x9="20" closed="false" y1="-30" y2="-30" y10="30" y3="-20" y4="-10" y5="0" x10="20" y6="10" y7="20" y8="30" y9="30"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" x2="5" x3="-10" x4="5" antialias="true" x5="-10" x6="5" x7="-10" x8="5" x9="-20" closed="false" y1="-30" y2="-30" y10="30" y3="-20" y4="-10" y5="0" x10="-20" y6="10" y7="20" y8="30" y9="30"/>
         <circle x="-21.25" y="28.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
         <circle x="18.75" y="-31.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
         <circle x="-21.25" y="-31.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
diff --git a/elements/energie/solaire/ballon_echangeur/mur_radian.elmt b/elements/energie/solaire/ballon_echangeur/mur_radian.elmt
index f0f467ec2..25f6ca7aa 100644
--- a/elements/energie/solaire/ballon_echangeur/mur_radian.elmt
+++ b/elements/energie/solaire/ballon_echangeur/mur_radian.elmt
@@ -1,26 +1,27 @@
-<definition width="50" version="0.3" hotspot_x="25" hotspot_y="50" height="100" type="element" orientation="dyyy">
+<definition width="60" version="0.3" hotspot_x="25" hotspot_y="60" height="110" type="element" orientation="dyyy">
     <names>
-        <name lang="fr">mur chauffant</name>
+        <name lang="en">Wall heating</name>
+        <name lang="fr">Mur chauffant</name>
         <name lang="cs">Topná stěna</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-27" x1="4" y2="27" x2="4"/>
-        <circle x="-9.5" y="-7.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
-        <polygon x4="23" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="44" x1="0" y2="22" x2="23" y3="-47" x3="23" y4="-47"/>
-        <polygon x4="0" y5="-30" x5="0" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-30" x1="-15" y2="-48" x2="13" y3="-48" x3="24" y4="-30"/>
-        <rect width="15" x="-15" y="-30" antialias="false" height="74" 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:dotted;line-weight:thin;filling:none;color:black" y1="-33" x1="12" y2="21" x2="12"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-37" x1="16" y2="17" x2="16"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-41" x1="20" y2="13" x2="20"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-30" x1="8" y2="24" x2="8"/>
-        <circle x="-9.5" y="33.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
-        <circle x="-9.5" y="23.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
-        <circle x="-9.5" y="13.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
-        <circle x="-9.5" y="3.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
-        <circle x="-9.5" y="-17.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
-        <circle x="-9.5" y="-26.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
-        <terminal x="-8" y="35" orientation="e"/>
-        <terminal x="-8" y="-25" orientation="e"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-32" x1="2" y2="22" x2="2"/>
+        <circle x="-11.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
+        <polygon x4="22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="39" x1="-1" y2="17" x2="22" y3="-52" x3="22" y4="-52"/>
+        <polygon x4="-2" y5="-35" x5="-2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-35" x1="-17" y2="-53" x2="11" y3="-53" x3="22" y4="-35"/>
+        <rect width="15" x="-17" y="-35" antialias="false" height="74" 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:dotted;line-weight:thin;filling:none;color:black" y1="-38" x1="10" y2="16" x2="10"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-42" x1="14" y2="12" x2="14"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-46" x1="18" y2="8" x2="18"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:dotted;line-weight:thin;filling:none;color:black" y1="-35" x1="6" y2="19" x2="6"/>
+        <circle x="-11.5" y="28.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
+        <circle x="-11.5" y="18.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
+        <circle x="-11.5" y="8.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
+        <circle x="-11.5" y="-1.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
+        <circle x="-11.5" y="-22.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
+        <circle x="-11.5" y="-31.5" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="3"/>
+        <terminal x="-10" y="30" orientation="e"/>
+        <terminal x="-10" y="-30" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/energie/solaire/ballon_echangeur/sksw-0.elmt b/elements/energie/solaire/ballon_echangeur/sksw-0.elmt
index be99a83b6..141147b35 100644
--- a/elements/energie/solaire/ballon_echangeur/sksw-0.elmt
+++ b/elements/energie/solaire/ballon_echangeur/sksw-0.elmt
@@ -1,5 +1,6 @@
 <definition width="120" version="0.3" hotspot_x="60" hotspot_y="100" height="200" type="element" orientation="dyyy">
     <names>
+        <name lang="en">tank cobinned sksw ecs</name>
         <name lang="fr">ballon combinée sksw ecs</name>
         <name lang="cs">Kombinovaný balón sksw ecs</name>
     </names>
@@ -7,7 +8,7 @@
     <description>
         <text x="-25" y="94" size="7" text="Ballon SKS"/>
         <polygon x4="40" y5="72" x5="40" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="72" x1="-40" y2="83" x2="-40" y3="83" x3="40" y4="72"/>
-        <polygon y29="-56" x23="-25" x24="24" x25="-25" style="line-style:normal;line-weight:normal;filling:none;color:black" x26="24" x27="-25" x1="20" x28="24" x2="20" x29="-25" x3="-26" y30="-57" x4="25" y31="-59" x5="-26" y32="-60" x6="25" y33="-62" x7="-26" y34="-63" x8="24" y35="-65" x9="-26" y36="-66" x30="24" y37="-68" x31="-25" y38="-70" x32="23" y39="-72" x33="-25" x34="24" x35="-25" x36="24" x37="-25" y1="-95" x38="24" y2="50" x39="-25" y3="50" y40="-73" y4="40" y41="-75" y5="30" y42="-76" y6="20" y43="-78" y7="10" y44="-79" y8="0" y45="-81" y9="-10" y46="-82" x40="23" y47="-84" x41="-25" y48="-95" x42="23" y49="-95" x43="-25" x44="23" antialias="true" x45="-25" x46="23" x47="-20" x48="-20" x49="-20" closed="false" y10="-20" y11="-24" y12="-28" y13="-30" y14="-32" y15="-34" y16="-36" x10="24" y17="-38" x11="-25" y18="-39" x12="24" y19="-41" x13="-25" x14="24" x15="-25" x16="24" x17="-25" x18="24" x19="-25" y20="-42" y21="-44" y22="-45" y23="-47" y24="-48" y25="-50" y26="-51" x20="24" y27="-53" x21="-25" y28="-54" x22="24"/>
+        <polygon y29="-56" x23="-25" x24="24" x25="-25" style="line-style:normal;line-weight:normal;filling:none;color:black" x26="24" x27="-25" x1="20" x28="24" x2="20" x29="-25" x3="-26" y30="-57" x4="25" y31="-59" x5="-26" y32="-60" x6="25" y33="-62" x7="-26" x8="24" y34="-63" x9="-26" y35="-65" x30="24" y36="-66" x31="-25" y37="-68" x32="23" y38="-70" x33="-25" y39="-72" x34="24" x35="-25" x36="24" y1="-95" x37="-25" y2="50" x38="24" y3="50" x39="-25" y4="40" y40="-73" y5="30" y41="-75" y6="20" y42="-76" y7="10" y43="-78" y8="0" y44="-79" y9="-10" y45="-81" x40="23" y46="-82" x41="-25" y47="-84" x42="23" y48="-95" x43="-25" y49="-95" x44="23" antialias="true" x45="-25" x46="23" x47="-20" x48="-20" x49="-20" closed="false" y10="-20" y11="-24" y12="-28" y13="-30" y14="-32" y15="-34" y16="-36" x10="24" y17="-38" x11="-25" y18="-39" x12="24" y19="-41" x13="-25" x14="24" x15="-25" x16="24" x17="-25" x18="24" x19="-25" y20="-42" y21="-44" y22="-45" y23="-47" y24="-48" y25="-50" y26="-51" x20="24" y27="-53" x21="-25" y28="-54" x22="24"/>
         <rect width="4" x="18" y="-96" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="4" x="-22" y="-96" antialias="false" height="4" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="10" x="-42" y="-15" antialias="false" height="79" style="line-style:dotted;line-weight:normal;filling:none;color:black"/>
@@ -17,21 +18,21 @@
         <arc width="90" x="-45" y="48" antialias="true" height="33" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
         <arc width="90" x="-45" y="-86" antialias="true" height="33" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
         <circle x="34.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="34.5" y="22.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="34.5" y="27.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
         <circle x="34.5" y="57.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
         <circle x="34.5" y="-62.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
         <circle x="-39.5" y="-12.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <circle x="-39.5" y="22.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
+        <circle x="-39.5" y="27.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
         <circle x="-39.5" y="57.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
         <terminal x="-37" y="-60" orientation="w"/>
         <terminal x="-37" y="-10" orientation="w"/>
-        <terminal x="-37" y="25" orientation="w"/>
+        <terminal x="-37" y="30" orientation="w"/>
         <terminal x="-37" y="60" orientation="w"/>
         <terminal x="-20" y="-94" orientation="n"/>
         <terminal x="20" y="-94" orientation="n"/>
         <terminal x="37" y="-60" orientation="e"/>
         <terminal x="37" y="-10" orientation="e"/>
-        <terminal x="37" y="25" orientation="e"/>
+        <terminal x="37" y="30" orientation="e"/>
         <terminal x="37" y="60" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/energie/solaire/base_ecs/ballon_ecs_elec.elmt b/elements/energie/solaire/base_ecs/ballon_ecs_elec.elmt
index 1ef264d7a..72ec39a17 100644
--- a/elements/energie/solaire/base_ecs/ballon_ecs_elec.elmt
+++ b/elements/energie/solaire/base_ecs/ballon_ecs_elec.elmt
@@ -1,12 +1,13 @@
 <definition width="120" version="0.3" hotspot_x="60" hotspot_y="90" height="180" type="element" orientation="dyyy">
     <names>
-        <name lang="fr">ballon ECS electrique</name>
+        <name lang="en">Tank ecs</name>
+        <name lang="fr">Ballon ECS electrique</name>
         <name lang="cs">Elektrický balón ECS</name>
     </names>
     <informations></informations>
     <description>
-        <text x="-37" y="-24" size="9" text="Ballon&#xa; ECS"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="-10" x3="9" x4="-10" antialias="false" x5="10" x6="-10" x7="10" x8="-11" x9="10" closed="false" y1="82" y10="30" y2="70" y11="30" y3="65" y4="60" y12="30" y5="56" x10="-10" y6="50" x11="2" y7="45" x12="2" y8="40" y9="35"/>
+        <input x="-43" y="-18" size="9" rotate="true" text="Ballon&#xa; ECS"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="-10" x3="9" x4="-10" antialias="false" x5="10" x6="-10" x7="10" x8="-11" x9="10" closed="false" y1="82" y2="70" y10="30" y3="65" y11="30" y4="60" y12="30" y5="56" x10="-10" y6="50" x11="2" y7="45" x12="2" y8="40" y9="35"/>
         <rect width="11" x="41" y="10" antialias="false" height="1" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="1" x="-31" y="60" antialias="false" height="25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="1" x="29" y="-80" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
@@ -14,8 +15,8 @@
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-59" x1="-50" y2="70" x2="-50"/>
         <arc width="100" x="-50" y="57.5" antialias="true" height="25" style="line-style:normal;line-weight:normal;filling:none;color:black" start="0" angle="-180"/>
         <arc width="100" x="-50" y="-72.5" antialias="true" height="25" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <terminal x="-31" y="84" orientation="s"/>
-        <terminal x="29" y="-80" orientation="n"/>
+        <terminal x="-30" y="84" orientation="s"/>
+        <terminal x="30" y="-80" orientation="n"/>
         <terminal x="51" y="10" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/energie/solaire/base_ecs/rechauff_ecs.elmt b/elements/energie/solaire/base_ecs/rechauff_ecs.elmt
index 172e1b1b0..e29a3f7ad 100644
--- a/elements/energie/solaire/base_ecs/rechauff_ecs.elmt
+++ b/elements/energie/solaire/base_ecs/rechauff_ecs.elmt
@@ -1,17 +1,18 @@
-<definition width="100" version="0.3" hotspot_x="50" hotspot_y="70" height="140" type="element" orientation="dyyy">
+<definition width="100" version="0.3" hotspot_x="40" hotspot_y="50" height="100" type="element" orientation="dyyy">
     <names>
+        <name lang="en">ECS Réchaufeur tubular</name>
         <name lang="fr">Réchaufeur ECS tubulaire</name>
         <name lang="cs">Trubkový ohřívač ECS</name>
     </names>
     <informations></informations>
     <description>
-        <text x="45" y="31" size="6" rotation="-90" text="Echangeur ECS"/>
+        <input x="46" y="36" size="6" rotation="270" rotate="true" text="Echangeur ECS"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="simple" style="line-style:dotted;line-weight:normal;filling:none;color:black" y1="35" x1="0" y2="-37" x2="0"/>
         <circle x="-30.5" y="-31.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
         <rect width="2" x="-1" y="40" antialias="false" height="7" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <rect width="2" x="-1" y="-47" antialias="false" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <ellipse width="60" x="-30" y="-45" antialias="true" height="90" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-30" x2="20" x3="-20" x4="20" antialias="false" x5="-20" x6="20" x7="-30" x8="-30" closed="false" y1="-30" y2="-30" y3="-14" y4="0" y5="16" y6="30" y7="30" y8="30"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-30" x2="20" x3="-20" x4="20" antialias="true" x5="-20" x6="20" x7="-30" x8="-30" closed="false" y1="-30" y2="-30" y3="-14" y4="0" y5="16" y6="30" y7="30" y8="30"/>
         <circle x="-30.5" y="28.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3"/>
         <terminal x="-29" y="30" orientation="w"/>
         <terminal x="-29" y="-30" orientation="w"/>
diff --git a/elements/energie/solaire/bout_gd.elmt b/elements/energie/solaire/bout_gd.elmt
index c16bb7920..f88019853 100644
--- a/elements/energie/solaire/bout_gd.elmt
+++ b/elements/energie/solaire/bout_gd.elmt
@@ -1,5 +1,6 @@
 <definition width="50" version="0.3" hotspot_x="25" hotspot_y="50" height="100" type="element" orientation="dnnn">
     <names>
+        <name lang="en">Bottle guy delsol</name>
         <name lang="fr">Bouteille Guy Delsol</name>
         <name lang="cs">Láhev Guy Delsol</name>
     </names>
@@ -20,6 +21,6 @@
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="12.5" y2="25" x2="12.5"/>
         <terminal x="0" y="43" orientation="s"/>
         <terminal x="0" y="-40" orientation="n"/>
-        <terminal x="16" y="-21" orientation="e"/>
+        <terminal x="16" y="-20" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/energie/solaire/cap_thersolaire.elmt b/elements/energie/solaire/cap_thersolaire.elmt
index f8e892720..f25d03be6 100644
--- a/elements/energie/solaire/cap_thersolaire.elmt
+++ b/elements/energie/solaire/cap_thersolaire.elmt
@@ -1,45 +1,46 @@
-<definition width="160" version="0.3" hotspot_x="60" hotspot_y="40" height="100" type="element" orientation="ndny">
+<definition width="170" version="0.3" hotspot_x="60" hotspot_y="40" height="100" type="element" orientation="ndny">
     <names>
-        <name lang="fr">panneau solaire eau</name>
+        <name lang="en">Solar water panels</name>
+        <name lang="fr">Panneau solaire eau</name>
         <name lang="cs">Sluneční panel voda</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="-32" x1="94" y2="-28" x2="48"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-32" x1="42" y2="-28" x2="-4"/>
-        <polygon x4="42" y5="54" x5="-2" y6="54" x6="-2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="54" x1="-2" y2="-26" x2="-2" y3="-30" x3="42" y4="50"/>
-        <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="54" x1="48" y2="-27" x2="48"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="54" x1="-4" y2="-27" x2="-4"/>
-        <polygon x4="-10" y5="54" x5="-54" y6="54" x6="-54" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="54" x1="-54" y2="-26" x2="-54" y3="-30" x3="-10" y4="50"/>
-        <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="54" x1="-56" y2="-27" x2="-56"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-32" x1="-10" y2="-28" x2="-56"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="-17" y2="45" x2="-17"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="-24.5" y2="45" x2="-24.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="-32" y2="45" x2="-32"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="-39.5" y2="45" x2="-39.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="-47" y2="45" x2="-47"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="36" y2="45" x2="36"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="28.5" y2="45" x2="28.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="21" y2="45" x2="21"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="13" y2="45" x2="13"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="6" y2="45" x2="6"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="86" y2="45" x2="86"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="78.5" y2="45" x2="78.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="71" y2="45" x2="71"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="63.5" y2="45" x2="63.5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="56" y2="45" x2="56"/>
-        <ellipse width="2" x="-55" y="53" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="2" x="-3" y="53" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="2" x="49" y="53" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="2" x="-11" y="-31" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="2" x="40" y="-31" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <ellipse width="2" x="93" y="-31" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
-        <text x="-29" y="4" size="8" text="Panneaux Solaire"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="93" y2="-30" x2="97"/>
-        <polygon x4="94" y5="54" x5="50" y6="54" x6="50" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="54" x1="50" y2="-26" x2="50" y3="-30" x3="94" y4="50"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55" x1="50" y2="55" x2="-53"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-9" y2="-30" x2="95"/>
-        <terminal x="-54" y="56" orientation="s"/>
-        <terminal x="98" y="-30" orientation="e"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="33.5" y2="45" x2="33.5"/>
+        <polygon x4="46" y5="54" x5="2" y6="54" x6="2" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="54" x1="2" y2="-26" x2="2" y3="-30" x3="46" y4="50"/>
+        <polygon x4="98" y5="54" x5="54" y6="54" x6="54" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="54" x1="54" y2="-26" x2="54" y3="-30" x3="98" y4="50"/>
+        <input x="-30" y="5" size="9" rotate="true" text="Panneaux Solaire"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-32" x1="98" y2="-28" x2="52"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-32" x1="46" y2="-28" x2="0"/>
+        <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="54" x1="52" y2="-27" x2="52"/>
+        <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="54" x1="0" y2="-27" x2="0"/>
+        <polygon x4="-6" y5="54" x5="-50" y6="54" x6="-50" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="54" x1="-50" y2="-26" x2="-50" y3="-30" x3="-6" y4="50"/>
+        <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="54" x1="-52" y2="-27" x2="-52"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-32" x1="-6" y2="-28" x2="-52"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="-13" y2="45" x2="-13"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="-20.5" y2="45" x2="-20.5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="-28" y2="45" x2="-28"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="-35.5" y2="45" x2="-35.5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="-43" y2="45" x2="-43"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="40" y2="45" x2="40"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="25" y2="45" x2="25"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="17" y2="45" x2="17"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="10" y2="45" 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="-20" x1="90" y2="45" x2="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="-20" x1="82.5" y2="45" x2="82.5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="75" y2="45" x2="75"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="67.5" y2="45" x2="67.5"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-20" x1="60" y2="45" x2="60"/>
+        <ellipse width="2" x="-51" y="53" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <ellipse width="2" x="1" y="53" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <ellipse width="2" x="53" y="53" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <ellipse width="2" x="-7" y="-31" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <ellipse width="2" x="44" y="-31" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <ellipse width="2" x="97" y="-31" antialias="true" height="2" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="97" y2="-30" x2="101"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="55" x1="54" y2="55" x2="-49"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-5" y2="-30" x2="99"/>
+        <terminal x="-50" y="56" orientation="s"/>
+        <terminal x="102" y="-30" orientation="e"/>
     </description>
 </definition>
diff --git a/elements/energie/solaire/circulateur.elmt b/elements/energie/solaire/circulateur.elmt
index 52575f7fb..c28cb8b6e 100644
--- a/elements/energie/solaire/circulateur.elmt
+++ b/elements/energie/solaire/circulateur.elmt
@@ -1,5 +1,6 @@
-<definition width="40" version="0.22" hotspot_x="20" hotspot_y="20" height="40" type="element" orientation="dyyy">
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="20" height="40" type="element" orientation="dyyy">
     <names>
+        <name lang="en">circulator</name>
         <name lang="fr">circulateur</name>
         <name lang="cs">Cirkulátor</name>
     </names>
diff --git a/elements/energie/solaire/circulateuranti.elmt b/elements/energie/solaire/circulateuranti.elmt
index d42bea694..2d91ce10e 100644
--- a/elements/energie/solaire/circulateuranti.elmt
+++ b/elements/energie/solaire/circulateuranti.elmt
@@ -1,5 +1,6 @@
-<definition width="60" version="0.22" hotspot_x="20" hotspot_y="20" height="40" type="element" orientation="dyyy">
+<definition width="60" version="0.3" hotspot_x="20" hotspot_y="20" height="40" type="element" orientation="dyyy">
     <names>
+        <name lang="en">valve circulator</name>
         <name lang="fr">circulateur_clapet</name>
         <name lang="cs">Klapka cirkulátoru</name>
     </names>
diff --git a/elements/energie/solaire/eau_sanitaire/circulateur_sanitaire.elmt b/elements/energie/solaire/eau_sanitaire/circulateur_sanitaire.elmt
index d0aab7157..52004de68 100644
--- a/elements/energie/solaire/eau_sanitaire/circulateur_sanitaire.elmt
+++ b/elements/energie/solaire/eau_sanitaire/circulateur_sanitaire.elmt
@@ -1,9 +1,10 @@
 <definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dyyy">
     <names>
-        <name lang="fr">circulateur sanitaire</name>
+        <name lang="en">Circulator health</name>
+        <name lang="fr">Circulateur sanitaire</name>
         <name lang="cs">Zdravotní cirkulátor</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="11" y2="0" x2="13"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-8" y2="0" x2="-13"/>
diff --git a/elements/energie/solaire/eau_sanitaire/cumuls_elec.elmt b/elements/energie/solaire/eau_sanitaire/cumuls_elec.elmt
index 8770d20d7..f54e6695b 100644
--- a/elements/energie/solaire/eau_sanitaire/cumuls_elec.elmt
+++ b/elements/energie/solaire/eau_sanitaire/cumuls_elec.elmt
@@ -1,9 +1,10 @@
 <definition width="60" version="0.3" hotspot_x="30" hotspot_y="50" height="100" type="element" orientation="ndny">
     <names>
-        <name lang="fr">ballon electrique ECS</name>
+        <name lang="en">Tank electrical ECS</name>
+        <name lang="fr">Ballon electrique ECS</name>
         <name lang="cs">Elektrický balón ECS</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
         <text x="15" y="14" size="6" rotation="-90" text="Ballon ECS"/>
         <line 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="-24" y2="0" x2="-19"/>
@@ -13,7 +14,7 @@
         <circle x="-17.25" y="43.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
         <circle x="-26.25" y="-1.25" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
         <circle x="14.75" y="43.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2.5"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="3" x2="-3" x3="3" x4="-3" antialias="true" x5="3" x6="-3" x7="3" x8="-3" x9="3" closed="false" y1="20" y10="34" y2="22" y11="35" y3="23" y4="25" y12="37" y5="26" x10="-3" y13="38" y6="28" x11="3" y14="40" y7="29" x12="-3" y15="41" y8="31" x13="3" y16="42" y9="32" x14="-3" y17="42" x15="3" x16="0" x17="0"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="3" x2="-3" x3="3" x4="-3" antialias="true" x5="3" x6="-3" x7="3" x8="-3" x9="3" closed="false" y1="20" y2="22" y10="34" y3="23" y11="35" y4="25" y12="37" y5="26" x10="-3" y13="38" y6="28" x11="3" y14="40" y7="29" x12="-3" y15="41" y8="31" x13="3" y16="42" y9="32" x14="-3" y17="42" x15="3" x16="0" x17="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="36" x1="-16" y2="45" x2="-16"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-40" x1="16" y2="44" x2="16"/>
         <arc width="50" x="-25" y="-46" antialias="true" height="12" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
diff --git a/elements/energie/solaire/eau_sanitaire/disconnecteur_sanitaire.elmt b/elements/energie/solaire/eau_sanitaire/disconnecteur_sanitaire.elmt
index 8861b02e0..86950a2c8 100644
--- a/elements/energie/solaire/eau_sanitaire/disconnecteur_sanitaire.elmt
+++ b/elements/energie/solaire/eau_sanitaire/disconnecteur_sanitaire.elmt
@@ -1,6 +1,7 @@
 <definition width="60" version="0.3" hotspot_x="30" hotspot_y="20" height="40" type="element" orientation="dyyy">
     <names>
-        <name lang="fr">disconnecteur</name>
+        <name lang="en">Backflow</name>
+        <name lang="fr">Disconnecteur</name>
         <name lang="cs">Odpojovač</name>
     </names>
     <informations></informations>
diff --git a/elements/energie/solaire/eau_sanitaire/douche.elmt b/elements/energie/solaire/eau_sanitaire/douche.elmt
index 74b4cc5b6..cfb6bf558 100644
--- a/elements/energie/solaire/eau_sanitaire/douche.elmt
+++ b/elements/energie/solaire/eau_sanitaire/douche.elmt
@@ -1,11 +1,12 @@
-<definition width="30" version="0.3" hotspot_x="15" hotspot_y="10" height="20" type="element" orientation="dyyy">
+<definition width="40" version="0.3" hotspot_x="15" hotspot_y="20" height="40" type="element" orientation="dyyy">
     <names>
-        <name lang="fr">douche</name>
+        <name lang="en">shower</name>
+        <name lang="fr">Douche</name>
         <name lang="cs">Sprcha</name>
     </names>
     <informations></informations>
     <description>
-        <text x="-2" y="-3" size="3" text="douche"/>
+        <input x="-5" y="0" size="3" rotate="true" text="douche"/>
         <polygon x4="-9" y5="8" x5="-9" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-2" x1="-1" y2="-3" x2="-2" y3="-3" x3="-9" y4="8"/>
         <polygon x4="-1" y5="6" x5="-1" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="-1" y2="-2" x2="8" y3="-2" x3="-1" y4="6"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="2" x1="5" y2="4" x2="7"/>
diff --git a/elements/energie/solaire/eau_sanitaire/eau_ville.elmt b/elements/energie/solaire/eau_sanitaire/eau_ville.elmt
index 4a4b72ffd..cac8d1f2f 100644
--- a/elements/energie/solaire/eau_sanitaire/eau_ville.elmt
+++ b/elements/energie/solaire/eau_sanitaire/eau_ville.elmt
@@ -1,11 +1,12 @@
 <definition width="30" version="0.3" hotspot_x="15" hotspot_y="10" height="20" type="element" orientation="dyyy">
     <names>
-        <name lang="fr">arrivée d'eau froide</name>
+        <name lang="en">Cold water supply</name>
+        <name lang="fr">Arrivée d'eau froide</name>
         <name lang="cs">Přívod studené vody</name>
     </names>
     <informations></informations>
     <description>
-        <polygon x4="1" y5="0" x5="1" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="1" y2="-7" x2="10" y3="7" x3="10" y4="0"/>
+        <polygon x4="1" y5="0" x5="1" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="0" x1="1" y2="-7" x2="10" y3="7" x3="10" y4="0"/>
         <text x="-7" y="7" size="5" text="E.F."/>
         <circle x="-6.5" y="-0.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="1"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="1" y2="0" x2="-6"/>
diff --git a/elements/energie/solaire/eau_sanitaire/ecs_robinet.elmt b/elements/energie/solaire/eau_sanitaire/ecs_robinet.elmt
index 12b59b775..07ec3eaab 100644
--- a/elements/energie/solaire/eau_sanitaire/ecs_robinet.elmt
+++ b/elements/energie/solaire/eau_sanitaire/ecs_robinet.elmt
@@ -1,5 +1,6 @@
 <definition width="20" version="0.3" hotspot_x="10" hotspot_y="10" height="20" type="element" orientation="dyyy">
     <names>
+        <name lang="en">ECS draw-off valve</name>
         <name lang="fr">robinet puisage ECS</name>
         <name lang="cs">Vodovodní kohoutek ECS</name>
     </names>
diff --git a/elements/energie/solaire/eau_sanitaire/mitigeur_thermostatique.elmt b/elements/energie/solaire/eau_sanitaire/mitigeur_thermostatique.elmt
index f572d566c..70c014eb2 100644
--- a/elements/energie/solaire/eau_sanitaire/mitigeur_thermostatique.elmt
+++ b/elements/energie/solaire/eau_sanitaire/mitigeur_thermostatique.elmt
@@ -1,6 +1,7 @@
 <definition width="40" version="0.3" hotspot_x="20" hotspot_y="20" height="40" type="element" orientation="dyyy">
     <names>
-        <name lang="fr">mitigeur thermostatique ECS</name>
+        <name lang="en">Thermostatic mixing valve ECS</name>
+        <name lang="fr">Mitigeur thermostatique ECS</name>
         <name lang="cs">Termostatický směšovač ECS</name>
     </names>
     <informations>Le mitigeur thermostatique posé en sortie de ballon permet de distribuer l'eau chaude sanitaire à une température constante.</informations>
diff --git a/elements/energie/solaire/eau_sanitaire/rechauffeur_ecs.elmt b/elements/energie/solaire/eau_sanitaire/rechauffeur_ecs.elmt
index 0d3782aaf..d0df7fdc9 100644
--- a/elements/energie/solaire/eau_sanitaire/rechauffeur_ecs.elmt
+++ b/elements/energie/solaire/eau_sanitaire/rechauffeur_ecs.elmt
@@ -1,15 +1,16 @@
 <definition width="60" version="0.3" hotspot_x="30" hotspot_y="35" height="70" type="element" orientation="ndny">
     <names>
+        <name lang="en">ECS heater</name>
         <name lang="fr">Réchauffeur ECS</name>
         <name lang="cs">Ohřívač ECS</name>
     </names>
     <informations></informations>
     <description>
-        <text x="17" y="20" size="4" rotation="-90" text="réchauffeur ecs"/>
+        <input x="19" y="21" size="4" rotation="270" rotate="true" text="réchauffeur ecs"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-26" x1="-20" y2="25" x2="-20"/>
         <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-26" x1="20" y2="25" x2="20"/>
         <circle x="-21" y="-21" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" x2="10" x3="-10" x4="10" antialias="true" x5="-10" x6="10" x7="-10" x8="10" x9="-10" closed="false" y1="-20" y10="20" y2="-20" y11="20" y3="-15" y4="-10" y12="20" y5="-6" x10="10" y13="20" y6="0" x11="10" y7="5" x12="-20" y8="10" x13="-20" y9="15"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" x2="10" x3="-10" x4="10" antialias="true" x5="-10" x6="10" x7="-10" x8="10" x9="-10" closed="false" y1="-20" y2="-20" y10="20" y3="-15" y11="20" y4="-10" y12="20" y5="-6" x10="10" y13="20" y6="0" x11="10" y7="5" x12="-20" y8="10" x13="-20" y9="15"/>
         <arc width="40" x="-20" y="-30.5" antialias="true" height="8" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
         <circle x="19" y="22" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
         <circle x="-1" y="-31.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="2"/>
diff --git a/elements/energie/solaire/flexpression.elmt b/elements/energie/solaire/flexpression.elmt
index c26f952e3..66274237a 100644
--- a/elements/energie/solaire/flexpression.elmt
+++ b/elements/energie/solaire/flexpression.elmt
@@ -1,6 +1,7 @@
 <definition width="50" version="0.3" hotspot_x="25" hotspot_y="25" height="50" type="element" orientation="dnyn">
     <names>
-        <name lang="fr">flexcon</name>
+        <name lang="en">Flexcon</name>
+        <name lang="fr">Flexcon</name>
         <name lang="cs">Flexcon</name>
     </names>
     <informations></informations>
diff --git a/elements/energie/solaire/mano.elmt b/elements/energie/solaire/mano.elmt
index 584879f2b..d4a61ddfe 100644
--- a/elements/energie/solaire/mano.elmt
+++ b/elements/energie/solaire/mano.elmt
@@ -1,24 +1,25 @@
 <definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="40" type="element" orientation="dnnn">
     <names>
-        <name lang="fr">manometre</name>
+        <name lang="en">manometer</name>
+        <name lang="fr">Manometre</name>
         <name lang="cs">Manometr</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
     <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="-3" y2="2" x2="2"/>
+        <circle x="-8.60233" y="-8.60233" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="17.2047"/>
+        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="20"/>
         <polygon x4="1" y5="10" x5="1" y6="10" x6="1" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="10" x1="-1" y2="13" x2="-1" y3="13" x3="-1" y4="13"/>
         <text x="-4" y="6" size="4" text="bar"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="13" x1="0" y2="14" 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="-3" x1="-3" y2="-2" 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="-3" x1="-3" y2="0" x2="-2"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="-3" y2="2" x2="2"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="-3" y2="-2" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="-3" y2="0" x2="-2"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="6" y2="5" x2="5"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6" x1="-6" y2="5" x2="-5"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="6" y2="-5" x2="5"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="-6" y2="-5" x2="-5"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="0" y2="-7" x2="0"/>
-        <circle x="-8.60233" y="-8.60233" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="17.2047"/>
-        <circle x="-10" y="-10" antialias="true" style="line-style:normal;line-weight:thin;filling:none;color:black" diameter="20"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="7" y2="0" x2="8"/>
         <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0" x1="-8" y2="0" x2="-7"/>
         <terminal x="0" y="14" orientation="s"/>
diff --git a/elements/energie/solaire/purgeur.elmt b/elements/energie/solaire/purgeur.elmt
index 681519e04..a842c8d41 100644
--- a/elements/energie/solaire/purgeur.elmt
+++ b/elements/energie/solaire/purgeur.elmt
@@ -1,5 +1,6 @@
 <definition width="30" version="0.3" hotspot_x="15" hotspot_y="20" height="40" type="element" orientation="ndny">
     <names>
+        <name lang="en">Trap</name>
         <name lang="fr">purgeur</name>
         <name lang="cs">Čistič</name>
     </names>
diff --git a/elements/energie/solaire/raccords_cuivre/coude_90.elmt b/elements/energie/solaire/raccords_cuivre/coude_90.elmt
index 02f405805..c36cc9e0a 100644
--- a/elements/energie/solaire/raccords_cuivre/coude_90.elmt
+++ b/elements/energie/solaire/raccords_cuivre/coude_90.elmt
@@ -1,6 +1,7 @@
 <definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dyyy">
     <names>
-        <name lang="fr">coude à 90</name>
+        <name lang="en">Elbow at 90</name>
+        <name lang="fr">Coude à 90</name>
         <name lang="cs">Koleno 90</name>
     </names>
     <informations></informations>
diff --git a/elements/energie/solaire/raccords_cuivre/coude_90_grandrayon.elmt b/elements/energie/solaire/raccords_cuivre/coude_90_grandrayon.elmt
index e699729d2..cdf025894 100644
--- a/elements/energie/solaire/raccords_cuivre/coude_90_grandrayon.elmt
+++ b/elements/energie/solaire/raccords_cuivre/coude_90_grandrayon.elmt
@@ -1,5 +1,6 @@
 <definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dyyy">
     <names>
+        <name lang="en">Large radius elbow 90</name>
         <name lang="fr">Coude à 90 grand rayon</name>
         <name lang="cs">Koleno 90 velký obvod</name>
     </names>
diff --git a/elements/energie/solaire/raccords_cuivre/cumulus2.elmt b/elements/energie/solaire/raccords_cuivre/cumulus2.elmt
index 874339373..34bd2befb 100644
--- a/elements/energie/solaire/raccords_cuivre/cumulus2.elmt
+++ b/elements/energie/solaire/raccords_cuivre/cumulus2.elmt
@@ -1,20 +1,18 @@
-<definition width="30" version="0.22" hotspot_x="15" hotspot_y="35" height="70" type="element" orientation="dyyy">
+<definition width="40" version="0.3" hotspot_x="25" hotspot_y="35" height="70" type="element" orientation="dyyy">
     <names>
-        <name lang="fr">cumulus electrique</name>
+        <name lang="en">Electric cumulus</name>
+        <name lang="fr">Cumulus electrique</name>
         <name lang="cs">Elektrický mrak</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7.5" x1="-4.25" y2="-10.25" x2="4"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-7" x1="-4.5" y2="-4" x2="4.25"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="0.5" x1="-5" y2="-3.5" x2="4.75"/>
-        <line 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.75" x1="-4.75" y2="3.5" x2="3.75"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="6.5" x1="-4.5" y2="3.5" x2="5"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29.5" x1="-9.75" y2="9.25" x2="-9.75"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-29.75" x1="9.75" y2="9.25" x2="9.75"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="9.75" x1="-9.75" y2="9.75" x2="10"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30" x1="-9.5" y2="-30" x2="9.75"/>
-        <terminal x="0" y="-33.75" orientation="n"/>
-        <terminal x="0.25" y="-35" orientation="n"/>
+        <rect width="20" x="-15" y="-25" antialias="false" height="50" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6.5" x1="-9.25" y2="-9.25" x2="-1"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-6" x1="-9.5" y2="-3" x2="-0.75"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1.5" x1="-10" y2="-2.5" x2="-0.25"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="1.75" x1="-9.75" y2="4.5" x2="-1.25"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="7.5" x1="-10.5" y2="4.5" x2="-1"/>
+        <terminal x="-10" y="-30" orientation="n"/>
+        <terminal x="0" y="-30" orientation="n"/>
     </description>
 </definition>
diff --git a/elements/energie/solaire/raccords_cuivre/te_oblique.elmt b/elements/energie/solaire/raccords_cuivre/te_oblique.elmt
index 71f9f5942..4cf44d494 100644
--- a/elements/energie/solaire/raccords_cuivre/te_oblique.elmt
+++ b/elements/energie/solaire/raccords_cuivre/te_oblique.elmt
@@ -1,5 +1,6 @@
 <definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dyyy">
     <names>
+        <name lang="en">Ty crowbar</name>
         <name lang="fr">Té pied de biche</name>
         <name lang="cs">Té noha laně</name>
     </names>
diff --git a/elements/energie/solaire/signaletiques/fleche2.elmt b/elements/energie/solaire/signaletiques/fleche2.elmt
index e98d4dca2..b304d9d6d 100644
--- a/elements/energie/solaire/signaletiques/fleche2.elmt
+++ b/elements/energie/solaire/signaletiques/fleche2.elmt
@@ -5,6 +5,6 @@
     </names>
     <informations></informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-31" x1="10" y2="30" x2="-11"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-31" x1="10" y2="30" x2="-11"/>
     </description>
 </definition>
diff --git a/elements/energie/solaire/signaletiques/fleche3.elmt b/elements/energie/solaire/signaletiques/fleche3.elmt
index 8fed4b5eb..4ffaf626e 100644
--- a/elements/energie/solaire/signaletiques/fleche3.elmt
+++ b/elements/energie/solaire/signaletiques/fleche3.elmt
@@ -5,6 +5,6 @@
     </names>
     <informations></informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-31" x1="-11" y2="31" x2="10"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="triangle" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-31" x1="-11" y2="31" x2="10"/>
     </description>
 </definition>
diff --git a/elements/energie/solaire/signaletiques/flechedroite.elmt b/elements/energie/solaire/signaletiques/flechedroite.elmt
index 7ecd738e1..50fe3e6ac 100644
--- a/elements/energie/solaire/signaletiques/flechedroite.elmt
+++ b/elements/energie/solaire/signaletiques/flechedroite.elmt
@@ -3,10 +3,10 @@
         <name lang="fr">sens fluide</name>
         <name lang="cs">Šipka vpravo</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="1" y2="0" 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="-3" x1="1" y2="0" x2="14"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="3" x1="1" y2="0" x2="14"/>
+        <line length1="1.5" length2="1.5" antialias="true" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-3" x1="1" y2="0" 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="0" x1="-25" y2="0" x2="14"/>
     </description>
 </definition>
diff --git a/elements/energie/solaire/signaletiques/sens3voies.elmt b/elements/energie/solaire/signaletiques/sens3voies.elmt
index cd75e83b3..4fa609356 100644
--- a/elements/energie/solaire/signaletiques/sens3voies.elmt
+++ b/elements/energie/solaire/signaletiques/sens3voies.elmt
@@ -3,12 +3,12 @@
         <name lang="fr">signalétique V3voies</name>
         <name lang="cs">Popisující V3směry</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
         <polygon x4="6" y5="12" x5="3.5" y6="11" x6="3.5" y7="11" x7="3.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="12" x1="1" y2="12" x2="-1" y3="15" x3="2" y4="12"/>
-        <polygon x4="-14" y5="1" x5="-10" y6="1" x6="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-1" x1="-14" y2="-5" x2="-17" y3="5" x3="-17" y4="1"/>
+        <polygon x4="-14" y5="1" x5="-10" y6="1" x6="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-1" x1="-14" y2="-5" x2="-17" y3="5" x3="-17" y4="1"/>
         <arc width="22" x="-20.5" y="1" antialias="true" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black" start="90" angle="-90"/>
         <arc width="18" x="-14.5" y="0" antialias="true" height="22" style="line-style:normal;line-weight:normal;filling:none;color:black" start="65" angle="-65"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-14" x2="11" x3="11" x4="19" antialias="false" x5="11" x6="11" x7="-2" x8="-1" closed="false" y1="-1" y2="-1" y3="-5" y4="0" y5="5" y6="1" y7="1" y8="1"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-14" x2="11" x3="11" x4="19" antialias="true" x5="11" x6="11" x7="-2" x8="-1" closed="false" y1="-1" y2="-1" y3="-5" y4="0" y5="5" y6="1" y7="1" y8="1"/>
     </description>
 </definition>
diff --git a/elements/energie/solaire/vanne/clap_anti-retour_simple.elmt b/elements/energie/solaire/vanne/clap_anti-retour_simple.elmt
index b4d0cabc9..16c617753 100644
--- a/elements/energie/solaire/vanne/clap_anti-retour_simple.elmt
+++ b/elements/energie/solaire/vanne/clap_anti-retour_simple.elmt
@@ -1,5 +1,6 @@
 <definition width="20" version="0.3" hotspot_x="10" hotspot_y="10" height="20" type="element" orientation="dyyy">
     <names>
+        <name lang="en">Simple check valve</name>
         <name lang="fr">Clapet anti-retour simple</name>
         <name lang="cs">Jednoduchá klapka proti navrácení</name>
     </names>
diff --git a/elements/energie/solaire/vanne/clap_antiretour_bille.elmt b/elements/energie/solaire/vanne/clap_antiretour_bille.elmt
index 5510f3fe0..e56b35d27 100644
--- a/elements/energie/solaire/vanne/clap_antiretour_bille.elmt
+++ b/elements/energie/solaire/vanne/clap_antiretour_bille.elmt
@@ -1,5 +1,6 @@
 <definition width="20" version="0.3" hotspot_x="10" hotspot_y="10" height="20" type="element" orientation="dyyy">
     <names>
+        <name lang="en">Check valve ball</name>
         <name lang="fr">clapet anti-retour à bille</name>
         <name lang="cs">Kuličková klapka proti navrácení</name>
     </names>
diff --git a/elements/energie/solaire/vanne/clapet_pompe.elmt b/elements/energie/solaire/vanne/clapet_pompe.elmt
index 4db2241a0..9eabf0c42 100644
--- a/elements/energie/solaire/vanne/clapet_pompe.elmt
+++ b/elements/energie/solaire/vanne/clapet_pompe.elmt
@@ -1,6 +1,7 @@
 <definition width="20" version="0.3" hotspot_x="10" hotspot_y="10" height="20" type="element" orientation="dyyy">
     <names>
-        <name lang="fr">clapet pompe</name>
+        <name lang="en">Valve pump</name>
+        <name lang="fr">Clapet pompe</name>
         <name lang="cs">Čerpadlová klapka</name>
     </names>
     <informations></informations>
diff --git a/elements/energie/solaire/vanne/soupape-diff.elmt b/elements/energie/solaire/vanne/soupape-diff.elmt
index a9f466de8..d5e655e72 100644
--- a/elements/energie/solaire/vanne/soupape-diff.elmt
+++ b/elements/energie/solaire/vanne/soupape-diff.elmt
@@ -1,6 +1,7 @@
 <definition width="40" version="0.3" hotspot_x="20" hotspot_y="35" height="60" type="element" orientation="ndny">
     <names>
-        <name lang="fr">soupape diferentielle</name>
+        <name lang="en">differential valve</name>
+        <name lang="fr">Soupape différentielle</name>
         <name lang="cs">Rozdílový ventil</name>
     </names>
     <informations>ne pas confondre 
@@ -10,8 +11,8 @@ et
 vanne de maintien de pression différentielle 
 ( maintien une pression diff. )</informations>
     <description>
-        <input x="-20" y="-23.3333" size="3" text="soupape&#xa;différentielle"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="0" x3="-3" x4="3" antialias="true" x5="-3" x6="3" x7="-3" x8="3" x9="0" closed="false" y1="0" y10="-17" y2="-4" y11="-17" y3="-6" y4="-8" y12="-17" y5="-9" x10="0" y6="-11" x11="0" y7="-12" x12="0" y8="-14" y9="-15"/>
+        <input x="-20" y="-23.3333" size="3" rotate="true" text="soupape&#xa;différentielle"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="0" x3="-3" x4="3" antialias="true" x5="-3" x6="3" x7="-3" x8="3" x9="0" closed="false" y1="0" y2="-4" y10="-17" y3="-6" y11="-17" y4="-8" y12="-17" y5="-9" x10="0" y6="-11" x11="0" y7="-12" x12="0" y8="-14" y9="-15"/>
         <polygon x4="-10" y5="15" x5="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="15" x2="10" y3="0" x3="0" y4="15"/>
         <polygon x4="-15" y5="-10" x5="-15" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-15" y2="10" x2="-15" y3="0" x3="0" y4="-10"/>
         <terminal x="-15" y="0" orientation="w"/>
diff --git a/elements/energie/solaire/vanne/vanne-arret.elmt b/elements/energie/solaire/vanne/vanne-arret.elmt
index 0b47ca6ad..8440b9c58 100644
--- a/elements/energie/solaire/vanne/vanne-arret.elmt
+++ b/elements/energie/solaire/vanne/vanne-arret.elmt
@@ -1,6 +1,7 @@
 <definition width="30" version="0.3" hotspot_x="15" hotspot_y="15" height="30" type="element" orientation="dyyy">
     <names>
-        <name lang="fr">vanne d'arret, d'isolement</name>
+        <name lang="en">Stop valve, isolation</name>
+        <name lang="fr">Vanne d'arret, d'isolement</name>
         <name lang="cs">Uzavírací šoupátko, izolace</name>
     </names>
     <informations></informations>
diff --git a/elements/energie/solaire/vanne/vanne2.elmt b/elements/energie/solaire/vanne/vanne2.elmt
index 7eb223aa3..d48e795a9 100644
--- a/elements/energie/solaire/vanne/vanne2.elmt
+++ b/elements/energie/solaire/vanne/vanne2.elmt
@@ -1,9 +1,10 @@
 <definition width="40" version="0.3" hotspot_x="20" hotspot_y="40" height="60" type="element" orientation="dyyy">
     <names>
-        <name lang="fr">vanne 2 voies</name>
+        <name lang="en">2-way valve</name>
+        <name lang="fr">Vanne 2 voies</name>
         <name lang="cs">Dvousměrné hradítko</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
         <rect width="20" x="-10" y="-31" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <text x="-5" y="-19" size="6" text="V1"/>
diff --git a/elements/energie/solaire/vanne/vanne3.elmt b/elements/energie/solaire/vanne/vanne3.elmt
index c76a28aec..bc61f355c 100644
--- a/elements/energie/solaire/vanne/vanne3.elmt
+++ b/elements/energie/solaire/vanne/vanne3.elmt
@@ -1,9 +1,10 @@
 <definition width="40" version="0.3" hotspot_x="20" hotspot_y="40" height="60" type="element" orientation="dyyy">
     <names>
-        <name lang="fr">vanne 3 voies</name>
+        <name lang="en">3-way valve</name>
+        <name lang="fr">Vanne 3 voies</name>
         <name lang="cs">Třísměrné hradítko</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
         <rect width="20" x="-10" y="-31" antialias="false" height="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
         <input x="-5" y="-16.3333" size="6" rotate="true" text="V1"/>
diff --git a/elements/energie/solaire/vanne/vanne_diferentielle.elmt b/elements/energie/solaire/vanne/vanne_diferentielle.elmt
index 0cd38fed7..c69098cb9 100644
--- a/elements/energie/solaire/vanne/vanne_diferentielle.elmt
+++ b/elements/energie/solaire/vanne/vanne_diferentielle.elmt
@@ -1,12 +1,13 @@
 <definition width="40" version="0.3" hotspot_x="20" hotspot_y="35" height="60" type="element" orientation="ndny">
     <names>
-        <name lang="fr">vanne diferentielle</name>
+        <name lang="en">Differential valve</name>
+        <name lang="fr">Vanne différentielle</name>
         <name lang="cs">Rozdílové hradítko</name>
     </names>
-    <informations/>
+    <informations></informations>
     <description>
-        <input x="-19" y="-23" size="3" text="vanne pression&#xa;différentielle"/>
-        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="0" x3="-3" x4="3" antialias="true" x5="-3" x6="3" x7="-3" x8="3" x9="0" closed="false" y1="0" y10="-17" y2="-4" y11="-17" y3="-6" y4="-8" y12="-17" y5="-9" x10="0" y6="-11" x11="0" y7="-12" x12="0" y8="-14" y9="-15"/>
+        <input x="-19" y="-23" size="3" rotate="true" text="vanne pression&#xa;différentielle"/>
+        <polygon style="line-style:normal;line-weight:normal;filling:none;color:black" x1="0" x2="0" x3="-3" x4="3" antialias="true" x5="-3" x6="3" x7="-3" x8="3" x9="0" closed="false" y1="0" y2="-4" y10="-17" y3="-6" y11="-17" y4="-8" y12="-17" y5="-9" x10="0" y6="-11" x11="0" y7="-12" x12="0" y8="-14" y9="-15"/>
         <polygon x4="-10" y5="15" x5="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="15" x1="-10" y2="15" x2="10" y3="0" x3="0" y4="15"/>
         <polygon x4="-15" y5="-10" x5="-15" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-10" x1="-15" y2="10" x2="-15" y3="0" x3="0" y4="-10"/>
         <terminal x="-15" y="0" orientation="w"/>
diff --git a/elements/energie/solaire/vidange.elmt b/elements/energie/solaire/vidange.elmt
index cc693a308..ac42d5327 100644
--- a/elements/energie/solaire/vidange.elmt
+++ b/elements/energie/solaire/vidange.elmt
@@ -1,6 +1,7 @@
-<definition width="40" version="0.22" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dnnn">
+<definition width="40" version="0.3" hotspot_x="20" hotspot_y="25" height="50" type="element" orientation="dnnn">
     <names>
-        <name lang="fr">vidange égout</name>
+        <name lang="en">Emptying</name>
+        <name lang="fr">Vidange égout</name>
         <name lang="cs">Odtok</name>
     </names>
     <informations></informations>
diff --git a/elements/haute_tension/disj_debrochable_dm1-z.elmt b/elements/haute_tension/disj_debrochable_dm1-z.elmt
index 41cd3be5e..ebc46a0aa 100644
--- a/elements/haute_tension/disj_debrochable_dm1-z.elmt
+++ b/elements/haute_tension/disj_debrochable_dm1-z.elmt
@@ -2,7 +2,6 @@
     <names>
         <name lang="fr">Disjoncteur debrochable DM1-Z</name>
         <name lang="pl">Wyłącznik wysuwny DM1-Z</name>
-        <name lang="cs">Výsuvný spínač DM1-Z</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
diff --git a/elements/haute_tension/disjoncteur_dm1-a.elmt b/elements/haute_tension/disjoncteur_dm1-a.elmt
index 4d3e467da..c5c6bb31e 100644
--- a/elements/haute_tension/disjoncteur_dm1-a.elmt
+++ b/elements/haute_tension/disjoncteur_dm1-a.elmt
@@ -3,7 +3,6 @@
         <name lang="en">Breaker DM1-A</name>
         <name lang="fr">Disjoncteur DM1-A</name>
         <name lang="pl">Wyłącznik DM1-A</name>
-        <name lang="cs">Jistič DM1-A</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
diff --git a/elements/haute_tension/disjoncteur_dm1-d.elmt b/elements/haute_tension/disjoncteur_dm1-d.elmt
index ba838f119..67b552c44 100644
--- a/elements/haute_tension/disjoncteur_dm1-d.elmt
+++ b/elements/haute_tension/disjoncteur_dm1-d.elmt
@@ -3,7 +3,6 @@
         <name lang="en">Breaker DM1-D</name>
         <name lang="fr">Disjoncteur DM1-D</name>
         <name lang="pl">Wyłącznik DM1-D</name>
-        <name lang="cs">Jistič DM1-D</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
diff --git a/elements/haute_tension/disjoncteur_dm2.elmt b/elements/haute_tension/disjoncteur_dm2.elmt
index 4ac45a661..aacf7ac83 100644
--- a/elements/haute_tension/disjoncteur_dm2.elmt
+++ b/elements/haute_tension/disjoncteur_dm2.elmt
@@ -3,7 +3,6 @@
         <name lang="en">Breaker DM2</name>
         <name lang="fr">Disjoncteur DM2</name>
         <name lang="pl">Wyłącznik DM2</name>
-        <name lang="cs">Jistič DM2</name>
     </names>
     <informations>Author: The QElectroTech team
 License: see http://qelectrotech.org/wiki/doc/elements_license</informations>