diff --git a/elements/bornes/gniazdo.elmt b/elements/bornes/gniazdo.elmt
deleted file mode 100644
index 8e2623198..000000000
--- a/elements/bornes/gniazdo.elmt
+++ /dev/null
@@ -1,12 +0,0 @@
-<definition width="30" version="0.22" hotspot_x="15" hotspot_y="20" height="30" type="element" orientation="dyyy">
-    <names>
-        <name lang="pl">Gniazdo</name>
-    </names>
-    <informations>EN 60617: 03-03-01</informations>
-    <description>
-        <input x="1" y="-3" size="8" rotate="true" text="_"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-1" x1="0" y2="-10" x2="0"/>
-        <arc width="6" x="-3" y="0" antialias="true" height="6" style="line-style:normal;line-weight:normal;filling:none;color:black" start="-180" angle="-180"/>
-        <terminal x="0" y="-10" orientation="n"/>
-    </description>
-</definition>
diff --git a/elements/bornes/wtyk.elmt b/elements/bornes/wtyk.elmt
deleted file mode 100644
index bee23ad02..000000000
--- a/elements/bornes/wtyk.elmt
+++ /dev/null
@@ -1,13 +0,0 @@
-<definition width="40" version="0.22" hotspot_x="15" hotspot_y="20" height="40" type="element" orientation="dyyy">
-    <names>
-        <name lang="pl">Wtyk</name>
-    </names>
-    <informations>EN 60617: 03-03-03</informations>
-    <description>
-        <input x="1" y="2" size="8" rotate="true" text="_"/>
-        <line 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="-1" y2="-1" x2="-1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-8" x1="0" y2="10" 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="-8" x1="1" y2="-1" x2="1"/>
-        <terminal x="0" y="10" orientation="s"/>
-    </description>
-</definition>
diff --git a/elements/bornes/zacisk.elmt b/elements/bornes/zacisk.elmt
deleted file mode 100644
index 2a5c340f2..000000000
--- a/elements/bornes/zacisk.elmt
+++ /dev/null
@@ -1,12 +0,0 @@
-<definition width="30" version="0.22" hotspot_x="10" hotspot_y="20" height="40" type="element" ic="true" orientation="dyyy">
-    <names>
-        <name lang="pl">Zacisk</name>
-    </names>
-    <informations>EN 60617: 03-02-02</informations>
-    <description>
-        <input x="3" y="0.333333" size="5" text="_"/>
-        <circle x="-2.5" y="-2.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="5"/>
-        <terminal x="0" y="3" orientation="s"/>
-        <terminal x="0" y="-3" orientation="n"/>
-    </description>
-</definition>
diff --git a/elements/domestiques/domofon.elmt b/elements/domestiques/domofon.elmt
index 20029746c..62e67ca80 100644
--- a/elements/domestiques/domofon.elmt
+++ b/elements/domestiques/domofon.elmt
@@ -1,7 +1,7 @@
 <definition width="50" version="0.3" hotspot_x="15" hotspot_y="30" height="40" type="element" orientation="dyyy">
     <names>
-        <name lang="en">interphon</name>
-        <name lang="fr">intercom</name>
+        <name lang="en">intercom</name>
+        <name lang="fr">interphone</name>
         <name lang="pl">Domofon</name>
     </names>
     <informations>EN 60617: 11-16-05</informations>
diff --git a/elements/domestiques/lacznik_dwubiegunowy.elmt b/elements/domestiques/lacznik_dwubiegunowy.elmt
index 884d94d65..c02994cfa 100644
--- a/elements/domestiques/lacznik_dwubiegunowy.elmt
+++ b/elements/domestiques/lacznik_dwubiegunowy.elmt
@@ -1,6 +1,8 @@
 <definition width="30" version="0.3" hotspot_x="10" hotspot_y="15" height="30" type="element" orientation="dyyy">
     <names>
         <name lang="de">Schalter, zweipolig
+</name>
+        <name lang="fr">Interrupteur, bipolaire
 </name>
         <name lang="pl">Łącznik dwubiegunowy</name>
     </names>
diff --git a/elements/domestiques/lacznik_pociagany.elmt b/elements/domestiques/lacznik_pociagany.elmt
index a4ab58322..92742ce93 100644
--- a/elements/domestiques/lacznik_pociagany.elmt
+++ b/elements/domestiques/lacznik_pociagany.elmt
@@ -2,8 +2,7 @@
     <names>
         <name lang="de">Schalter mit Zugschnur
 </name>
-        <name lang="fr">Interrupteur gradateur
-Interrupteur unipolaire à tirette
+        <name lang="fr">Interrupteur unipolaire à tirette
 </name>
         <name lang="pl">Łącznik pociągany</name>
     </names>
diff --git a/elements/domestiques/licznik_watogodzin.elmt b/elements/domestiques/licznik_watogodzin.elmt
index 4743f3463..a556ea9f0 100644
--- a/elements/domestiques/licznik_watogodzin.elmt
+++ b/elements/domestiques/licznik_watogodzin.elmt
@@ -1,14 +1,20 @@
-<definition width="50" version="0.22" hotspot_x="15" hotspot_y="5" height="60" type="element" orientation="dyyy">
-    <names>
-        <name lang="pl">Licznik watogodzin</name>
-    </names>
-    <informations>EN 60617: 08-04-03
-</informations>
-    <description>
-        <rect width="32" x="-6" y="0" antialias="false" height="50" 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="14" x1="-6" y2="14" x2="26"/>
-        <text x="0" y="35" size="10" text="Wh"/>
-        <terminal x="0" y="50" orientation="s"/>
-        <terminal x="20" y="50" orientation="s"/>
-    </description>
-</definition>
+<definition width="50" version="0.3" hotspot_x="15" hotspot_y="5" height="60" type="element" orientation="dyyy">
+    <names>
+        <name lang="de">Wattstundenzähler,
+Elektrizitätszähler
+</name>
+        <name lang="fr">Compteur d'énergie active
+Wattheuremètre
+</name>
+        <name lang="pl">Licznik watogodzin</name>
+    </names>
+    <informations>EN 60617: 08-04-03&#xd;
+</informations>
+    <description>
+        <rect width="32" x="-6" y="0" antialias="false" height="50" 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="14" x1="-6" y2="14" x2="26"/>
+        <text x="0" y="35" size="10" text="Wh"/>
+        <terminal x="0" y="50" orientation="s"/>
+        <terminal x="20" y="50" orientation="s"/>
+    </description>
+</definition>
diff --git a/elements/domestiques/rozdzielnica_2_4.elmt b/elements/domestiques/rozdzielnica_2_4.elmt
index 71a93c669..381eaa5ef 100644
--- a/elements/domestiques/rozdzielnica_2_4.elmt
+++ b/elements/domestiques/rozdzielnica_2_4.elmt
@@ -1,23 +1,23 @@
-<definition width="40" version="0.22" hotspot_x="15" hotspot_y="35" height="90" type="element" orientation="dyyy">
-    <names>
-        <name lang="en">Assembly</name>
-        <name lang="fr">ensemble</name>
-        <name lang="pl">Rozdzielnica (4 obwody)</name>
-    </names>
-    <informations></informations>
-    <description>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="-1" y2="45" x2="-1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="1" y2="45" x2="1"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="0" y2="45" x2="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-10" y2="10" 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="40" x1="0" y2="40" 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="20" x1="0" y2="20" 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="0" x1="0" y2="0" 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="-20" x1="0" y2="-20" x2="10"/>
-        <terminal x="10" y="20" orientation="e"/>
-        <terminal x="10" y="0" orientation="e"/>
-        <terminal x="10" y="-20" orientation="e"/>
-        <terminal x="-10" y="10" orientation="w"/>
-        <terminal x="10" y="40" orientation="e"/>
-    </description>
-</definition>
+<definition width="40" version="0.3" hotspot_x="15" hotspot_y="35" height="90" type="element" orientation="dyyy">
+    <names>
+        <name lang="en">Assembly</name>
+        <name lang="fr">Coffret de repartition</name>
+        <name lang="pl">Rozdzielnica (4 obwody)</name>
+    </names>
+    <informations></informations>
+    <description>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="-1" y2="45" x2="-1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="1" y2="45" x2="1"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-25" x1="0" y2="45" x2="0"/>
+        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="10" x1="-10" y2="10" 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="40" x1="0" y2="40" 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="20" x1="0" y2="20" 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="0" x1="0" y2="0" 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="-20" x1="0" y2="-20" x2="10"/>
+        <terminal x="10" y="20" orientation="e"/>
+        <terminal x="10" y="0" orientation="e"/>
+        <terminal x="10" y="-20" orientation="e"/>
+        <terminal x="-10" y="10" orientation="w"/>
+        <terminal x="10" y="40" orientation="e"/>
+    </description>
+</definition>