Remove the use of single application

2025-12-20 08:10:52 +01:00 · 2021-03-03 21:43:01 +01:00
163 changed files with 1587 additions and 7564 deletions
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/common/pinball_em_williams_ground.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/common/pinball_em_williams_ground.elmt
@@ -1,16 +0,0 @@
 <definition height="30" version="0.70" orientation="dyyy" width="20" hotspot_x="10" link_type="simple" type="element" hotspot_y="17">
    <uuid uuid="{ff754778-ac11-493d-828a-5f763560b02e}"/>
    <names>
        <name lang="en">Ground</name>
        <name lang="nl">Aarde</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <line end1="none" length1="1.5" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="-10" antialias="false" x1="0" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="7" style="line-style:normal;line-weight:hight;filling:none;color:black" y2="0" y1="0" antialias="false" x1="-7" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-5" style="line-style:normal;line-weight:hight;filling:none;color:black" y2="4" y1="4" antialias="false" x1="5" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="3" style="line-style:normal;line-weight:hight;filling:none;color:black" y2="8" y1="8" antialias="false" x1="-3" end2="none" length2="1.5"/>
        <terminal y="-10" orientation="n" x="0"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/common/pinball_em_williams_not_connected_east.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/common/pinball_em_williams_not_connected_east.elmt
@@ -1,15 +0,0 @@
 <definition height="20" version="0.70" orientation="dyyy" width="30" hotspot_x="11" link_type="simple" type="element" hotspot_y="10">
    <uuid uuid="{4f47811e-036e-4ef0-a846-b656f51ca81e}"/>
    <names>
        <name lang="en">Not connected (east)</name>
        <name lang="nl">Niet verbonden (oost)</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <line end1="none" length1="1.5" x2="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="0" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="5" y1="-5" antialias="false" x1="-5" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-5" y1="5" antialias="false" x1="-5" end2="none" length2="1.5"/>
        <terminal y="0" orientation="e" x="10"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/common/pinball_em_williams_not_connected_north.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/common/pinball_em_williams_not_connected_north.elmt
@@ -1,15 +0,0 @@
 <definition height="30" version="0.70" orientation="dyyy" width="20" hotspot_x="10" link_type="simple" type="element" hotspot_y="18">
    <uuid uuid="{e446ec4b-827d-4df3-bed0-dd4adbd2b62a}"/>
    <names>
        <name lang="en">Not connected (north)</name>
        <name lang="nl">Niet verbonden (noord)</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <line end1="none" length1="1.5" x2="6" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="6" y1="-6" antialias="false" x1="-6" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-6" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="6" y1="-6" antialias="false" x1="6" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10" y1="0" antialias="false" x1="0" end2="none" length2="1.5"/>
        <terminal y="-10" orientation="n" x="0"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/common/pinball_em_williams_not_connected_south.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/common/pinball_em_williams_not_connected_south.elmt
@@ -1,15 +0,0 @@
 <definition height="30" version="0.70" orientation="dyyy" width="20" hotspot_x="10" link_type="simple" type="element" hotspot_y="11">
    <uuid uuid="{e16cfe95-6fbc-49a0-97ee-1c0991324964}"/>
    <names>
        <name lang="en">Not connected (south)</name>
        <name lang="nl">Niet verbonden (zuid)</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <line end1="none" length1="1.5" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="10" antialias="false" x1="0" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-5" y1="5" antialias="false" x1="-5" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-5" y1="5" antialias="false" x1="5" end2="none" length2="1.5"/>
        <terminal y="10" orientation="s" x="0"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/common/pinball_em_williams_not_connected_west.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/common/pinball_em_williams_not_connected_west.elmt
@@ -1,15 +0,0 @@
 <definition height="20" version="0.70" orientation="dyyy" width="30" hotspot_x="18" link_type="simple" type="element" hotspot_y="10">
    <uuid uuid="{b6b35ed3-cbaa-43b0-a5b2-6120925de98e}"/>
    <names>
        <name lang="en">Not connected (west)</name>
        <name lang="nl">Niet verbonden (west)</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="0" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="5" y1="-5" antialias="false" x1="-5" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-5" y1="5" antialias="false" x1="-5" end2="none" length2="1.5"/>
        <terminal y="0" orientation="w" x="-10"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/common/qet_directory
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/common/qet_directory
@@ -1,6 +0,0 @@
 <qet-directory>
    <names>
        <name lang="en">Common</name>
        <name lang="nl">Algemeen</name>
    </names>
 </qet-directory>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_02.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_02.elmt
@@ -1,20 +0,0 @@
 <definition height="50" version="0.70" orientation="dyyy" width="50" hotspot_x="24" link_type="simple" type="element" hotspot_y="15">
    <uuid uuid="{48d90cab-e93d-4460-a1c8-4945e69144bf}"/>
    <names>
        <name lang="en">Jack with 2 positions</name>
        <name lang="nl">Contact met 2 posities</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect y="-10" height="40" width="20" rx="0" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x="-10" ry="0"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-11" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" y1="20" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" y1="20" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="20" end2="none" length2="1.5"/>
        <terminal y="0" orientation="e" x="20"/>
        <terminal y="0" orientation="w" x="-20"/>
        <terminal y="20" orientation="e" x="20"/>
        <terminal y="20" orientation="w" x="-20"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_03.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_03.elmt
@@ -1,24 +0,0 @@
 <definition height="70" version="0.70" orientation="dyyy" width="50" hotspot_x="24" link_type="simple" type="element" hotspot_y="15">
    <uuid uuid="{1e0d2098-80e3-4f87-a1a4-8979da3035e3}"/>
    <names>
        <name lang="en">Jack with 3 positions</name>
        <name lang="nl">Contact met 3 posities</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect y="-10" height="60" width="20" rx="0" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x="-10" ry="0"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" y1="20" antialias="false" x1="20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="40" y1="40" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="40" y1="40" antialias="false" x1="-10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" y1="20" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <terminal y="40" orientation="w" x="-20"/>
        <terminal y="40" orientation="e" x="20"/>
        <terminal y="0" orientation="w" x="-20"/>
        <terminal y="20" orientation="w" x="-20"/>
        <terminal y="20" orientation="e" x="20"/>
        <terminal y="0" orientation="e" x="20"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_04.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_04.elmt
@@ -1,28 +0,0 @@
 <definition height="90" version="0.70" orientation="dyyy" width="50" hotspot_x="24" link_type="simple" type="element" hotspot_y="15">
    <uuid uuid="{88b316e4-9fd7-4b89-af9e-3a70b840603b}"/>
    <names>
        <name lang="en">Jack with 4 positions</name>
        <name lang="nl">Contact met 4 posities</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect y="-10" height="80" width="20" rx="0" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x="-10" ry="0"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" y1="20" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="40" y1="40" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="60" y1="60" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="60" y1="60" antialias="false" x1="-10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="40" y1="40" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" y1="20" antialias="false" x1="-10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <terminal y="20" orientation="w" x="-20"/>
        <terminal y="0" orientation="w" x="-20"/>
        <terminal y="60" orientation="w" x="-20"/>
        <terminal y="20" orientation="e" x="20"/>
        <terminal y="40" orientation="e" x="20"/>
        <terminal y="60" orientation="e" x="20"/>
        <terminal y="0" orientation="e" x="20"/>
        <terminal y="40" orientation="w" x="-20"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_05.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_05.elmt
@@ -1,32 +0,0 @@
 <definition type="element" width="50" orientation="dyyy" hotspot_x="24" hotspot_y="15" version="0.70" link_type="simple" height="110">
    <uuid uuid="{3398a8e0-2b95-4231-8820-ad19908d197a}"/>
    <names>
        <name lang="en">Jack with 5 positions</name>
        <name lang="nl">Contact met 5 posities</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect width="20" rx="0" x="-10" y="-10" ry="0" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" height="100"/>
        <line length2="1.5" y2="0" end1="none" x1="-20" y1="0" length1="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-10"/>
        <line length2="1.5" y2="20" end1="none" x1="-20" y1="20" length1="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-10"/>
        <line length2="1.5" y2="40" end1="none" x1="-20" y1="40" length1="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-10"/>
        <line length2="1.5" y2="60" end1="none" x1="-20" y1="60" length1="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-10"/>
        <line length2="1.5" y2="80" end1="none" x1="-20" y1="80" length1="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="-10"/>
        <line length2="1.5" y2="80" end1="none" x1="20" y1="80" length1="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="10"/>
        <line length2="1.5" y2="60" end1="none" x1="10" y1="60" length1="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="20"/>
        <line length2="1.5" y2="40" end1="none" x1="10" y1="40" length1="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="20"/>
        <line length2="1.5" y2="20" end1="none" x1="10" y1="20" length1="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="20"/>
        <line length2="1.5" y2="0" end1="none" x1="10" y1="0" length1="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x2="20"/>
        <terminal x="-20" y="60" orientation="w"/>
        <terminal x="-20" y="40" orientation="w"/>
        <terminal x="-20" y="20" orientation="w"/>
        <terminal x="20" y="20" orientation="e"/>
        <terminal x="20" y="0" orientation="e"/>
        <terminal x="20" y="40" orientation="e"/>
        <terminal x="-20" y="80" orientation="w"/>
        <terminal x="-20" y="0" orientation="w"/>
        <terminal x="20" y="60" orientation="e"/>
        <terminal x="20" y="80" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_06.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_06.elmt
@@ -1,36 +0,0 @@
 <definition height="130" version="0.70" orientation="dyyy" width="50" hotspot_x="24" link_type="simple" type="element" hotspot_y="15">
    <uuid uuid="{8cdb64a3-1edc-4ac6-9e86-67c987e62457}"/>
    <names>
        <name lang="en">Jack with 6 positions</name>
        <name lang="nl">Contact met 6 posities</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="80" y1="80" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="60" y1="60" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="40" y1="40" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" y1="20" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="100" y1="100" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <rect y="-10" height="120" width="20" rx="0" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x="-10" ry="0"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="60" y1="60" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="40" y1="40" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" y1="20" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="100" y1="100" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="80" y1="80" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="10" end2="none" length2="1.5"/>
        <terminal y="0" orientation="e" x="20"/>
        <terminal y="0" orientation="w" x="-20"/>
        <terminal y="20" orientation="w" x="-20"/>
        <terminal y="20" orientation="e" x="20"/>
        <terminal y="40" orientation="w" x="-20"/>
        <terminal y="40" orientation="e" x="20"/>
        <terminal y="60" orientation="e" x="20"/>
        <terminal y="60" orientation="w" x="-20"/>
        <terminal y="100" orientation="w" x="-20"/>
        <terminal y="100" orientation="e" x="20"/>
        <terminal y="80" orientation="e" x="20"/>
        <terminal y="80" orientation="w" x="-20"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_07.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_07.elmt
@@ -1,40 +0,0 @@
 <definition height="150" version="0.70" orientation="dyyy" width="50" hotspot_x="24" link_type="simple" type="element" hotspot_y="15">
    <uuid uuid="{b95190d3-569c-4d29-9c08-eb63190954ef}"/>
    <names>
        <name lang="en">Jack with 7 positions</name>
        <name lang="nl">Contact met 7 posities</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="100" y1="100" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <rect y="-10" height="140" width="20" rx="0" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x="-10" ry="0"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" y1="20" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="60" y1="60" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="80" y1="80" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="40" y1="40" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="120" y1="120" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="60" y1="60" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="80" y1="80" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="40" y1="40" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" y1="20" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="100" y1="100" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="120" y1="120" antialias="false" x1="10" end2="none" length2="1.5"/>
        <terminal y="100" orientation="w" x="-20"/>
        <terminal y="100" orientation="e" x="20"/>
        <terminal y="120" orientation="e" x="20"/>
        <terminal y="120" orientation="w" x="-20"/>
        <terminal y="20" orientation="e" x="20"/>
        <terminal y="20" orientation="w" x="-20"/>
        <terminal y="0" orientation="e" x="20"/>
        <terminal y="0" orientation="w" x="-20"/>
        <terminal y="40" orientation="e" x="20"/>
        <terminal y="40" orientation="w" x="-20"/>
        <terminal y="60" orientation="e" x="20"/>
        <terminal y="60" orientation="w" x="-20"/>
        <terminal y="80" orientation="e" x="20"/>
        <terminal y="80" orientation="w" x="-20"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_08.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_08.elmt
@@ -1,44 +0,0 @@
 <definition height="170" version="0.70" orientation="dyyy" width="50" hotspot_x="24" link_type="simple" type="element" hotspot_y="15">
    <uuid uuid="{aa0c2db1-cd6d-470e-a45f-1503fd898c7d}"/>
    <names>
        <name lang="en">Jack with 8 positions</name>
        <name lang="nl">Contact met 8 posities</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect y="-10" height="160" width="20" rx="0" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x="-10" ry="0"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="80" y1="80" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="60" y1="60" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" y1="20" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="40" y1="40" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="100" y1="100" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="120" y1="120" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="140" y1="140" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="140" y1="140" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="120" y1="120" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" y1="20" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="40" y1="40" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="80" y1="80" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="60" y1="60" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="100" y1="100" antialias="false" x1="10" end2="none" length2="1.5"/>
        <terminal y="20" orientation="w" x="-20"/>
        <terminal y="0" orientation="w" x="-20"/>
        <terminal y="20" orientation="e" x="20"/>
        <terminal y="0" orientation="e" x="20"/>
        <terminal y="120" orientation="e" x="20"/>
        <terminal y="60" orientation="e" x="20"/>
        <terminal y="40" orientation="e" x="20"/>
        <terminal y="80" orientation="e" x="20"/>
        <terminal y="80" orientation="w" x="-20"/>
        <terminal y="40" orientation="w" x="-20"/>
        <terminal y="60" orientation="w" x="-20"/>
        <terminal y="100" orientation="e" x="20"/>
        <terminal y="100" orientation="w" x="-20"/>
        <terminal y="140" orientation="e" x="20"/>
        <terminal y="120" orientation="w" x="-20"/>
        <terminal y="140" orientation="w" x="-20"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_09.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_09.elmt
@@ -1,48 +0,0 @@
 <definition height="190" version="0.70" orientation="dyyy" width="50" hotspot_x="24" link_type="simple" type="element" hotspot_y="15">
    <uuid uuid="{d13c9554-6300-4f3a-bc7b-cadecf88a2a5}"/>
    <names>
        <name lang="en">Jack with 9 positions</name>
        <name lang="nl">Contact met 9 posities</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="100" y1="100" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <rect y="-10" height="180" width="20" rx="0" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x="-10" ry="0"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="120" y1="120" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="60" y1="60" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="80" y1="80" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" y1="20" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="160" y1="160" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="140" y1="140" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="40" y1="40" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="140" y1="140" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="160" y1="160" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" y1="20" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="40" y1="40" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="100" y1="100" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="120" y1="120" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="80" y1="80" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="60" y1="60" antialias="false" x1="10" end2="none" length2="1.5"/>
        <terminal y="0" orientation="e" x="20"/>
        <terminal y="0" orientation="w" x="-20"/>
        <terminal y="100" orientation="e" x="20"/>
        <terminal y="120" orientation="w" x="-20"/>
        <terminal y="140" orientation="e" x="20"/>
        <terminal y="60" orientation="w" x="-20"/>
        <terminal y="80" orientation="e" x="20"/>
        <terminal y="100" orientation="w" x="-20"/>
        <terminal y="80" orientation="w" x="-20"/>
        <terminal y="120" orientation="e" x="20"/>
        <terminal y="60" orientation="e" x="20"/>
        <terminal y="160" orientation="w" x="-20"/>
        <terminal y="160" orientation="e" x="20"/>
        <terminal y="140" orientation="w" x="-20"/>
        <terminal y="40" orientation="e" x="20"/>
        <terminal y="20" orientation="e" x="20"/>
        <terminal y="40" orientation="w" x="-20"/>
        <terminal y="20" orientation="w" x="-20"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_10.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_10.elmt
@@ -1,52 +0,0 @@
 <definition height="210" version="0.70" orientation="dyyy" width="50" hotspot_x="24" link_type="simple" type="element" hotspot_y="15">
    <uuid uuid="{d8443641-f543-4e44-b838-615c066287b3}"/>
    <names>
        <name lang="en">Jack with 10 positions</name>
        <name lang="nl">Contact met 10 posities</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect y="-10" height="200" width="20" rx="0" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x="-10" ry="0"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="120" y1="120" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" y1="20" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="40" y1="40" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="60" y1="60" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="100" y1="100" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="140" y1="140" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="180" y1="180" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="160" y1="160" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="80" y1="80" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="60" y1="60" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="180" y1="180" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="160" y1="160" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="140" y1="140" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="40" y1="40" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="100" y1="100" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="80" y1="80" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="120" y1="120" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="20" y1="20" antialias="false" x1="10" end2="none" length2="1.5"/>
        <terminal y="140" orientation="w" x="-20"/>
        <terminal y="160" orientation="e" x="20"/>
        <terminal y="140" orientation="e" x="20"/>
        <terminal y="160" orientation="w" x="-20"/>
        <terminal y="180" orientation="e" x="20"/>
        <terminal y="180" orientation="w" x="-20"/>
        <terminal y="20" orientation="w" x="-20"/>
        <terminal y="40" orientation="e" x="20"/>
        <terminal y="40" orientation="w" x="-20"/>
        <terminal y="20" orientation="e" x="20"/>
        <terminal y="0" orientation="w" x="-20"/>
        <terminal y="0" orientation="e" x="20"/>
        <terminal y="60" orientation="e" x="20"/>
        <terminal y="60" orientation="w" x="-20"/>
        <terminal y="80" orientation="w" x="-20"/>
        <terminal y="80" orientation="e" x="20"/>
        <terminal y="100" orientation="e" x="20"/>
        <terminal y="100" orientation="w" x="-20"/>
        <terminal y="120" orientation="w" x="-20"/>
        <terminal y="120" orientation="e" x="20"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_plug.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/pinball_em_williams_jack_plug.elmt
@@ -1,16 +0,0 @@
 <definition height="20" version="0.70" orientation="dyyy" width="30" hotspot_x="14" link_type="simple" type="element" hotspot_y="10">
    <uuid uuid="{648b691b-a9ce-44ae-96dd-c02039645205}"/>
    <names>
        <name lang="en">Plug</name>
        <name lang="nl">Contactpin</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect y="-5" height="10" width="4" rx="0" style="line-style:normal;line-weight:normal;filling:none;color:black" antialias="false" x="-2" ry="0"/>
        <line end1="none" length1="1.5" x2="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="-10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="2" end2="none" length2="1.5"/>
        <terminal y="0" orientation="e" x="10"/>
        <terminal y="0" orientation="w" x="-10"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/qet_directory
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/jacks/qet_directory
@@ -1,6 +0,0 @@
 <qet-directory>
    <names>
        <name lang="en">Jacks</name>
        <name lang="nl">Contacten</name>
    </names>
 </qet-directory>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/output/pinball_em_williams_coil.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/output/pinball_em_williams_coil.elmt
@@ -1,19 +0,0 @@
 <definition height="20" version="0.70" orientation="dyyy" width="50" hotspot_x="24" link_type="simple" type="element" hotspot_y="10">
    <uuid uuid="{2275166e-668f-4912-b838-1def0f65418e}"/>
    <names>
        <name lang="en">Coil</name>
        <name lang="nl">Spoel</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <arc y="-4" height="8" width="8" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="180" antialias="true" start="0" x="-8"/>
        <arc y="-4" height="8" width="8" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="180" antialias="true" start="0" x="-16"/>
        <arc y="-4" height="8" width="8" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="180" antialias="true" start="0" x="0"/>
        <arc y="-4" height="8" width="8" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="180" antialias="true" start="0" x="8"/>
        <line end1="none" length1="1.5" x2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="-16" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="16" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="20" end2="none" length2="1.5"/>
        <terminal y="0" orientation="w" x="-20"/>
        <terminal y="0" orientation="e" x="20"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/output/pinball_em_williams_flipper_coil.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/output/pinball_em_williams_flipper_coil.elmt
@@ -1,22 +0,0 @@
 <definition height="30" version="0.70" orientation="dyyy" width="50" hotspot_x="24" link_type="simple" type="element" hotspot_y="11">
    <uuid uuid="{6d4161fc-3f61-48cc-8322-9d384c2f7550}"/>
    <names>
        <name lang="en">Flipper coil</name>
        <name lang="nl">Flipperspoel</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <arc y="-4" height="8" width="8" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="180" antialias="true" start="0" x="0"/>
        <arc y="-4" height="8" width="8" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="180" antialias="true" start="0" x="8"/>
        <arc y="-4" height="8" width="8" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="180" antialias="true" start="0" x="-16"/>
        <arc y="-4" height="8" width="8" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="180" antialias="true" start="0" x="-8"/>
        <line end1="none" length1="1.5" x2="-16" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="16" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" y1="0" antialias="false" x1="0" end2="none" length2="1.5"/>
        <circle y="0" style="line-style:normal;line-weight:normal;filling:black;color:black" diameter="4" antialias="false" x="-2"/>
        <terminal y="0" orientation="w" x="-20"/>
        <terminal y="0" orientation="e" x="20"/>
        <terminal y="10" orientation="s" x="0"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/output/pinball_em_williams_lite.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/output/pinball_em_williams_lite.elmt
@@ -1,16 +0,0 @@
 <definition height="30" version="0.70" orientation="dyyy" width="50" hotspot_x="24" link_type="simple" type="element" hotspot_y="15">
    <uuid uuid="{06cf3371-5a2c-4887-aa73-667fa6dc718b}"/>
    <names>
        <name lang="en">Lite</name>
        <name lang="nl">Lamp</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <circle y="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" antialias="false" x="-10"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="-10" end2="none" length2="1.5"/>
        <terminal y="0" orientation="e" x="20"/>
        <terminal y="0" orientation="w" x="-20"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/output/pinball_em_williams_motor.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/output/pinball_em_williams_motor.elmt
@@ -1,18 +0,0 @@
 <definition height="30" version="0.70" orientation="dyyy" width="50" hotspot_x="24" link_type="simple" type="element" hotspot_y="15">
    <uuid uuid="{1a497d79-1196-4b65-9d65-a8660693c5b8}"/>
    <names>
        <name lang="en">Motor</name>
        <name lang="nl">Motor</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <circle y="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" antialias="false" x="-10"/>
        <line end1="none" length1="1.5" x2="-16" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="16" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-10" y1="0" antialias="false" x1="-16" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" y1="0" antialias="false" x1="16" end2="none" length2="1.5"/>
        <terminal y="0" orientation="e" x="20"/>
        <terminal y="0" orientation="w" x="-20"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/output/qet_directory
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/output/qet_directory
@@ -1,6 +0,0 @@
 <qet-directory>
    <names>
        <name lang="en">Output</name>
        <name lang="nl">Uitvoer</name>
    </names>
 </qet-directory>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/power/pinball_em_williams_fuse.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/power/pinball_em_williams_fuse.elmt
@@ -1,21 +0,0 @@
 <definition height="20" version="0.70" orientation="dyyy" width="50" hotspot_x="24" link_type="simple" type="element" hotspot_y="10">
    <uuid uuid="{6cfb757b-80eb-472e-a72b-4d1e398ff0be}"/>
    <names>
        <name lang="en">Fuse</name>
        <name lang="nl">Zekering</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <arc y="-5" height="10" width="10" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="180" antialias="true" start="0" x="0"/>
        <arc y="-5" height="10" width="10" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="180" antialias="true" start="180" x="-10"/>
        <line end1="none" length1="1.5" x2="-12" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="-10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="12" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="10" end2="none" length2="1.5"/>
        <circle y="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4" antialias="false" x="-16"/>
        <circle y="-2" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="4" antialias="false" x="12"/>
        <line end1="none" length1="1.5" x2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="-16" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="16" end2="none" length2="1.5"/>
        <terminal y="0" orientation="e" x="20"/>
        <terminal y="0" orientation="w" x="-20"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/power/pinball_em_williams_power_cord.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/power/pinball_em_williams_power_cord.elmt
@@ -1,21 +0,0 @@
 <definition height="40" version="0.70" orientation="dyyy" width="50" hotspot_x="24" link_type="simple" type="element" hotspot_y="34">
    <uuid uuid="{d67bb38e-704e-4df0-bcd5-6b5fc4f8b27f}"/>
    <names>
        <name lang="en">Power cord</name>
        <name lang="nl">Stekker</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <line end1="none" length1="1.5" x2="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20" y1="-20" antialias="false" x1="-10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="-5" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="20" end2="none" length2="1.5"/>
        <arc y="-30" height="20" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="180" antialias="true" start="180" x="-10"/>
        <line end1="none" length1="1.5" x2="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-11" y1="0" antialias="false" x1="-5" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-11" y1="0" antialias="false" x1="5" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20" y1="-28" antialias="false" x1="-5" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20" y1="-28" antialias="false" x1="5" end2="none" length2="1.5"/>
        <terminal y="0" orientation="e" x="20"/>
        <terminal y="0" orientation="w" x="-20"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/power/pinball_em_williams_power_cord_ground.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/power/pinball_em_williams_power_cord_ground.elmt
@@ -1,24 +0,0 @@
 <definition height="50" version="0.70" orientation="dyyy" width="50" hotspot_x="24" link_type="simple" type="element" hotspot_y="34">
    <uuid uuid="{772a2b18-69f2-407b-8594-917ecc52a4d3}"/>
    <names>
        <name lang="en">Power cord with ground pin</name>
        <name lang="nl">Stekker met aardedraad</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <line end1="none" length1="1.5" x2="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="-20" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="5" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="10" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-20" y1="-20" antialias="false" x1="-10" end2="none" length2="1.5"/>
        <arc y="-30" height="20" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" angle="180" antialias="true" start="180" x="-10"/>
        <line end1="none" length1="1.5" x2="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-11" y1="0" antialias="false" x1="-5" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-11" y1="0" antialias="false" x1="5" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-27" y1="-20" antialias="false" x1="5" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-27" y1="-20" antialias="false" x1="-5" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="-25" y1="-20" antialias="false" x1="0" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="0" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="10" y1="-10" antialias="false" x1="0" end2="none" length2="1.5"/>
        <terminal y="10" orientation="s" x="0"/>
        <terminal y="0" orientation="w" x="-20"/>
        <terminal y="0" orientation="e" x="20"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/power/pinball_em_williams_service_outlet.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/power/pinball_em_williams_service_outlet.elmt
@@ -1,18 +0,0 @@
 <definition height="30" version="0.70" orientation="dyyy" width="50" hotspot_x="24" link_type="simple" type="element" hotspot_y="15">
    <uuid uuid="{f75bd99b-67cd-4d09-bea0-677ba9528257}"/>
    <names>
        <name lang="en">Service outlet</name>
        <name lang="nl">Servicestopcontact</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <circle y="-10" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" antialias="false" x="-10"/>
        <line end1="none" length1="1.5" x2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="-10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="20" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="0" y1="0" antialias="false" x1="10" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="-4" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="5" y1="-5" antialias="false" x1="-4" end2="none" length2="1.5"/>
        <line end1="none" length1="1.5" x2="4" style="line-style:normal;line-weight:normal;filling:none;color:black" y2="5" y1="-5" antialias="false" x1="4" end2="none" length2="1.5"/>
        <terminal y="0" orientation="w" x="-20"/>
        <terminal y="0" orientation="e" x="20"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/power/qet_directory
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/power/qet_directory
@@ -1,6 +0,0 @@
 <qet-directory>
    <names>
        <name lang="en">Power</name>
        <name lang="nl">Stroom</name>
    </names>
 </qet-directory>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/qet_directory
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/qet_directory
@@ -1,6 +0,0 @@
 <qet-directory>
    <names>
        <name lang="en">Williams EM Schematics</name>
        <name lang="nl">Williams EM Schema's</name>
    </names>
 </qet-directory>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/mirrored/pinball_em_williams_switch_mb_bottom_m.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/mirrored/pinball_em_williams_switch_mb_bottom_m.elmt
@@ -1,21 +0,0 @@
 <definition hotspot_y="30" width="50" orientation="dyyy" height="40" version="0.70" hotspot_x="24" link_type="simple" type="element">
    <uuid uuid="{52858864-b876-400b-b65e-7482add60868}"/>
    <names>
        <name lang="en">Switch (M.B.) - Bottom input - Mirrored</name>
        <name lang="nl">Schakelaar (M.B.) - Input onder - Gespiegeld</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect x="2" rx="0" antialias="false" y="-25" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="30" ry="0"/>
        <line length2="1.5" x1="-20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-5" y2="-20" y1="-20"/>
        <rect x="-5" rx="0" antialias="false" y="-7" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="12" ry="0"/>
        <rect x="-5" rx="0" antialias="false" y="-25" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="12" ry="0"/>
        <line length2="1.5" x1="5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="20" y2="0" y1="0"/>
        <line length2="1.5" x1="-20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-5" y2="0" y1="0"/>
        <line length2="1.5" x1="10" antialias="false" style="line-style:normal;line-weight:hight;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-10" y2="5" y1="-5"/>
        <terminal x="-20" y="-20" orientation="w"/>
        <terminal x="20" y="0" orientation="e"/>
        <terminal x="-20" y="0" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/mirrored/pinball_em_williams_switch_mb_bottom_mi.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/mirrored/pinball_em_williams_switch_mb_bottom_mi.elmt
@@ -1,21 +0,0 @@
 <definition height="40" orientation="dyyy" hotspot_y="30" link_type="simple" version="0.70" type="element" hotspot_x="24" width="50">
    <uuid uuid="{5671de08-ab81-4f72-809b-7ac854e38016}"/>
    <names>
        <name lang="nl">Schakelaar (M.B.) - Input onder - Gespiegeld en omgekeerd</name>
        <name lang="en">Switch (M.B.) - Bottom input - Mirrored and inverted</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect height="30" rx="0" ry="0" x="2" y="-25" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <line x1="-20" end2="none" antialias="false" end1="none" y1="-20" length2="1.5" x2="-5" length1="1.5" y2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <rect height="12" rx="0" ry="0" x="-5" y="-7" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <rect height="12" rx="0" ry="0" x="-5" y="-25" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <line x1="5" end2="none" antialias="false" end1="none" y1="0" length2="1.5" x2="20" length1="1.5" y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <line x1="-20" end2="none" antialias="false" end1="none" y1="0" length2="1.5" x2="-5" length1="1.5" y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <line x1="10" end2="none" antialias="false" end1="none" y1="-25" length2="1.5" x2="-10" length1="1.5" y2="-15" style="line-style:normal;line-weight:hight;filling:none;color:black"/>
        <terminal x="20" y="0" orientation="e"/>
        <terminal x="-20" y="-20" orientation="w"/>
        <terminal x="-20" y="0" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/mirrored/pinball_em_williams_switch_mb_center_m.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/mirrored/pinball_em_williams_switch_mb_center_m.elmt
@@ -1,21 +0,0 @@
 <definition height="40" orientation="dyyy" hotspot_y="20" link_type="simple" version="0.70" type="element" hotspot_x="24" width="50">
    <uuid uuid="{762b188c-50f3-4900-b870-ea563c2cc7da}"/>
    <names>
        <name lang="nl">Schakelaar (M.B.) - Input midden - Gespiegeld</name>
        <name lang="en">Switch (M.B.) - Center input - Mirrored</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect height="30" rx="0" ry="0" x="2" y="-15" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <line x1="-20" end2="none" antialias="false" end1="none" y1="-10" length2="1.5" x2="-5" length1="1.5" y2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <rect height="12" rx="0" ry="0" x="-5" y="3" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <rect height="12" rx="0" ry="0" x="-5" y="-15" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <line x1="5" end2="none" antialias="false" end1="none" y1="0" length2="1.5" x2="20" length1="1.5" y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <line x1="-20" end2="none" antialias="false" end1="none" y1="10" length2="1.5" x2="-5" length1="1.5" y2="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <line x1="10" end2="none" antialias="false" end1="none" y1="5" length2="1.5" x2="-10" length1="1.5" y2="15" style="line-style:normal;line-weight:hight;filling:none;color:black"/>
        <terminal x="-20" y="-10" orientation="w"/>
        <terminal x="-20" y="10" orientation="w"/>
        <terminal x="20" y="0" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/mirrored/pinball_em_williams_switch_mb_center_mi.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/mirrored/pinball_em_williams_switch_mb_center_mi.elmt
@@ -1,21 +0,0 @@
 <definition height="40" orientation="dyyy" hotspot_y="20" link_type="simple" version="0.70" type="element" hotspot_x="24" width="50">
    <uuid uuid="{3509d560-3eb8-4527-b5b2-35d66bf3fc64}"/>
    <names>
        <name lang="nl">Schakelaar (M.B.) - Input midden - Gespiegeld en omgekeerd</name>
        <name lang="en">Switch (M.B.) - Center input - Mirrored and inverted</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect height="30" rx="0" ry="0" x="2" y="-15" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <line x1="-20" end2="none" antialias="false" end1="none" y1="-10" length2="1.5" x2="-5" length1="1.5" y2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <rect height="12" rx="0" ry="0" x="-5" y="3" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <rect height="12" rx="0" ry="0" x="-5" y="-15" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <line x1="5" end2="none" antialias="false" end1="none" y1="0" length2="1.5" x2="20" length1="1.5" y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <line x1="-20" end2="none" antialias="false" end1="none" y1="10" length2="1.5" x2="-5" length1="1.5" y2="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <line x1="10" end2="none" antialias="false" end1="none" y1="-15" length2="1.5" x2="-10" length1="1.5" y2="-5" style="line-style:normal;line-weight:hight;filling:none;color:black"/>
        <terminal x="20" y="0" orientation="e"/>
        <terminal x="-20" y="10" orientation="w"/>
        <terminal x="-20" y="-10" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/mirrored/pinball_em_williams_switch_mb_top_m.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/mirrored/pinball_em_williams_switch_mb_top_m.elmt
@@ -1,21 +0,0 @@
 <definition height="40" orientation="dyyy" hotspot_y="10" link_type="simple" version="0.70" type="element" hotspot_x="24" width="50">
    <uuid uuid="{b85f89b8-cbf2-4bda-ba31-8cc3570a4339}"/>
    <names>
        <name lang="nl">Schakelaar (M.B.) - Input boven - Gespiegeld</name>
        <name lang="en">Switch (M.B.) - Top input - Mirrored</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect height="30" rx="0" ry="0" x="2" y="-5" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <line x1="-20" end2="none" antialias="false" end1="none" y1="0" length2="1.5" x2="-5" length1="1.5" y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <rect height="12" rx="0" ry="0" x="-5" y="13" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <rect height="12" rx="0" ry="0" x="-5" y="-5" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <line x1="5" end2="none" antialias="false" end1="none" y1="0" length2="1.5" x2="20" length1="1.5" y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <line x1="-20" end2="none" antialias="false" end1="none" y1="20" length2="1.5" x2="-5" length1="1.5" y2="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <line x1="10" end2="none" antialias="false" end1="none" y1="15" length2="1.5" x2="-10" length1="1.5" y2="25" style="line-style:normal;line-weight:hight;filling:none;color:black"/>
        <terminal x="20" y="0" orientation="e"/>
        <terminal x="-20" y="20" orientation="w"/>
        <terminal x="-20" y="0" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/mirrored/pinball_em_williams_switch_mb_top_mi.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/mirrored/pinball_em_williams_switch_mb_top_mi.elmt
@@ -1,21 +0,0 @@
 <definition height="40" orientation="dyyy" hotspot_y="10" link_type="simple" version="0.70" type="element" hotspot_x="24" width="50">
    <uuid uuid="{6e72e029-0004-452d-9e0c-ed664e36f070}"/>
    <names>
        <name lang="nl">Schakelaar (M.B.) - Input boven - Gespiegeld en omgekeerd</name>
        <name lang="en">Switch (M.B.) - Top input - Mirrored and inverted</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect height="30" rx="0" ry="0" x="2" y="-5" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <line x1="-20" end2="none" antialias="false" end1="none" y1="0" length2="1.5" x2="-5" length1="1.5" y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <rect height="12" rx="0" ry="0" x="-5" y="13" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <rect height="12" rx="0" ry="0" x="-5" y="-5" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <line x1="5" end2="none" antialias="false" end1="none" y1="0" length2="1.5" x2="20" length1="1.5" y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <line x1="-20" end2="none" antialias="false" end1="none" y1="20" length2="1.5" x2="-5" length1="1.5" y2="20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <line x1="10" end2="none" antialias="false" end1="none" y1="-5" length2="1.5" x2="-10" length1="1.5" y2="5" style="line-style:normal;line-weight:hight;filling:none;color:black"/>
        <terminal x="-20" y="0" orientation="w"/>
        <terminal x="20" y="0" orientation="e"/>
        <terminal x="-20" y="20" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/mirrored/qet_directory
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/mirrored/qet_directory
@@ -1,6 +0,0 @@
 <qet-directory>
    <names>
        <name lang="en">Mirrored</name>
        <name lang="nl">Gespiegeld</name>
    </names>
 </qet-directory>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_mb_bottom.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_mb_bottom.elmt
@@ -1,21 +0,0 @@
 <definition hotspot_x="24" height="40" type="element" width="50" hotspot_y="30" version="0.70" link_type="simple" orientation="dyyy">
    <uuid uuid="{6b2f7d0b-0bea-4db2-9da7-ed808130db45}"/>
    <names>
        <name lang="nl">Schakelaar (M.B.) - Input onder</name>
        <name lang="en">Switch (M.B.) - Bottom input</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect height="30" style="line-style:normal;line-weight:normal;filling:black;color:black" width="3" y="-25.25" ry="0" rx="0" x="-5" antialias="false"/>
        <rect height="12" style="line-style:normal;line-weight:normal;filling:black;color:black" width="3" y="-7.25" ry="0" rx="0" x="2" antialias="false"/>
        <rect height="12" style="line-style:normal;line-weight:normal;filling:black;color:black" width="3" y="-25.25" ry="0" rx="0" x="2" antialias="false"/>
        <line style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" end1="none" length2="1.5" y2="-0.25" end2="none" y1="-0.25" x2="20" length1="1.5" antialias="false"/>
        <line style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" end1="none" length2="1.5" y2="-0.25" end2="none" y1="-0.25" x2="-5" length1="1.5" antialias="false"/>
        <line style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" end1="none" length2="1.5" y2="-20.25" end2="none" y1="-20.25" x2="20" length1="1.5" antialias="false"/>
        <line style="line-style:normal;line-weight:hight;filling:none;color:black" x1="10" end1="none" length2="1.5" y2="4.75" end2="none" y1="-5.25" x2="-10" length1="1.5" antialias="false"/>
        <terminal y="-0.25" x="20" orientation="e"/>
        <terminal y="-20.25" x="20" orientation="e"/>
        <terminal y="-0.25" x="-20" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_mb_bottom_i.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_mb_bottom_i.elmt
@@ -1,21 +0,0 @@
 <definition height="40" orientation="dyyy" hotspot_y="30" link_type="simple" version="0.70" type="element" hotspot_x="24" width="50">
    <uuid uuid="{6321259d-91c7-4126-9bcf-c8ab9dedddf7}"/>
    <names>
        <name lang="nl">Schakelaar (M.B.) - Input onder - Omgekeerd</name>
        <name lang="en">Switch (M.B.) - Bottom input - Inverted</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect height="30" rx="0" ry="0" x="-5" y="-25" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <rect height="12" rx="0" ry="0" x="2" y="-7" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <rect height="12" rx="0" ry="0" x="2" y="-25" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <line x1="5" end2="none" antialias="false" end1="none" y1="0" length2="1.5" x2="20" length1="1.5" y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <line x1="-20" end2="none" antialias="false" end1="none" y1="0" length2="1.5" x2="-5" length1="1.5" y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <line x1="5" end2="none" antialias="false" end1="none" y1="-20" length2="1.5" x2="20" length1="1.5" y2="-20" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <line x1="10" end2="none" antialias="false" end1="none" y1="-24.75" length2="1.5" x2="-10" length1="1.5" y2="-14.75" style="line-style:normal;line-weight:hight;filling:none;color:black"/>
        <terminal x="20" y="0" orientation="e"/>
        <terminal x="20" y="-20" orientation="e"/>
        <terminal x="-20" y="0" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_mb_center.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_mb_center.elmt
@@ -1,21 +0,0 @@
 <definition hotspot_x="24" height="40" type="element" width="50" hotspot_y="20" version="0.70" link_type="simple" orientation="dyyy">
    <uuid uuid="{57993a2e-8feb-4920-97f7-5481bc1e63e3}"/>
    <names>
        <name lang="nl">Schakelaar (M.B.) - Input midden</name>
        <name lang="en">Switch (M.B.) - Center input</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect height="30" style="line-style:normal;line-weight:normal;filling:black;color:black" width="3" y="-15" ry="0" rx="0" x="-5" antialias="false"/>
        <rect height="12" style="line-style:normal;line-weight:normal;filling:black;color:black" width="3" y="3" ry="0" rx="0" x="2" antialias="false"/>
        <rect height="12" style="line-style:normal;line-weight:normal;filling:black;color:black" width="3" y="-15" ry="0" rx="0" x="2" antialias="false"/>
        <line style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" end1="none" length2="1.5" y2="10" end2="none" y1="10" x2="20" length1="1.5" antialias="false"/>
        <line style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" end1="none" length2="1.5" y2="0" end2="none" y1="0" x2="-5" length1="1.5" antialias="false"/>
        <line style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" end1="none" length2="1.5" y2="-10" end2="none" y1="-10" x2="20" length1="1.5" antialias="false"/>
        <line style="line-style:normal;line-weight:hight;filling:none;color:black" x1="10" end1="none" length2="1.5" y2="15" end2="none" y1="5" x2="-10" length1="1.5" antialias="false"/>
        <terminal y="10" x="20" orientation="e"/>
        <terminal y="-10" x="20" orientation="e"/>
        <terminal y="0" x="-20" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_mb_center_i.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_mb_center_i.elmt
@@ -1,21 +0,0 @@
 <definition height="40" orientation="dyyy" hotspot_y="20" link_type="simple" version="0.70" type="element" hotspot_x="24" width="50">
    <uuid uuid="{9a0c9775-c4ca-4a6b-809c-74ffb482fc6a}"/>
    <names>
        <name lang="nl">Schakelaar (M.B.) - Input midden - Omgekeerd</name>
        <name lang="en">Switch (M.B.) - Center input - Inverted</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect height="30" rx="0" ry="0" x="-5" y="-15" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <rect height="12" rx="0" ry="0" x="2" y="3" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <rect height="12" rx="0" ry="0" x="2" y="-15" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <line x1="5" end2="none" antialias="false" end1="none" y1="10" length2="1.5" x2="20" length1="1.5" y2="10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <line x1="-20" end2="none" antialias="false" end1="none" y1="0" length2="1.5" x2="-5" length1="1.5" y2="0" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <line x1="5" end2="none" antialias="false" end1="none" y1="-10" length2="1.5" x2="20" length1="1.5" y2="-10" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <line x1="10" end2="none" antialias="false" end1="none" y1="-15" length2="1.5" x2="-10" length1="1.5" y2="-5" style="line-style:normal;line-weight:hight;filling:none;color:black"/>
        <terminal x="20" y="-10" orientation="e"/>
        <terminal x="20" y="10" orientation="e"/>
        <terminal x="-20" y="0" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_mb_top.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_mb_top.elmt
@@ -1,21 +0,0 @@
 <definition hotspot_x="24" height="40" type="element" width="50" hotspot_y="10" version="0.70" link_type="simple" orientation="dyyy">
    <uuid uuid="{01a0d1a8-0de0-4f5e-ac2b-2490c38301b0}"/>
    <names>
        <name lang="nl">Schakelaar (M.B.) - Input boven</name>
        <name lang="en">Switch (M.B.) - Top input</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect height="30" style="line-style:normal;line-weight:normal;filling:black;color:black" width="3" y="-5" ry="0" rx="0" x="-5" antialias="false"/>
        <rect height="12" style="line-style:normal;line-weight:normal;filling:black;color:black" width="3" y="13" ry="0" rx="0" x="2" antialias="false"/>
        <rect height="12" style="line-style:normal;line-weight:normal;filling:black;color:black" width="3" y="-5" ry="0" rx="0" x="2" antialias="false"/>
        <line style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" end1="none" length2="1.5" y2="20" end2="none" y1="20" x2="20" length1="1.5" antialias="false"/>
        <line style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" end1="none" length2="1.5" y2="0" end2="none" y1="0" x2="-5" length1="1.5" antialias="false"/>
        <line style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" end1="none" length2="1.5" y2="0" end2="none" y1="0" x2="20" length1="1.5" antialias="false"/>
        <line style="line-style:normal;line-weight:hight;filling:none;color:black" x1="10" end1="none" length2="1.5" y2="25" end2="none" y1="15" x2="-10" length1="1.5" antialias="false"/>
        <terminal y="20" x="20" orientation="e"/>
        <terminal y="0" x="20" orientation="e"/>
        <terminal y="0" x="-20" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_mb_top_i.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_mb_top_i.elmt
@@ -1,21 +0,0 @@
 <definition height="40" orientation="dyyy" hotspot_y="10" link_type="simple" version="0.70" type="element" hotspot_x="24" width="50">
    <uuid uuid="{130b56ae-6888-4b0d-bac8-5b49335e33ec}"/>
    <names>
        <name lang="nl">Schakelaar (M.B.) - Input boven - Omgekeerd</name>
        <name lang="en">Switch (M.B) - Top input - Inverted</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect height="30" rx="0" ry="0" x="-5" y="-5.25" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <rect height="12" rx="0" ry="0" x="2" y="12.75" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <rect height="12" rx="0" ry="0" x="2" y="-5.25" antialias="false" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
        <line x1="5" end2="none" antialias="false" end1="none" y1="19.75" length2="1.5" x2="20" length1="1.5" y2="19.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <line x1="-20" end2="none" antialias="false" end1="none" y1="-0.25" length2="1.5" x2="-5" length1="1.5" y2="-0.25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <line x1="5" end2="none" antialias="false" end1="none" y1="-0.25" length2="1.5" x2="20" length1="1.5" y2="-0.25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
        <line x1="10" end2="none" antialias="false" end1="none" y1="-5" length2="1.5" x2="-10" length1="1.5" y2="5" style="line-style:normal;line-weight:hight;filling:none;color:black"/>
        <terminal x="20" y="-0.25" orientation="e"/>
        <terminal x="-20" y="-0.25" orientation="w"/>
        <terminal x="20" y="19.75" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_nc.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_nc.elmt
@@ -1,18 +0,0 @@
 <definition hotspot_x="24" height="20" type="element" width="50" hotspot_y="10" version="0.70" link_type="simple" orientation="dyyy">
    <uuid uuid="{b4de77c7-a031-4ae2-b7f7-8ea5309631c7}"/>
    <names>
        <name lang="nl">Schakelaar (N.C.)</name>
        <name lang="en">Switch (N.C.)</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect height="10" style="line-style:normal;line-weight:normal;filling:black;color:black" width="3" y="-5" ry="0" rx="0" x="-5" antialias="false"/>
        <rect height="10" style="line-style:normal;line-weight:normal;filling:black;color:black" width="3" y="-5" ry="0" rx="0" x="2" antialias="false"/>
        <line style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" end1="none" length2="1.5" y2="0" end2="none" y1="0" x2="20" length1="1.5" antialias="false"/>
        <line style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-5" end1="none" length2="1.5" y2="0" end2="none" y1="0" x2="-20" length1="1.5" antialias="false"/>
        <line style="line-style:normal;line-weight:hight;filling:none;color:black" x1="10" end1="none" length2="1.5" y2="5" end2="none" y1="-5" x2="-10" length1="1.5" antialias="false"/>
        <terminal y="0" x="-20" orientation="w"/>
        <terminal y="0" x="20" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_no.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/pinball_em_williams_switch_no.elmt
@@ -1,17 +0,0 @@
 <definition hotspot_x="24" height="20" type="element" width="50" hotspot_y="10" version="0.70" link_type="simple" orientation="dyyy">
    <uuid uuid="{5a15257d-de36-4aad-9b67-717ea5763a1c}"/>
    <names>
        <name lang="nl">Schakelaar (N.O.)</name>
        <name lang="en">Switch (N.O.)</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect height="10" style="line-style:normal;line-weight:normal;filling:black;color:black" width="3" y="-5" ry="0" rx="0" x="-5" antialias="false"/>
        <rect height="10" style="line-style:normal;line-weight:normal;filling:black;color:black" width="3" y="-5" ry="0" rx="0" x="2" antialias="false"/>
        <line style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" end1="none" length2="1.5" y2="0" end2="none" y1="0" x2="-5" length1="1.5" antialias="false"/>
        <line style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" end1="none" length2="1.5" y2="0" end2="none" y1="0" x2="20" length1="1.5" antialias="false"/>
        <terminal y="0" x="-20" orientation="w"/>
        <terminal y="0" x="20" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/qet_directory
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_common/qet_directory
@@ -1,6 +0,0 @@
 <qet-directory>
    <names>
        <name lang="nl">Schakelaars - Algemeen</name>
        <name lang="en">Switches - Common</name>
    </names>
 </qet-directory>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/mirrored/pinball_em_williams_switch_mb_sm_bottom_m.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/mirrored/pinball_em_williams_switch_mb_sm_bottom_m.elmt
@@ -1,25 +0,0 @@
 <definition hotspot_y="35" width="50" orientation="dyyy" height="50" version="0.70" hotspot_x="24" link_type="simple" type="element">
    <uuid uuid="{10830219-83b0-4488-8564-adfe27637f60}"/>
    <names>
        <name lang="en">Switch on Score Motor (M.B.) - Bottom input - Mirrored</name>
        <name lang="nl">Schakelaar op Score Motor (M.B.) - Input onder - Gespiegeld</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect x="2" rx="0" antialias="false" y="-25" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="30" ry="0"/>
        <arc x="-10" start="0" antialias="true" y="-30" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" angle="180"/>
        <line length2="1.5" x1="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-10" y2="0" y1="-20"/>
        <line length2="1.5" x1="-20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-5" y2="-20" y1="-20"/>
        <rect x="-5" rx="0" antialias="false" y="-7" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="12" ry="0"/>
        <line length2="1.5" x1="10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="10" y2="0" y1="-20"/>
        <rect x="-5" rx="0" antialias="false" y="-25" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="12" ry="0"/>
        <arc x="-10" start="180" antialias="true" y="-10" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" angle="180"/>
        <line length2="1.5" x1="5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="20" y2="0" y1="0"/>
        <line length2="1.5" x1="-20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-5" y2="0" y1="0"/>
        <line length2="1.5" x1="10" antialias="false" style="line-style:normal;line-weight:hight;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-10" y2="5" y1="-5"/>
        <terminal x="-20" y="0" orientation="w"/>
        <terminal x="-20" y="-20" orientation="w"/>
        <terminal x="20" y="0" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/mirrored/pinball_em_williams_switch_mb_sm_bottom_mi.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/mirrored/pinball_em_williams_switch_mb_sm_bottom_mi.elmt
@@ -1,25 +0,0 @@
 <definition hotspot_y="35" width="50" orientation="dyyy" height="50" version="0.70" hotspot_x="24" link_type="simple" type="element">
    <uuid uuid="{5854bbcc-54b3-41c1-b728-36ea16c235c7}"/>
    <names>
        <name lang="en">Switch on Score Motor (M.B.) - Bottom input - Mirrored and inverted</name>
        <name lang="nl">Schakelaar op Score Motor (M.B.) - Input onder - Gespiegeld en omgekeerd</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect x="2" rx="0" antialias="false" y="-25" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="30" ry="0"/>
        <arc x="-10" start="0" antialias="true" y="-30" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" angle="180"/>
        <line length2="1.5" x1="-20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-5" y2="-20" y1="-20"/>
        <line length2="1.5" x1="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-10" y2="0" y1="-20"/>
        <line length2="1.5" x1="10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="10" y2="0" y1="-20"/>
        <rect x="-5" rx="0" antialias="false" y="-7" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="12" ry="0"/>
        <rect x="-5" rx="0" antialias="false" y="-25" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="12" ry="0"/>
        <arc x="-10" start="180" antialias="true" y="-10" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" angle="180"/>
        <line length2="1.5" x1="5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="20" y2="0" y1="0"/>
        <line length2="1.5" x1="-20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-5" y2="0" y1="0"/>
        <line length2="1.5" x1="10" antialias="false" style="line-style:normal;line-weight:hight;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-10" y2="-15" y1="-25"/>
        <terminal x="20" y="0" orientation="e"/>
        <terminal x="-20" y="0" orientation="w"/>
        <terminal x="-20" y="-20" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/mirrored/pinball_em_williams_switch_mb_sm_center_m.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/mirrored/pinball_em_williams_switch_mb_sm_center_m.elmt
@@ -1,25 +0,0 @@
 <definition hotspot_y="25" width="50" orientation="dyyy" height="50" version="0.70" hotspot_x="24" link_type="simple" type="element">
    <uuid uuid="{b17bd886-7621-424a-b336-cdf9d15da91c}"/>
    <names>
        <name lang="en">Switch on Score Motor (M.B.) - Center input - Mirrored</name>
        <name lang="nl">Schakelaar op Score Motor (M.B.) - Input midden - Gespiegeld</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <arc x="-10" start="0" antialias="true" y="-20" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" angle="180"/>
        <rect x="2" rx="0" antialias="false" y="-15.25" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="30" ry="0"/>
        <line length2="1.5" x1="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-10" y2="10" y1="-10"/>
        <line length2="1.5" x1="-20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-5" y2="-10.25" y1="-10.25"/>
        <line length2="1.5" x1="10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="10" y2="10" y1="-10"/>
        <rect x="-5" rx="0" antialias="false" y="2.75" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="12" ry="0"/>
        <arc x="-10" start="180" antialias="true" y="0" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" angle="180"/>
        <rect x="-5" rx="0" antialias="false" y="-15.25" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="12" ry="0"/>
        <line length2="1.5" x1="5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="20" y2="-0.25" y1="-0.25"/>
        <line length2="1.5" x1="-20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-5" y2="9.75" y1="9.75"/>
        <line length2="1.5" x1="10" antialias="false" style="line-style:normal;line-weight:hight;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-10" y2="14.75" y1="4.75"/>
        <terminal x="-20" y="9.75" orientation="w"/>
        <terminal x="-20" y="-10.25" orientation="w"/>
        <terminal x="20" y="-0.25" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/mirrored/pinball_em_williams_switch_mb_sm_center_mi.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/mirrored/pinball_em_williams_switch_mb_sm_center_mi.elmt
@@ -1,25 +0,0 @@
 <definition hotspot_y="25" width="50" orientation="dyyy" height="50" version="0.70" hotspot_x="24" link_type="simple" type="element">
    <uuid uuid="{a5464c2a-4620-41a8-a18f-e34f0e0fa5ee}"/>
    <names>
        <name lang="en">Switch on Score Motor (M.B.) - Center input - Mirrored and inverted</name>
        <name lang="nl">Schakelaar op Score Motor (M.B.) - Input midden - Gespiegeld en omgekeerd</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <arc x="-10" start="0" antialias="true" y="-20" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" angle="180"/>
        <rect x="2" rx="0" antialias="false" y="-15" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="30" ry="0"/>
        <line length2="1.5" x1="-20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-5" y2="-10" y1="-10"/>
        <line length2="1.5" x1="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-10" y2="10" y1="-10"/>
        <rect x="-5" rx="0" antialias="false" y="3" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="12" ry="0"/>
        <line length2="1.5" x1="10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="10" y2="10" y1="-10"/>
        <arc x="-10" start="180" antialias="true" y="0" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" angle="180"/>
        <rect x="-5" rx="0" antialias="false" y="-15" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="12" ry="0"/>
        <line length2="1.5" x1="5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="20" y2="0" y1="0"/>
        <line length2="1.5" x1="-20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-5" y2="10" y1="10"/>
        <line length2="1.5" x1="10" antialias="false" style="line-style:normal;line-weight:hight;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-10" y2="-5" y1="-15"/>
        <terminal x="-20" y="10" orientation="w"/>
        <terminal x="-20" y="-10" orientation="w"/>
        <terminal x="20" y="0" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/mirrored/pinball_em_williams_switch_mb_sm_top_m.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/mirrored/pinball_em_williams_switch_mb_sm_top_m.elmt
@@ -1,25 +0,0 @@
 <definition hotspot_y="15" width="50" orientation="dyyy" height="50" version="0.70" hotspot_x="24" link_type="simple" type="element">
    <uuid uuid="{118827a9-bf0b-49d4-9c37-9679a3014ff2}"/>
    <names>
        <name lang="en">Switch on Score Motor (M.B.) - Top input - Mirrored</name>
        <name lang="nl">Schakelaar op Score Motor (M.B.) - Input boven - Gespiegeld</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect x="2" rx="0" antialias="false" y="-5" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="30" ry="0"/>
        <arc x="-10" start="0" antialias="true" y="-10" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" angle="180"/>
        <line length2="1.5" x1="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-10" y2="20" y1="0"/>
        <line length2="1.5" x1="-20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-5" y2="0" y1="0"/>
        <rect x="-5" rx="0" antialias="false" y="13" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="12" ry="0"/>
        <line length2="1.5" x1="10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="10" y2="20" y1="0"/>
        <rect x="-5" rx="0" antialias="false" y="-5" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="12" ry="0"/>
        <arc x="-10" start="180" antialias="true" y="10" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" angle="180"/>
        <line length2="1.5" x1="5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="20" y2="0" y1="0"/>
        <line length2="1.5" x1="-20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-5" y2="20" y1="20"/>
        <line length2="1.5" x1="10" antialias="false" style="line-style:normal;line-weight:hight;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-10" y2="25" y1="15"/>
        <terminal x="-20" y="20" orientation="w"/>
        <terminal x="20" y="0" orientation="e"/>
        <terminal x="-20" y="0" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/mirrored/pinball_em_williams_switch_mb_sm_top_mi.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/mirrored/pinball_em_williams_switch_mb_sm_top_mi.elmt
@@ -1,25 +0,0 @@
 <definition hotspot_y="15" width="50" orientation="dyyy" height="50" version="0.70" hotspot_x="24" link_type="simple" type="element">
    <uuid uuid="{d2347a8a-0c35-45a6-95e4-8a3a3100964f}"/>
    <names>
        <name lang="en">Switch on Score Motor (M.B.) - Top input - Mirrored and inverted</name>
        <name lang="nl">Schakelaar op Score Motor (M.B.) - Input boven - Gespiegeld en omgekeerd</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <arc x="-10" start="0" antialias="true" y="-10" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" angle="180"/>
        <rect x="2" rx="0" antialias="false" y="-5" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="30" ry="0"/>
        <line length2="1.5" x1="-20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-5" y2="0" y1="0"/>
        <line length2="1.5" x1="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-10" y2="20" y1="0"/>
        <line length2="1.5" x1="10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="10" y2="20" y1="0"/>
        <rect x="-5" rx="0" antialias="false" y="13" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="12" ry="0"/>
        <arc x="-10" start="180" antialias="true" y="10" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" angle="180"/>
        <rect x="-5" rx="0" antialias="false" y="-5" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="12" ry="0"/>
        <line length2="1.5" x1="5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="20" y2="0" y1="0"/>
        <line length2="1.5" x1="-20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-5" y2="20" y1="20"/>
        <line length2="1.5" x1="10" antialias="false" style="line-style:normal;line-weight:hight;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-10" y2="5" y1="-5"/>
        <terminal x="-20" y="20" orientation="w"/>
        <terminal x="20" y="0" orientation="e"/>
        <terminal x="-20" y="0" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/mirrored/qet_directory
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/mirrored/qet_directory
@@ -1,6 +0,0 @@
 <qet-directory>
    <names>
        <name lang="en">Mirrored</name>
        <name lang="nl">Gespiegeld</name>
    </names>
 </qet-directory>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_mb_sm_bottom.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_mb_sm_bottom.elmt
@@ -1,25 +0,0 @@
 <definition type="element" hotspot_y="35" width="50" hotspot_x="24" version="0.70" link_type="simple" height="50" orientation="dyyy">
    <uuid uuid="{925545b8-d804-4125-a17d-563abac148b4}"/>
    <names>
        <name lang="nl">Schakelaar op Score Motor (M.B.) - Input onder</name>
        <name lang="en">Switch on Score Motor (M.B.) - Bottom input</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect y="-25" rx="0" ry="0" width="3" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x="-5" height="30"/>
        <rect y="-7" rx="0" ry="0" width="3" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x="2" height="12"/>
        <rect y="-25" rx="0" ry="0" width="3" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x="2" height="12"/>
        <line x2="20" length2="1.5" y1="0" antialias="false" end1="none" length1="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" y2="0"/>
        <line x2="-5" length2="1.5" y1="0" antialias="false" end1="none" length1="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" y2="0"/>
        <line x2="20" length2="1.5" y1="-20" antialias="false" end1="none" length1="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" y2="-20"/>
        <line x2="-10" length2="1.5" y1="-5" antialias="false" end1="none" length1="1.5" end2="none" style="line-style:normal;line-weight:hight;filling:none;color:black" x1="10" y2="5"/>
        <arc y="-30" start="0" width="20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-10" height="20" angle="180"/>
        <line x2="-10" length2="1.5" y1="-20" antialias="false" end1="none" length1="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" y2="0"/>
        <line x2="10" length2="1.5" y1="-20" antialias="false" end1="none" length1="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" y2="0"/>
        <arc y="-10" start="180" width="20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-10" height="20" angle="180"/>
        <terminal y="0" x="20" orientation="e"/>
        <terminal y="0" x="-20" orientation="w"/>
        <terminal y="-20" x="20" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_mb_sm_bottom_i.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_mb_sm_bottom_i.elmt
@@ -1,25 +0,0 @@
 <definition type="element" hotspot_y="35" width="50" hotspot_x="24" version="0.70" link_type="simple" height="50" orientation="dyyy">
    <uuid uuid="{a366c41f-2629-4a8b-9dad-f06804bd84d6}"/>
    <names>
        <name lang="nl">Schakelaar op Score Motor (M.B.) - Input onder - Omgekeerd</name>
        <name lang="en">Switch on Score Motor (M.B.) - Bottom input - Inverted</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect y="-25" rx="0" ry="0" width="3" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x="-5" height="30"/>
        <rect y="-7" rx="0" ry="0" width="3" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x="2" height="12"/>
        <rect y="-25" rx="0" ry="0" width="3" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x="2" height="12"/>
        <line x2="20" length2="1.5" y1="0" antialias="false" end1="none" length1="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" y2="0"/>
        <line x2="-5" length2="1.5" y1="0" antialias="false" end1="none" length1="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" y2="0"/>
        <line x2="20" length2="1.5" y1="-20" antialias="false" end1="none" length1="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" y2="-20"/>
        <line x2="-10" length2="1.5" y1="-25" antialias="false" end1="none" length1="1.5" end2="none" style="line-style:normal;line-weight:hight;filling:none;color:black" x1="10" y2="-15"/>
        <arc y="-30" start="0" width="20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-10" height="20" angle="180"/>
        <line x2="-10" length2="1.5" y1="-20" antialias="false" end1="none" length1="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-10" y2="0"/>
        <line x2="10" length2="1.5" y1="-20" antialias="false" end1="none" length1="1.5" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" x1="10" y2="0"/>
        <arc y="-10" start="180" width="20" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" x="-10" height="20" angle="180"/>
        <terminal y="0" x="20" orientation="e"/>
        <terminal y="0" x="-20" orientation="w"/>
        <terminal y="-20" x="20" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_mb_sm_center.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_mb_sm_center.elmt
@@ -1,25 +0,0 @@
 <definition hotspot_y="25" width="50" orientation="dyyy" height="50" version="0.70" hotspot_x="24" link_type="simple" type="element">
    <uuid uuid="{eda35b7a-2534-400d-b477-a07ff481a50d}"/>
    <names>
        <name lang="en">Switch on Score Motor (M.B.) - Center input</name>
        <name lang="nl">Schakelaar op Score Motor (M.B.) - Input midden</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <arc x="-10" start="0" antialias="true" y="-20" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" angle="180"/>
        <rect x="-5" rx="0" antialias="false" y="-15" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="30" ry="0"/>
        <line length2="1.5" x1="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-10" y2="10" y1="-10"/>
        <rect x="2" rx="0" antialias="false" y="3" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="12" ry="0"/>
        <line length2="1.5" x1="10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="10" y2="10" y1="-10"/>
        <rect x="2" rx="0" antialias="false" y="-15" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="12" ry="0"/>
        <arc x="-10" start="180" antialias="true" y="0" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" angle="180"/>
        <line length2="1.5" x1="5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="20" y2="10" y1="10"/>
        <line length2="1.5" x1="-20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-5" y2="0" y1="0"/>
        <line length2="1.5" x1="5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="20" y2="-10" y1="-10"/>
        <line length2="1.5" x1="10" antialias="false" style="line-style:normal;line-weight:hight;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-10" y2="15" y1="5"/>
        <terminal x="20" y="10" orientation="e"/>
        <terminal x="20" y="-10" orientation="e"/>
        <terminal x="-20" y="0" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_mb_sm_center_i.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_mb_sm_center_i.elmt
@@ -1,25 +0,0 @@
 <definition hotspot_y="25" width="50" orientation="dyyy" height="50" version="0.70" hotspot_x="24" link_type="simple" type="element">
    <uuid uuid="{97121fe2-38e2-4c5e-b5ab-223bb4770b11}"/>
    <names>
        <name lang="en">Switch on Score Motor (M.B.) - Center input - Inverted</name>
        <name lang="nl">Schakelaar op Score Motor (M.B.) - Input midden - Omgekeerd</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <arc x="-10" start="0" antialias="true" y="-20" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" angle="180"/>
        <rect x="-5" rx="0" antialias="false" y="-15" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="30" ry="0"/>
        <line length2="1.5" x1="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-10" y2="10" y1="-10"/>
        <rect x="2" rx="0" antialias="false" y="3" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="12" ry="0"/>
        <line length2="1.5" x1="10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="10" y2="10" y1="-10"/>
        <rect x="2" rx="0" antialias="false" y="-15" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="12" ry="0"/>
        <arc x="-10" start="180" antialias="true" y="0" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" angle="180"/>
        <line length2="1.5" x1="5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="20" y2="10" y1="10"/>
        <line length2="1.5" x1="-20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-5" y2="0" y1="0"/>
        <line length2="1.5" x1="5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="20" y2="-10" y1="-10"/>
        <line length2="1.5" x1="10" antialias="false" style="line-style:normal;line-weight:hight;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-10" y2="-5" y1="-15"/>
        <terminal x="-20" y="0" orientation="w"/>
        <terminal x="20" y="-10" orientation="e"/>
        <terminal x="20" y="10" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_mb_sm_top.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_mb_sm_top.elmt
@@ -1,25 +0,0 @@
 <definition hotspot_y="15" width="50" orientation="dyyy" height="50" version="0.70" hotspot_x="24" link_type="simple" type="element">
    <uuid uuid="{8da83d7e-0afb-4811-8903-633089863194}"/>
    <names>
        <name lang="en">Switch on Score Motor (M.B.) - Top input</name>
        <name lang="nl">Schakelaar op Score Motor (M.B.) - Input boven</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <arc x="-10" start="0" antialias="true" y="-10" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" angle="180"/>
        <rect x="-5" rx="0" antialias="false" y="-5" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="30" ry="0"/>
        <rect x="2" rx="0" antialias="false" y="13" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="12" ry="0"/>
        <line length2="1.5" x1="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-10" y2="20" y1="0"/>
        <rect x="2" rx="0" antialias="false" y="-5" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="12" ry="0"/>
        <line length2="1.5" x1="10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="10" y2="20" y1="0"/>
        <arc x="-10" start="180" antialias="true" y="10" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" angle="180"/>
        <line length2="1.5" x1="5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="20" y2="20" y1="20"/>
        <line length2="1.5" x1="-20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-5" y2="0" y1="0"/>
        <line length2="1.5" x1="5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="20" y2="0" y1="0"/>
        <line length2="1.5" x1="10" antialias="false" style="line-style:normal;line-weight:hight;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-10" y2="25" y1="15"/>
        <terminal x="20" y="20" orientation="e"/>
        <terminal x="-20" y="0" orientation="w"/>
        <terminal x="20" y="0" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_mb_sm_top_i.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_mb_sm_top_i.elmt
@@ -1,25 +0,0 @@
 <definition hotspot_y="15" width="50" orientation="dyyy" height="50" version="0.70" hotspot_x="24" link_type="simple" type="element">
    <uuid uuid="{affc73ff-2963-4d34-911d-da56d8ba6452}"/>
    <names>
        <name lang="en">Switch on Score Motor (M.B.) - Top input - Inverted</name>
        <name lang="nl">Schakelaar op Score Motor (M.B.) - Input boven - Omgekeerd</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect x="-5" rx="0" antialias="false" y="-5" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="30" ry="0"/>
        <arc x="-10" start="0" antialias="true" y="-10" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" angle="180"/>
        <rect x="2" rx="0" antialias="false" y="13" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="12" ry="0"/>
        <line length2="1.5" x1="-10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-10" y2="20" y1="0"/>
        <rect x="2" rx="0" antialias="false" y="-5" width="3" style="line-style:normal;line-weight:normal;filling:black;color:black" height="12" ry="0"/>
        <line length2="1.5" x1="10" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="10" y2="20" y1="0"/>
        <line length2="1.5" x1="5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="20" y2="20" y1="20"/>
        <arc x="-10" start="180" antialias="true" y="10" width="20" style="line-style:normal;line-weight:normal;filling:none;color:black" height="20" angle="180"/>
        <line length2="1.5" x1="-20" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-5" y2="0" y1="0"/>
        <line length2="1.5" x1="5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="20" y2="0" y1="0"/>
        <line length2="1.5" x1="10" antialias="false" style="line-style:normal;line-weight:hight;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-10" y2="5.25" y1="-4.75"/>
        <terminal x="20" y="20" orientation="e"/>
        <terminal x="-20" y="0" orientation="w"/>
        <terminal x="20" y="0" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_nc_sm.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_nc_sm.elmt
@@ -1,19 +0,0 @@
 <definition hotspot_x="24" height="30" type="element" width="50" hotspot_y="15" version="0.70" link_type="simple" orientation="dyyy">
    <uuid uuid="{b1b5df82-b447-41d7-bf0c-28d7301821af}"/>
    <names>
        <name lang="nl">Schakelaar op Score Motor (N.C.)</name>
        <name lang="en">Switch on Score Motor (N.C.)</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect height="10" style="line-style:normal;line-weight:normal;filling:black;color:black" width="3" y="-5" ry="0" rx="0" x="-5" antialias="false"/>
        <rect height="10" style="line-style:normal;line-weight:normal;filling:black;color:black" width="3" y="-5" ry="0" rx="0" x="2" antialias="false"/>
        <line style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" end1="none" length2="1.5" y2="0" end2="none" y1="0" x2="20" length1="1.5" antialias="false"/>
        <line style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-5" end1="none" length2="1.5" y2="0" end2="none" y1="0" x2="-20" length1="1.5" antialias="false"/>
        <line style="line-style:normal;line-weight:hight;filling:none;color:black" x1="10" end1="none" length2="1.5" y2="5" end2="none" y1="-5" x2="-10" length1="1.5" antialias="false"/>
        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" y="-10" x="-10" antialias="false"/>
        <terminal y="0" x="-20" orientation="w"/>
        <terminal y="0" x="20" orientation="e"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_no_sm.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/pinball_em_williams_switch_no_sm.elmt
@@ -1,18 +0,0 @@
 <definition hotspot_x="24" height="30" type="element" width="50" hotspot_y="15" version="0.70" link_type="simple" orientation="dyyy">
    <uuid uuid="{cf1b5449-9964-4d90-8114-a131a53ce467}"/>
    <names>
        <name lang="nl">Schakelaar op Score Motor (N.O.)</name>
        <name lang="en">Switch on Score Motor (N.O.)</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <rect height="10" style="line-style:normal;line-weight:normal;filling:black;color:black" width="3" y="-5" ry="0" rx="0" x="-5" antialias="false"/>
        <rect height="10" style="line-style:normal;line-weight:normal;filling:black;color:black" width="3" y="-5" ry="0" rx="0" x="2" antialias="false"/>
        <line style="line-style:normal;line-weight:normal;filling:none;color:black" x1="-20" end1="none" length2="1.5" y2="0" end2="none" y1="0" x2="-5" length1="1.5" antialias="false"/>
        <line style="line-style:normal;line-weight:normal;filling:none;color:black" x1="5" end1="none" length2="1.5" y2="0" end2="none" y1="0" x2="20" length1="1.5" antialias="false"/>
        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="20" y="-10" x="-10" antialias="false"/>
        <terminal y="0" x="20" orientation="e"/>
        <terminal y="0" x="-20" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/qet_directory
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/switches_score_motor/qet_directory
@@ -1,6 +0,0 @@
 <qet-directory>
    <names>
        <name lang="nl">Schakelaars - Score Motor</name>
        <name lang="en">Switches - Score Motor</name>
    </names>
 </qet-directory>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/qet_directory
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/qet_directory
@@ -1,6 +0,0 @@
 <qet-directory>
    <names>
        <name lang="en">Units</name>
        <name lang="nl">Units</name>
    </names>
 </qet-directory>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_between/pinball_em_williams_unit_wiper_between_04.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_between/pinball_em_williams_unit_wiper_between_04.elmt
@@ -1,39 +0,0 @@
 <definition hotspot_y="15" width="70" orientation="dyyy" height="90" version="0.70" hotspot_x="34" link_type="simple" type="element">
    <uuid uuid="{aac95ab4-e46a-401d-90c6-0564253d0711}"/>
    <names>
        <name lang="en">Wiper between 4 contact pairs</name>
        <name lang="nl">Sleepcontact tussen 4 contactparen</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <circle x="5" antialias="false" y="35" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="5" antialias="false" y="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="5" antialias="false" y="55" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="5" antialias="false" y="15" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <rect x="-20" rx="0" antialias="false" y="-10" width="40" style="line-style:normal;line-weight:normal;filling:none;color:black" height="80" ry="0"/>
        <circle x="-15" antialias="false" y="55" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="35" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="15" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="-5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="5" y2="0" y1="0"/>
        <line length2="1.5" x1="15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="0" y1="0"/>
        <line length2="1.5" x1="15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="20" y1="20"/>
        <line length2="1.5" x1="15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="40" y1="40"/>
        <line length2="1.5" x1="15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="60" y1="60"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-16" y2="0" y1="0"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="20" y1="20"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-16" y2="40" y1="40"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-16" y2="60" y1="60"/>
        <polygon x1="-5" y4="0" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x2="-2" y2="-3" x3="-2" y1="0" x4="-5" y3="3"/>
        <polygon x1="2" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x2="5" y2="0" x3="2" y1="-3" y3="3"/>
        <terminal x="30" y="0" orientation="e"/>
        <terminal x="30" y="60" orientation="e"/>
        <terminal x="-30" y="20" orientation="w"/>
        <terminal x="30" y="20" orientation="e"/>
        <terminal x="30" y="40" orientation="e"/>
        <terminal x="-30" y="0" orientation="w"/>
        <terminal x="-30" y="60" orientation="w"/>
        <terminal x="-30" y="40" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_between/pinball_em_williams_unit_wiper_between_10.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_between/pinball_em_williams_unit_wiper_between_10.elmt
@@ -1,75 +0,0 @@
 <definition hotspot_y="15" width="70" orientation="dyyy" height="210" version="0.70" hotspot_x="34" link_type="simple" type="element">
    <uuid uuid="{a7798588-80e2-4689-8a35-5a1b9459b69b}"/>
    <names>
        <name lang="en">Wiper between 10 contact pairs</name>
        <name lang="nl">Sleepcontact tussen 10 contactparen</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <circle x="5" antialias="false" y="155" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="5" antialias="false" y="35" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="5" antialias="false" y="95" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="5" antialias="false" y="115" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="5" antialias="false" y="175" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="5" antialias="false" y="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="5" antialias="false" y="135" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="5" antialias="false" y="55" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="5" antialias="false" y="75" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="5" antialias="false" y="15" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="115" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="175" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="95" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <rect x="-20" rx="0" antialias="false" y="-10" width="40" style="line-style:normal;line-weight:normal;filling:none;color:black" height="200" ry="0"/>
        <circle x="-15" antialias="false" y="155" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="135" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="75" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="55" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="140" y1="140"/>
        <circle x="-15" antialias="false" y="35" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="80" y1="80"/>
        <circle x="-15" antialias="false" y="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="160" y1="160"/>
        <line length2="1.5" x1="15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="100" y1="100"/>
        <circle x="-15" antialias="false" y="15" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="180" y1="180"/>
        <line length2="1.5" x1="15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="120" y1="120"/>
        <line length2="1.5" x1="-5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="5" y2="0" y1="0"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="80" y1="80"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="140" y1="140"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-16" y2="160" y1="160"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-16" y2="100" y1="100"/>
        <line length2="1.5" x1="15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="0" y1="0"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-16" y2="120" y1="120"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-16" y2="180" y1="180"/>
        <line length2="1.5" x1="15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="20" y1="20"/>
        <line length2="1.5" x1="15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="40" y1="40"/>
        <line length2="1.5" x1="15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="60" y1="60"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-16" y2="0" y1="0"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="20" y1="20"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-16" y2="40" y1="40"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-16" y2="60" y1="60"/>
        <polygon x1="-5" y4="0" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x2="-2" y2="-3" x3="-2" y1="0" x4="-5" y3="3"/>
        <polygon x1="2" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x2="5" y2="0" x3="2" y1="-3" y3="3"/>
        <terminal x="30" y="120" orientation="e"/>
        <terminal x="-30" y="80" orientation="w"/>
        <terminal x="-30" y="120" orientation="w"/>
        <terminal x="-30" y="100" orientation="w"/>
        <terminal x="30" y="80" orientation="e"/>
        <terminal x="30" y="100" orientation="e"/>
        <terminal x="-30" y="0" orientation="w"/>
        <terminal x="30" y="0" orientation="e"/>
        <terminal x="-30" y="20" orientation="w"/>
        <terminal x="-30" y="60" orientation="w"/>
        <terminal x="-30" y="40" orientation="w"/>
        <terminal x="30" y="20" orientation="e"/>
        <terminal x="30" y="60" orientation="e"/>
        <terminal x="30" y="40" orientation="e"/>
        <terminal x="-30" y="160" orientation="w"/>
        <terminal x="-30" y="180" orientation="w"/>
        <terminal x="30" y="140" orientation="e"/>
        <terminal x="30" y="180" orientation="e"/>
        <terminal x="30" y="160" orientation="e"/>
        <terminal x="-30" y="140" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_between/pinball_em_williams_wiper_3_between_3.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_between/pinball_em_williams_wiper_3_between_3.elmt
@@ -1,39 +0,0 @@
 <definition hotspot_y="15" width="70" orientation="dyyy" height="130" version="0.70" hotspot_x="34" link_type="simple" type="element">
    <uuid uuid="{e2c18efc-1f4f-45cb-a814-09c1b5554535}"/>
    <names>
        <name lang="en">3 wipers between 3 contact pairs</name>
        <name lang="nl">3 sleepcontacten tussen 3 contactparen</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <line length2="1.5" x1="-5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="5" y2="40" y1="40"/>
        <line length2="1.5" x1="-5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="5" y2="20" y1="20"/>
        <circle x="5" antialias="false" y="75" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <polygon x1="-5" y4="20" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x2="-2" y2="17" x3="-2" y1="20" x4="-5" y3="23"/>
        <polygon x1="-5" y4="40" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x2="-2" y2="37" x3="-2" y1="40" x4="-5" y3="43"/>
        <polygon x1="2" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x2="5" y2="40" x3="2" y1="37" y3="43"/>
        <polygon x1="2" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x2="5" y2="20" x3="2" y1="17" y3="23"/>
        <circle x="5" antialias="false" y="95" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="5" antialias="false" y="55" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <rect x="-20" rx="0" antialias="false" y="-10" width="40" style="line-style:normal;line-weight:normal;filling:none;color:black" height="120" ry="0"/>
        <circle x="-15" antialias="false" y="95" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="75" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="55" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="-5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="5" y2="0" y1="0"/>
        <line length2="1.5" x1="15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="60" y1="60"/>
        <line length2="1.5" x1="15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="80" y1="80"/>
        <line length2="1.5" x1="15" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="100" y1="100"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="60" y1="60"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-16" y2="80" y1="80"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-16" y2="100" y1="100"/>
        <polygon x1="-5" y4="0" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x2="-2" y2="-3" x3="-2" y1="0" x4="-5" y3="3"/>
        <polygon x1="2" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x2="5" y2="0" x3="2" y1="-3" y3="3"/>
        <terminal x="30" y="100" orientation="e"/>
        <terminal x="-30" y="80" orientation="w"/>
        <terminal x="-30" y="60" orientation="w"/>
        <terminal x="30" y="60" orientation="e"/>
        <terminal x="30" y="80" orientation="e"/>
        <terminal x="-30" y="100" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_between/qet_directory
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_between/qet_directory
@@ -1,6 +0,0 @@
 <qet-directory>
    <names>
        <name lang="en">Wiper between</name>
        <name lang="nl">Sleepcontact tussen</name>
    </names>
 </qet-directory>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/pinball_em_williams_unit_wiper_to_02.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/pinball_em_williams_unit_wiper_to_02.elmt
@@ -1,21 +0,0 @@
 <definition hotspot_y="15" width="70" orientation="dyyy" height="50" version="0.70" hotspot_x="34" link_type="simple" type="element">
    <uuid uuid="{292efe3b-b14f-4bf4-b666-7edcff8c76e6}"/>
    <names>
        <name lang="en">Wiper to 2 contacts</name>
        <name lang="nl">Sleepcontact naar 2 polen</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <circle x="-15" antialias="false" y="15" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <rect x="-20" rx="0" antialias="false" y="-10" width="40" style="line-style:normal;line-weight:normal;filling:none;color:black" height="40" ry="0"/>
        <circle x="-15" antialias="false" y="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="0" y1="0"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="20" y1="20"/>
        <line length2="1.5" x1="-5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="0" y1="0"/>
        <polygon x1="-2" y4="-3" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x2="-2" y2="3" x3="-5" y1="-3" x4="-2" y3="0"/>
        <terminal x="30" y="0" orientation="e"/>
        <terminal x="-30" y="20" orientation="w"/>
        <terminal x="-30" y="0" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/pinball_em_williams_unit_wiper_to_03.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/pinball_em_williams_unit_wiper_to_03.elmt
@@ -1,24 +0,0 @@
 <definition hotspot_y="15" width="70" orientation="dyyy" height="70" version="0.70" hotspot_x="34" link_type="simple" type="element">
    <uuid uuid="{b1ae72b5-69cf-4f1a-b618-8f5d4e0b55c6}"/>
    <names>
        <name lang="en">Wiper to 3 contacts</name>
        <name lang="nl">Sleepcontact naar 3 polen</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <circle x="-15" antialias="false" y="15" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="35" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <rect x="-20" rx="0" antialias="false" y="-10" width="40" style="line-style:normal;line-weight:normal;filling:none;color:black" height="60" ry="0"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="40" y1="40"/>
        <circle x="-15" antialias="false" y="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="0" y1="0"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="20" y1="20"/>
        <line length2="1.5" x1="-5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="0" y1="0"/>
        <polygon x1="-2" y4="-3" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x2="-2" y2="3" x3="-5" y1="-3" x4="-2" y3="0"/>
        <terminal x="30" y="0" orientation="e"/>
        <terminal x="-30" y="20" orientation="w"/>
        <terminal x="-30" y="0" orientation="w"/>
        <terminal x="-30" y="40" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/pinball_em_williams_unit_wiper_to_04.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/pinball_em_williams_unit_wiper_to_04.elmt
@@ -1,27 +0,0 @@
 <definition hotspot_y="15" width="70" orientation="dyyy" height="90" version="0.70" hotspot_x="34" link_type="simple" type="element">
    <uuid uuid="{c8f0c752-3215-409d-96f5-0dee5f6f89c5}"/>
    <names>
        <name lang="en">Wiper to 4 contacts</name>
        <name lang="nl">Sleepcontact naar 4 polen</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <circle x="-15" antialias="false" y="55" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="15" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="35" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="60" y1="60"/>
        <rect x="-20" rx="0" antialias="false" y="-10" width="40" style="line-style:normal;line-weight:normal;filling:none;color:black" height="80" ry="0"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="40" y1="40"/>
        <circle x="-15" antialias="false" y="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="0" y1="0"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="20" y1="20"/>
        <line length2="1.5" x1="-5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="0" y1="0"/>
        <polygon x1="-2" y4="-3" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x2="-2" y2="3" x3="-5" y1="-3" x4="-2" y3="0"/>
        <terminal x="-30" y="60" orientation="w"/>
        <terminal x="-30" y="20" orientation="w"/>
        <terminal x="30" y="0" orientation="e"/>
        <terminal x="-30" y="40" orientation="w"/>
        <terminal x="-30" y="0" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/pinball_em_williams_unit_wiper_to_05.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/pinball_em_williams_unit_wiper_to_05.elmt
@@ -1,30 +0,0 @@
 <definition hotspot_y="15" width="70" orientation="dyyy" height="110" version="0.70" hotspot_x="34" link_type="simple" type="element">
    <uuid uuid="{4f2df3dd-0521-4ed2-879c-e2ad597ab05a}"/>
    <names>
        <name lang="en">Wiper to 5 contacts</name>
        <name lang="nl">Sleepcontact naar 5 polen</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <circle x="-15" antialias="false" y="75" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="55" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="80" y1="80"/>
        <circle x="-15" antialias="false" y="15" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="35" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="60" y1="60"/>
        <rect x="-20" rx="0" antialias="false" y="-10" width="40" style="line-style:normal;line-weight:normal;filling:none;color:black" height="100" ry="0"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="40" y1="40"/>
        <circle x="-15" antialias="false" y="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="0" y1="0"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="20" y1="20"/>
        <line length2="1.5" x1="-5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="0" y1="0"/>
        <polygon x1="-2" y4="-3" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x2="-2" y2="3" x3="-5" y1="-3" x4="-2" y3="0"/>
        <terminal x="-30" y="40" orientation="w"/>
        <terminal x="-30" y="0" orientation="w"/>
        <terminal x="-30" y="20" orientation="w"/>
        <terminal x="30" y="0" orientation="e"/>
        <terminal x="-30" y="60" orientation="w"/>
        <terminal x="-30" y="80" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/pinball_em_williams_unit_wiper_to_06.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/pinball_em_williams_unit_wiper_to_06.elmt
@@ -1,33 +0,0 @@
 <definition hotspot_y="15" width="70" orientation="dyyy" height="130" version="0.70" hotspot_x="34" link_type="simple" type="element">
    <uuid uuid="{eb3e79b4-1f02-4044-a625-4bdd2440e827}"/>
    <names>
        <name lang="en">Wiper to 6 contacts</name>
        <name lang="nl">Sleepcontact naar 6 polen</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <circle x="-15" antialias="false" y="75" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="95" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="55" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="100" y1="100"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="80" y1="80"/>
        <circle x="-15" antialias="false" y="15" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="35" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="60" y1="60"/>
        <rect x="-20" rx="0" antialias="false" y="-10" width="40" style="line-style:normal;line-weight:normal;filling:none;color:black" height="120" ry="0"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="40" y1="40"/>
        <circle x="-15" antialias="false" y="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="0" y1="0"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="20" y1="20"/>
        <line length2="1.5" x1="-5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="0" y1="0"/>
        <polygon x1="-2" y4="-3" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x2="-2" y2="3" x3="-5" y1="-3" x4="-2" y3="0"/>
        <terminal x="-30" y="100" orientation="w"/>
        <terminal x="-30" y="40" orientation="w"/>
        <terminal x="-30" y="0" orientation="w"/>
        <terminal x="-30" y="20" orientation="w"/>
        <terminal x="30" y="0" orientation="e"/>
        <terminal x="-30" y="80" orientation="w"/>
        <terminal x="-30" y="60" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/pinball_em_williams_unit_wiper_to_10.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/pinball_em_williams_unit_wiper_to_10.elmt
@@ -1,45 +0,0 @@
 <definition hotspot_y="15" width="70" orientation="dyyy" height="210" version="0.70" hotspot_x="34" link_type="simple" type="element">
    <uuid uuid="{f152f6a0-17e9-4590-879e-9c6a360d2903}"/>
    <names>
        <name lang="en">Wiper to 10 contacts</name>
        <name lang="nl">Sleepcontact naar 10 polen</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <circle x="-15" antialias="false" y="155" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="75" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="175" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="95" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="135" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="55" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="100" y1="100"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="180" y1="180"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="160" y1="160"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="80" y1="80"/>
        <circle x="-15" antialias="false" y="115" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="15" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="140" y1="140"/>
        <circle x="-15" antialias="false" y="35" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="120" y1="120"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="60" y1="60"/>
        <rect x="-20" rx="0" antialias="false" y="-10" width="40" style="line-style:normal;line-weight:normal;filling:none;color:black" height="200" ry="0"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="40" y1="40"/>
        <circle x="-15" antialias="false" y="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="0" y1="0"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="20" y1="20"/>
        <line length2="1.5" x1="-5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="0" y1="0"/>
        <polygon x1="-2" y4="-3" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x2="-2" y2="3" x3="-5" y1="-3" x4="-2" y3="0"/>
        <terminal x="-30" y="40" orientation="w"/>
        <terminal x="-30" y="20" orientation="w"/>
        <terminal x="30" y="0" orientation="e"/>
        <terminal x="-30" y="0" orientation="w"/>
        <terminal x="-30" y="60" orientation="w"/>
        <terminal x="-30" y="80" orientation="w"/>
        <terminal x="-30" y="100" orientation="w"/>
        <terminal x="-30" y="120" orientation="w"/>
        <terminal x="-30" y="140" orientation="w"/>
        <terminal x="-30" y="160" orientation="w"/>
        <terminal x="-30" y="180" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/pinball_em_williams_unit_wiper_to_11.elmt
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/pinball_em_williams_unit_wiper_to_11.elmt
@@ -1,48 +0,0 @@
 <definition hotspot_y="15" width="70" orientation="dyyy" height="230" version="0.70" hotspot_x="34" link_type="simple" type="element">
    <uuid uuid="{36c95bf0-254c-4d0a-81af-866db548ae97}"/>
    <names>
        <name lang="en">Wiper to 11 contacts</name>
        <name lang="nl">Sleepcontact naar 11 polen</name>
    </names>
    <elementInformations/>
    <informations></informations>
    <description>
        <circle x="-15" antialias="false" y="195" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="155" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="75" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="200" y1="200"/>
        <circle x="-15" antialias="false" y="175" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="95" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="135" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="55" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="100" y1="100"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="180" y1="180"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="160" y1="160"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="80" y1="80"/>
        <circle x="-15" antialias="false" y="115" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <circle x="-15" antialias="false" y="15" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="140" y1="140"/>
        <circle x="-15" antialias="false" y="35" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="120" y1="120"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="60" y1="60"/>
        <rect x="-20" rx="0" antialias="false" y="-10" width="40" style="line-style:normal;line-weight:normal;filling:none;color:black" height="220" ry="0"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="40" y1="40"/>
        <circle x="-15" antialias="false" y="-5" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="10"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="0" y1="0"/>
        <line length2="1.5" x1="-30" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="-15" y2="20" y1="20"/>
        <line length2="1.5" x1="-5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" length1="1.5" end1="none" end2="none" x2="30" y2="0" y1="0"/>
        <polygon x1="-2" y4="-3" antialias="false" style="line-style:normal;line-weight:normal;filling:black;color:black" x2="-2" y2="3" x3="-5" y1="-3" x4="-2" y3="0"/>
        <terminal x="-30" y="140" orientation="w"/>
        <terminal x="-30" y="160" orientation="w"/>
        <terminal x="30" y="0" orientation="e"/>
        <terminal x="-30" y="60" orientation="w"/>
        <terminal x="-30" y="80" orientation="w"/>
        <terminal x="-30" y="0" orientation="w"/>
        <terminal x="-30" y="40" orientation="w"/>
        <terminal x="-30" y="120" orientation="w"/>
        <terminal x="-30" y="100" orientation="w"/>
        <terminal x="-30" y="20" orientation="w"/>
        <terminal x="-30" y="180" orientation="w"/>
        <terminal x="-30" y="200" orientation="w"/>
    </description>
 </definition>
--- a/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/qet_directory
+++ b/elements/10_electric/20_manufacturers_articles/pinball/williams_em/units/wiper_to/qet_directory
@@ -1,6 +0,0 @@
 <qet-directory>
    <names>
        <name lang="en">Wiper to</name>
        <name lang="nl">Sleepcontact naar</name>
    </names>
 </qet-directory>
--- a/examples/pinball_williams_em.qet
+++ b/examples/pinball_williams_em.qet
--- a/sources/QetGraphicsItemModeler/qetgraphicshandleritem.h
+++ b/sources/QetGraphicsItemModeler/qetgraphicshandleritem.h
@@ -53,7 +53,7 @@ class QetGraphicsHandlerItem : public QGraphicsItem
 		QRectF m_handler_rect,
 			   m_br;
 		qreal m_size;
-		QColor m_color{Qt::black};
+		QColor m_color;
 		QPen m_pen;
 	public:
--- a/sources/borderproperties.cpp
+++ b/sources/borderproperties.cpp
@@ -16,7 +16,6 @@
 	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "borderproperties.h"
 #include "qetxml.h"
 /**
 	@brief BorderProperties::BorderProperties
@@ -26,14 +25,22 @@
 	Initializes a BorderProperties object
 	with the following default properties:
 	- 17 columns of 60.0 px wide by 20.0px high
-	- 8	lines of 80.0 px high by 20.0px wide
+	- 8    lines of 80.0 px high by 20.0px wide
 	\~French Initialise un objet BorderProperties avec les proprietes par
 	defaut suivantes :
 	- 17 colonnes affichees de 60.0 px de large pour 20.0px de haut
-	- 8	lignes affichees de 80.0 px de haut pour 20.0px de large
+	- 8    lignes affichees de 80.0 px de haut pour 20.0px de large
 */
-BorderProperties::BorderProperties(): PropertiesInterface("border")
+BorderProperties::BorderProperties() :
 	columns_count(17),
 	columns_width(60.0),
 	columns_header_height(20.0),
 	display_columns(true),
 	rows_count(8),
 	rows_height(80.0),
 	rows_header_width(20.0),
 	display_rows(true)
 {
 }
@@ -81,7 +88,7 @@ bool BorderProperties::operator!=(const BorderProperties &bp) {
 }
 /**
-    @brief BorderProperties::toXmlPriv
+	@brief BorderProperties::toXml
 	Exports dimensions as XML attributes added to element e.
 	\~French Exporte les dimensions sous formes d'attributs XML ajoutes a l'element e.
@@ -89,17 +96,18 @@ bool BorderProperties::operator!=(const BorderProperties &bp) {
 	XML element to which attributes will be added
 	\~French Element XML auquel seront ajoutes des attributs
 */
-void BorderProperties::toXmlPriv(QDomElement& e) const {
+void BorderProperties::toXml(QDomElement &e) const
-    e.setAttribute("cols",        columns_count);
+{
-    e.setAttribute("colsize",     QString("%1").arg(columns_width));
+	e.setAttribute("cols",        columns_count);
-    e.setAttribute("rows",        rows_count);
+	e.setAttribute("colsize",     QString("%1").arg(columns_width));
-    e.setAttribute("rowsize",     QString("%1").arg(rows_height));
+	e.setAttribute("rows",        rows_count);
-    e.setAttribute("displaycols", display_columns ? "true" : "false");
+	e.setAttribute("rowsize",     QString("%1").arg(rows_height));
-    e.setAttribute("displayrows", display_rows    ? "true" : "false");
+	e.setAttribute("displaycols", display_columns ? "true" : "false");
 	e.setAttribute("displayrows", display_rows    ? "true" : "false");
 }
-/*!RETURNS True
+/**
-    @brief BorderProperties::fromXmlPriv
+	@brief BorderProperties::fromXml
 	Import dimensions from XML attributes of element e
 	\~French Importe les dimensions a partir des attributs XML de l'element e
@@ -107,29 +115,13 @@ void BorderProperties::toXmlPriv(QDomElement& e) const {
 	XML element whose attributes will be read
 	\~French Element XML dont les attributs seront lus
 */
-bool BorderProperties::fromXmlPriv(const QDomElement &e) {
+void BorderProperties::fromXml(QDomElement &e) {
-
+	if (e.hasAttribute("cols"))        columns_count   = e.attribute("cols").toInt();
-    if (QETXML::propertyInteger(e, "cols", &columns_count) == QETXML::PropertyFlags::NoValidConversion ||
+	if (e.hasAttribute("colsize"))     columns_width   = e.attribute("colsize").toInt();
-        QETXML::propertyDouble(e, "colsize", &columns_width) == QETXML::PropertyFlags::NoValidConversion ||
+	if (e.hasAttribute("rows"))        rows_count      = e.attribute("rows").toInt();
-        QETXML::propertyInteger(e, "rows", &rows_count) == QETXML::PropertyFlags::NoValidConversion ||
+	if (e.hasAttribute("rowsize"))     rows_height     = e.attribute("rowsize").toInt();
-        QETXML::propertyDouble(e, "rowsize", &rows_height) == QETXML::PropertyFlags::NoValidConversion ||
+	if (e.hasAttribute("displaycols")) display_columns = e.attribute("displaycols") == "true";
-        QETXML::propertyBool(e, "displaycols", &display_columns) == QETXML::PropertyFlags::NoValidConversion ||
+	if (e.hasAttribute("displayrows")) display_rows    = e.attribute("displayrows") == "true";
        QETXML::propertyBool(e, "displayrows", &display_rows) == QETXML::PropertyFlags::NoValidConversion)
 		return false;
 	return true;
 }
 bool BorderProperties::valideXml(QDomElement& e) {
    if (QETXML::propertyInteger(e, "cols") == QETXML::PropertyFlags::Success ||
        QETXML::propertyDouble(e, "colsize") == QETXML::PropertyFlags::Success ||
        QETXML::propertyInteger(e, "rows") == QETXML::PropertyFlags::Success ||
        QETXML::propertyDouble(e, "rowsize") == QETXML::PropertyFlags::Success ||
        QETXML::propertyBool(e, "displaycols") == QETXML::PropertyFlags::Success ||
        QETXML::propertyBool(e, "displayrows") == QETXML::PropertyFlags::Success)
 		return true;
 	return false;
 }
 /**
@@ -146,11 +138,11 @@ bool BorderProperties::valideXml(QDomElement& e) {
 */
 void BorderProperties::toSettings(QSettings &settings, const QString &prefix) const
 {
-	settings.setValue(prefix + "cols",		columns_count);
+	settings.setValue(prefix + "cols",        columns_count);
-	settings.setValue(prefix + "colsize",	 columns_width);
+	settings.setValue(prefix + "colsize",     columns_width);
 	settings.setValue(prefix + "displaycols", display_columns);
-	settings.setValue(prefix + "rows",		rows_count);
+	settings.setValue(prefix + "rows",        rows_count);
-	settings.setValue(prefix + "rowsize",	 rows_height);
+	settings.setValue(prefix + "rowsize",     rows_height);
 	settings.setValue(prefix + "displayrows", display_rows);
 }
@@ -164,13 +156,13 @@ void BorderProperties::toSettings(QSettings &settings, const QString &prefix) co
 	\~French prefixe a ajouter devant les noms des parametres
 */
 void BorderProperties::fromSettings(QSettings &settings, const QString &prefix) {
-	columns_count   = settings.value(prefix + "cols",			columns_count).toInt();
+	columns_count   = settings.value(prefix + "cols",            columns_count).toInt();
 	columns_width   = qRound(settings.value(prefix + "colsize",  columns_width).toDouble());
-	display_columns = settings.value(prefix + "displaycols",	 display_columns).toBool();
+	display_columns = settings.value(prefix + "displaycols",     display_columns).toBool();
-	rows_count	  = settings.value(prefix + "rows",			rows_count).toInt();
+	rows_count      = settings.value(prefix + "rows",            rows_count).toInt();
-	rows_height	 = qRound(settings.value(prefix + "rowsize",  rows_height).toDouble());
+	rows_height     = qRound(settings.value(prefix + "rowsize",  rows_height).toDouble());
-	display_rows	= settings.value(prefix + "displayrows",	 display_rows).toBool();
+	display_rows    = settings.value(prefix + "displayrows",     display_rows).toBool();
 }
 /**
--- a/sources/borderproperties.h
+++ b/sources/borderproperties.h
@@ -20,15 +20,13 @@
 #include <QtCore>
 #include <QtXml>
 #include "properties/propertiesinterface.h"
 /**
 	@brief The BorderProperties class
 	This class is a container for dimensions and display properties of a
 	diagram.
 	@remark Attributes are public
 */
-class BorderProperties : public PropertiesInterface {
+class BorderProperties {
 	public:
 		// constructor, destructor, operators
 		BorderProperties();
@@ -37,23 +35,22 @@ class BorderProperties : public PropertiesInterface {
 		bool operator==(const BorderProperties &);
 		bool operator!=(const BorderProperties &);
-		void toXmlPriv(QDomElement&) const override;
+		void toXml(QDomElement &) const;
-        bool fromXmlPriv(const QDomElement &) override;
+		void fromXml(QDomElement &);
-		static bool valideXml(QDomElement& e);
+		void toSettings(QSettings &, const QString & = QString()) const;
-        void toSettings(QSettings &, const QString & = QString()) const override;
+		void fromSettings(QSettings &, const QString & = QString());
        void fromSettings(QSettings &, const QString & = QString()) override;
 		static BorderProperties defaultProperties();
 		// attributes
-		int columns_count{17};			///< Columns count
+		int columns_count;            ///< Columns count
-		qreal columns_width{60.0};		  ///< Columns width
+		qreal columns_width;          ///< Columns width
-		qreal columns_header_height{20.0};  ///< Column headers height
+		qreal columns_header_height;  ///< Column headers height
-		bool display_columns{true};		 ///< Whether to display column headers
+		bool display_columns;         ///< Whether to display column headers
-		int rows_count{8};			   ///< Rows count
+		int rows_count;               ///< Rows count
-		qreal rows_height{80.0};			///< Rows height
+		qreal rows_height;            ///< Rows height
-		qreal rows_header_width{20.0};	  ///< Row headers width
+		qreal rows_header_width;      ///< Row headers width
-		bool display_rows{true};			///< Whether to display row headers
+		bool display_rows;            ///< Whether to display row headers
 };
 #endif
--- a/sources/bordertitleblock.cpp
+++ b/sources/bordertitleblock.cpp
@@ -65,6 +65,8 @@ BorderTitleBlock::BorderTitleBlock(QObject *parent) :
 	// contenu par defaut du cartouche
 	importTitleBlock(TitleBlockProperties());
 	display_titleblock_ = true;
 	display_border_ = true;
 	setFolioData(1, 1);
 	updateRectangles();
 }
@@ -85,14 +87,14 @@ QRectF BorderTitleBlock::titleBlockRect() const
 {
 	if (m_edge == Qt::BottomEdge)
 		return QRectF(diagram_rect_.bottomLeft(),
-				  QSize(diagram_rect_.width(),
+			      QSize(diagram_rect_.width(),
-					m_titleblock_template_renderer -> height()
+				    m_titleblock_template_renderer -> height()
-					));
+				    ));
 	else
 		return QRectF(diagram_rect_.topRight(),
-				  QSize(m_titleblock_template_renderer -> height(),
+			      QSize(m_titleblock_template_renderer -> height(),
-					diagram_rect_.height()
+				    diagram_rect_.height()
-					));
+				    ));
 }
 /**
@@ -123,9 +125,9 @@ QRectF BorderTitleBlock::titleBlockRectForQPainter() const
 		return titleBlockRect();
 	else
 		return QRectF (diagram_rect_.bottomRight(),
-				   QSize(diagram_rect_.height(),
+			       QSize(diagram_rect_.height(),
-					 m_titleblock_template_renderer -> height()
+				     m_titleblock_template_renderer -> height()
-					 ));
+				     ));
 }
@@ -149,9 +151,9 @@ QRectF BorderTitleBlock::columnsRect() const
 {
 	if (!display_columns_) return QRectF();
 	return QRectF (Diagram::margin,
-			   Diagram::margin,
+		       Diagram::margin,
-			   (columns_count_*columns_width_) + rows_header_width_,
+		       (columns_count_*columns_width_) + rows_header_width_,
-			   columns_header_height_);
+		       columns_header_height_);
 }
 /**
@@ -163,9 +165,9 @@ QRectF BorderTitleBlock::rowsRect() const
 {
 	if (!display_rows_) return QRectF();
 	return QRectF (Diagram::margin,
-			   Diagram::margin,
+		       Diagram::margin,
-			   rows_header_width_,
+		       rows_header_width_,
-			   (rows_count_*rows_height_) + columns_header_height_);
+		       (rows_count_*rows_height_) + columns_header_height_);
 }
 /**
@@ -176,9 +178,9 @@ QRectF BorderTitleBlock::rowsRect() const
 QRectF BorderTitleBlock::outsideBorderRect() const
 {
 	return QRectF (Diagram::margin,
-			   Diagram::margin,
+		       Diagram::margin,
-			   (columns_width_*columns_count_) + rows_header_width_,
+		       (columns_width_*columns_count_) + rows_header_width_,
-			   (rows_height_*rows_count_) + columns_header_height_);
+		       (rows_height_*rows_count_) + columns_header_height_);
 }
 /**
@@ -205,8 +207,8 @@ QRectF BorderTitleBlock::insideBorderRect() const
 	Exports the title block current values to XML.
 	@param xml_elmt the XML element attributes will be added to
 */
-QDomElement BorderTitleBlock::titleBlockToXml(QDomDocument& doc) {
+void BorderTitleBlock::titleBlockToXml(QDomElement &xml_elmt) {
-    return exportTitleBlock().toXml(doc);
+	exportTitleBlock().toXml(xml_elmt);
 }
 /**
@@ -215,23 +217,9 @@ QDomElement BorderTitleBlock::titleBlockToXml(QDomDocument& doc) {
 	@param xml_elmt the XML element values will be read from
 */
 void BorderTitleBlock::titleBlockFromXml(const QDomElement &xml_elmt) {
-
+	TitleBlockProperties tbp;
-    TitleBlockProperties tbp;
+	tbp.fromXml(xml_elmt);
-    QString tagname = tbp.tagName();
+	importTitleBlock(tbp);
    QDomElement titleBlockProperties = xml_elmt.firstChildElement(tagname);
    if (!titleBlockProperties.isNull())
    {
        tbp.fromXml(titleBlockProperties);
        importTitleBlock(tbp);
    }
    else
    {
        // legacy
        // Remove this part in a later step
        tbp.fromXml(xml_elmt);
        importTitleBlock(tbp);
    }
 }
 /**
@@ -240,12 +228,12 @@ void BorderTitleBlock::titleBlockFromXml(const QDomElement &xml_elmt) {
 	@param xml_elmt the XML element attributes will be added to
 */
 void BorderTitleBlock::borderToXml(QDomElement &xml_elmt) {
-	xml_elmt.setAttribute("cols",		columnsCount());
+	xml_elmt.setAttribute("cols",        columnsCount());
-	xml_elmt.setAttribute("colsize",	 QString("%1").arg(columnsWidth()));
+	xml_elmt.setAttribute("colsize",     QString("%1").arg(columnsWidth()));
 	xml_elmt.setAttribute("displaycols", columnsAreDisplayed() ? "true" : "false");
-	xml_elmt.setAttribute("rows",		rowsCount());
+	xml_elmt.setAttribute("rows",        rowsCount());
-	xml_elmt.setAttribute("rowsize",	 QString("%1").arg(rowsHeight()));
+	xml_elmt.setAttribute("rowsize",     QString("%1").arg(rowsHeight()));
 	xml_elmt.setAttribute("displayrows", rowsAreDisplayed() ? "true" : "false");
 	// attribut datant de la version 0.1 - laisse pour retrocompatibilite
@@ -512,9 +500,9 @@ void BorderTitleBlock::updateRectangles()
 {
 	QRectF previous_diagram = diagram_rect_;
 	diagram_rect_ = QRectF(Diagram::margin,
-				   Diagram::margin,
+			       Diagram::margin,
-				   diagramWidth(),
+			       diagramWidth(),
-				   diagramHeight());
+			       diagramHeight());
 	if (diagram_rect_ != previous_diagram)
 		emit(borderChanged(previous_diagram, diagram_rect_));
 }
@@ -566,14 +554,14 @@ void BorderTitleBlock::draw(QPainter *painter)
 			painter -> drawRect(numbered_rectangle);
 			if (settings.value("border-columns_0", true).toBool()){
 			painter -> drawText(numbered_rectangle,
-						Qt::AlignVCenter
+					    Qt::AlignVCenter
-						| Qt::AlignCenter,
+					    | Qt::AlignCenter,
-						QString("%1").arg(i - 1));
+					    QString("%1").arg(i - 1));
 			}else{
 			painter -> drawText(numbered_rectangle,
-						Qt::AlignVCenter
+					    Qt::AlignVCenter
-						| Qt::AlignCenter,
+					    | Qt::AlignCenter,
-						QString("%1").arg(i));
+					    QString("%1").arg(i));
 			}
 		}
 	}
@@ -594,9 +582,9 @@ void BorderTitleBlock::draw(QPainter *painter)
 			);
 			painter -> drawRect(lettered_rectangle);
 			painter -> drawText(lettered_rectangle,
-						Qt::AlignVCenter
+					    Qt::AlignVCenter
-						| Qt::AlignCenter,
+					    | Qt::AlignCenter,
-						row_string);
+					    row_string);
 			row_string = incrementLetters(row_string);
 		}
 	}
@@ -638,9 +626,9 @@ void BorderTitleBlock::drawDxf(
 {
 	// Transform to DXF scale.
 	columns_header_height_ *= Createdxf::yScale;
-	rows_height_		   *= Createdxf::yScale;
+	rows_height_           *= Createdxf::yScale;
-	rows_header_width_	 *= Createdxf::xScale;
+	rows_header_width_     *= Createdxf::xScale;
-	columns_width_		 *= Createdxf::xScale;
+	columns_width_         *= Createdxf::xScale;
 	// draw the empty box that appears as soon as there is a header
 	// dessine la case vide qui apparait des qu'il y a un entete
@@ -669,11 +657,11 @@ void BorderTitleBlock::drawDxf(
 		display_columns_) {
 	int offset = settings.value("border-columns_0", true).toBool() ? -1 : 0;
 		for (int i = 1 ; i <= columns_count_ ; ++ i) {
-		double xCoord = diagram_rect_.topLeft().x() * Createdxf::xScale +
+	    double xCoord = diagram_rect_.topLeft().x() * Createdxf::xScale +
 					(rows_header_width_ + ((i - 1) *
 					 columns_width_));
 			double yCoord = Createdxf::sheetHeight
-			- diagram_rect_.topLeft().y()*Createdxf::yScale
+		    - diagram_rect_.topLeft().y()*Createdxf::yScale
 					- columns_header_height_;
 			double recWidth = columns_width_;
 			double recHeight = columns_header_height_;
@@ -702,8 +690,8 @@ void BorderTitleBlock::drawDxf(
 		for (int i = 1 ; i <= rows_count_ ; ++ i) {
 			double xCoord = diagram_rect_.topLeft().x()
 					* Createdxf::xScale;
-		double yCoord = Createdxf::sheetHeight
+	    double yCoord = Createdxf::sheetHeight
-			- diagram_rect_.topLeft().y()
+		    - diagram_rect_.topLeft().y()
 					*Createdxf::yScale
 					- (
 						columns_header_height_
@@ -735,17 +723,17 @@ void BorderTitleBlock::drawDxf(
 		//qp -> translate(titleblock_rect_.topLeft());
 		QRectF rect = titleBlockRect();
 		m_titleblock_template_renderer -> renderDxf(rect,
-								rect.width(),
+							    rect.width(),
-								file_path,
+							    file_path,
-								color);
+							    color);
 		//qp -> translate(-titleblock_rect_.topLeft());
 	}
 	// Transform back to QET scale
 	columns_header_height_ /= Createdxf::yScale;
 	rows_height_		   /= Createdxf::yScale;
-	rows_header_width_	 /= Createdxf::xScale;
+	rows_header_width_     /= Createdxf::xScale;
-	columns_width_		 /= Createdxf::xScale;
+	columns_width_         /= Createdxf::xScale;
 }
@@ -865,7 +853,7 @@ void BorderTitleBlock::setRowsHeaderWidth(const qreal &new_rhw) {
 	\~ @param height :
 */
 void BorderTitleBlock::setDiagramHeight(const qreal &height) {
-	//		  size of rows to use = rows_height
+	//          size of rows to use = rows_height
 	// taille des lignes a utiliser = rows_height
 	setRowsCount(qRound(ceil(height / rows_height_)));
 }
@@ -883,7 +871,7 @@ DiagramPosition BorderTitleBlock::convertPosition(const QPointF &pos)
 		return (DiagramPosition("", 0));
 	QPointF relative_pos = pos - insideBorderRect().topLeft();
-	int row_number	= int(ceil(relative_pos.x() / columnsWidth()));
+	int row_number    = int(ceil(relative_pos.x() / columnsWidth()));
 	int column_number = int(ceil(relative_pos.y() / rowsHeight()));
 	QString letter = "A";
@@ -951,18 +939,18 @@ void BorderTitleBlock::updateDiagramContextForTitleBlock(
 	// ... overridden by the historical and/or dynamically generated fields
 	QLocale var;
 	var.dateFormat(QLocale::ShortFormat);
-	context.addValue("author",	  btb_author_);
+	context.addValue("author",      btb_author_);
 	context.addValue(
 		"date",
 		QLocale::system().toString(btb_date_, QLocale::ShortFormat));
-	context.addValue("title",	   btb_title_);
+	context.addValue("title",       btb_title_);
-	context.addValue("filename",	btb_filename_);
+	context.addValue("filename",    btb_filename_);
-	context.addValue("plant",	 btb_plant_);
+	context.addValue("plant",     btb_plant_);
-	context.addValue("locmach",	 btb_locmach_);
+	context.addValue("locmach",     btb_locmach_);
-	context.addValue("indexrev",	btb_indexrev_);
+	context.addValue("indexrev",    btb_indexrev_);
-	context.addValue("version",	 btb_version_);
+	context.addValue("version",     btb_version_);
-	context.addValue("folio",	   btb_final_folio_);
+	context.addValue("folio",       btb_final_folio_);
-	context.addValue("folio-id",	folio_index_);
+	context.addValue("folio-id",    folio_index_);
 	context.addValue("folio-total", folio_total_);
 	context.addValue("auto_page_num", btb_auto_page_num_);
 	context.addValue("previous-folio-num", m_previous_folio_num);
@@ -1040,7 +1028,7 @@ void BorderTitleBlock::setFolioData(
 		btb_final_folio_.replace("%autonum", autonum);
 		btb_folio_ = btb_final_folio_;
 	}
-	btb_final_folio_.replace("%id",	QString::number(folio_index_));
+	btb_final_folio_.replace("%id",    QString::number(folio_index_));
 	btb_final_folio_.replace("%total", QString::number(folio_total_));
 	updateDiagramContextForTitleBlock(project_properties);
--- a/sources/bordertitleblock.h
+++ b/sources/bordertitleblock.h
@@ -174,7 +174,7 @@ class BorderTitleBlock : public QObject
 		void setPreviousFolioNum(const QString &previous);
 		void setNextFolioNum(const QString &next);
-        QDomElement titleBlockToXml(QDomDocument &doc);
+		void titleBlockToXml(QDomElement &);
 		void titleBlockFromXml(const QDomElement &);
 		void borderToXml(QDomElement &);
 		void borderFromXml(const QDomElement &);
@@ -249,34 +249,34 @@ class BorderTitleBlock : public QObject
 	// attributes
 	private:
 		// titleblock basic data
-		QString btb_author_;		///< titleblock author
+		QString btb_author_;        ///< titleblock author
-		QDate   btb_date_;		  ///< titleblock date
+		QDate   btb_date_;          ///< titleblock date
-		QString btb_title_;		 ///< titleblock title
+		QString btb_title_;         ///< titleblock title
-		QString btb_folio_;		 ///< titleblock folio
+		QString btb_folio_;         ///< titleblock folio
-		QString btb_plant_;		 ///< titleblock plant
+		QString btb_plant_;         ///< titleblock plant
-		QString btb_locmach_;	   ///< titleblock locmach
+		QString btb_locmach_;       ///< titleblock locmach
-		QString btb_indexrev_;	  ///< titleblock index rev
+		QString btb_indexrev_;      ///< titleblock index rev
 		QString btb_final_folio_;   ///< titleblock final folio
 		QString btb_auto_page_num_; ///< titleblock auto page num
-		int folio_index_;		   ///< titleblock index
+		int folio_index_;           ///< titleblock index
-		int folio_total_;		   ///< titleblock total
+		int folio_total_;           ///< titleblock total
-		QString btb_filename_;	  ///< titleblock filename
+		QString btb_filename_;      ///< titleblock filename
-		QString btb_version_;	   ///< titleblock version
+		QString btb_version_;       ///< titleblock version
 		/// titleblock additional fields
 		DiagramContext additional_fields_;
-		Qt::Edge m_edge;			  ///< titleblock edge
+		Qt::Edge m_edge;              ///< titleblock edge
-		QString m_next_folio_num;	 ///< titleblock next folio num
+		QString m_next_folio_num;     ///< titleblock next folio num
 		QString m_previous_folio_num; ///< titleblock previous folio num
 		// border dimensions (rows and columns)
 		// columns: number and dimensions
-		int columns_count_;		   ///< columns count
+		int columns_count_;           ///< columns count
-		qreal columns_width_;		 ///< columns width
+		qreal columns_width_;         ///< columns width
 		qreal columns_header_height_; ///< columns header height
 		// rows: number and dimensions
-		int rows_count_;		  ///< rows count
+		int rows_count_;          ///< rows count
-		qreal rows_height_;	   ///< rows height
+		qreal rows_height_;       ///< rows height
 		qreal rows_header_width_; ///< rows header width
 		// title block dimensions
@@ -286,10 +286,10 @@ class BorderTitleBlock : public QObject
 		QRectF diagram_rect_;
 			// display options
-        bool display_titleblock_{true};
+		bool display_titleblock_;
 		bool display_columns_;
 		bool display_rows_;
-        bool display_border_{true};
+		bool display_border_;
 		TitleBlockTemplateRenderer *m_titleblock_template_renderer;
 };
 #endif
--- a/sources/conductorproperties.cpp
+++ b/sources/conductorproperties.cpp
@@ -20,16 +20,14 @@
 #include <QMetaEnum>
 #include <QRegularExpression>
 #include <QtDebug>
 #include "qetxml.h"
 namespace {
    const QString conductorPropertiesXmlName = "conductorProperties";
 }
 /**
 	Constructeur par defaut
 */
-SingleLineProperties::SingleLineProperties(): PropertiesInterface("SingleLine")
+SingleLineProperties::SingleLineProperties() :
 	hasGround(true),
 	hasNeutral(true),
 	is_pen(false),
 	phases(1)
 {
 }
@@ -125,9 +123,9 @@ void SingleLineProperties::draw(QPainter *painter,
 	@param size taille du segment
 */
 void SingleLineProperties::drawGround(QPainter *painter,
-					  QET::ConductorSegmentType direction,
+				      QET::ConductorSegmentType direction,
-					  QPointF center,
+				      QPointF center,
-					  qreal size) {
+				      qreal size) {
 	painter -> save();
 	// prepare le QPainter
@@ -217,12 +215,12 @@ void SingleLineProperties::drawPen(QPainter *painter,
 	ajoutes a l'element e.
 	@param e Element XML auquel seront ajoutes des attributs
 */
-void SingleLineProperties::toXmlPriv(QDomElement& e) const {
+void SingleLineProperties::toXml(QDomElement &e) const
-
+{
-    e.setAttribute("ground",  hasGround  ? "true" : "false");
+	e.setAttribute("ground",  hasGround  ? "true" : "false");
-    e.setAttribute("neutral", hasNeutral ? "true" : "false");
+	e.setAttribute("neutral", hasNeutral ? "true" : "false");
-    e.setAttribute("phase",   phases);
+	e.setAttribute("phase",   phases);
-    if (isPen()) e.setAttribute("pen", "true");
+	if (isPen()) e.setAttribute("pen", "true");
 }
 /**
@@ -230,36 +228,11 @@ void SingleLineProperties::toXmlPriv(QDomElement& e) const {
 	de l'element e
 	@param e Element XML dont les attributs seront lus
 */
-bool SingleLineProperties::fromXmlPriv(const QDomElement &e) {
+void SingleLineProperties::fromXml(QDomElement &e) {
-	if (QETXML::propertyBool(e, "ground", &hasGround) != QETXML::PropertyFlags::Success ||
+	hasGround  = e.attribute("ground")  == "true";
-		QETXML::propertyBool(e, "neutral", &hasNeutral) != QETXML::PropertyFlags::Success)
+	hasNeutral = e.attribute("neutral") == "true";
-		return false;
+	setPhasesCount(e.attribute("phase").toInt());
-
+	is_pen = (hasGround && hasNeutral && e.attribute("pen", "false") == "true");
 	int phase;
 	if (QETXML::propertyInteger(e, "phase", &phase) != QETXML::PropertyFlags::Success)
 		return false;
 	setPhasesCount(phase);
 	bool pen;
 	if (QETXML::propertyBool(e, "pen", &pen) != QETXML::PropertyFlags::Success)
 		return false;
 	is_pen = (hasGround && hasNeutral && pen);
 	return true;
 }
 bool SingleLineProperties::valideXml(QDomElement& e) {
 	if (QETXML::propertyBool(e, "ground") != QETXML::PropertyFlags::Success ||
 		QETXML::propertyBool(e, "neutral") != QETXML::PropertyFlags::Success)
 		return false;
 	if (QETXML::propertyInteger(e, "phase") != QETXML::PropertyFlags::Success)
 		return false;
 	if (QETXML::propertyBool(e, "pen") != QETXML::PropertyFlags::Success)
 		return false;
 	return true;
 }
 /**
@@ -267,7 +240,17 @@ bool SingleLineProperties::valideXml(QDomElement& e) {
 	multifilaire noir dont le texte est "_"
 */
 ConductorProperties::ConductorProperties() :
-    PropertiesInterface(xmlTagName())
+	type(Multi),
 	color(Qt::black),
 	text_color(Qt::black),
 	text("_"),
 	text_size(9),
 	cond_size(1),
 	verti_rotate_text(270),
 	horiz_rotate_text(0),
 	m_show_text(true),
 	m_one_text_per_folio(false),
 	style(Qt::SolidLine)
 {}
 /**
@@ -283,143 +266,108 @@ ConductorProperties::~ConductorProperties()
 	Export conductor propertie, in the XML element 'e'
 	@param e the xml element
 */
-void ConductorProperties::toXmlPriv(QDomElement& e) const
+void ConductorProperties::toXml(QDomElement &e) const
 {
 	e.setAttribute("type", typeToString(type));
-    e.setAttribute("type", typeToString(type));
+	if (color != QColor(Qt::black))
 		e.setAttribute("color", color.name());
-    if (color != QColor(Qt::black))
+	e.setAttribute("bicolor", m_bicolor? "true" : "false");
-        e.setAttribute("color", color.name());
+	e.setAttribute("color2", m_color_2.name());
 	e.setAttribute("dash-size", QString::number(m_dash_size));
-    e.setAttribute("bicolor", m_bicolor? "true" : "false");
+	if (type == Single)
-    e.setAttribute("color2", m_color_2.name());
+		singleLineProperties.toXml(e);
    e.setAttribute("dash-size", QString::number(m_dash_size));
-    if (type == Single)
+	e.setAttribute("num", text);
-    {
+	e.setAttribute("text_color", text_color.name());
-        QDomDocument doc = e.ownerDocument();
+	e.setAttribute("formula", m_formula);
-        singleLineProperties.toXml(doc);
+	e.setAttribute("cable", m_cable);
-    }
+	e.setAttribute("bus", m_bus);
 	e.setAttribute("function", m_function);
 	e.setAttribute("tension_protocol", m_tension_protocol);
 	e.setAttribute("conductor_color", m_wire_color);
 	e.setAttribute("conductor_section", m_wire_section);
 	e.setAttribute("numsize", QString::number(text_size));
 	e.setAttribute("condsize", QString::number(cond_size));
 	e.setAttribute("displaytext", m_show_text);
 	e.setAttribute("onetextperfolio", m_one_text_per_folio);
 	e.setAttribute("vertirotatetext", QString::number(verti_rotate_text));
 	e.setAttribute("horizrotatetext", QString::number(horiz_rotate_text));
-    e.setAttribute("num", text);
+	QMetaEnum me = QMetaEnum::fromType<Qt::Alignment>();
-    e.setAttribute("text_color", text_color.name());
+	e.setAttribute("horizontal-alignment", me.valueToKey(m_horizontal_alignment));
-    e.setAttribute("formula", m_formula);
+	e.setAttribute("vertical-alignment", me.valueToKey(m_vertical_alignment));
    e.setAttribute("cable", m_cable);
    e.setAttribute("bus", m_bus);
    e.setAttribute("function", m_function);
    e.setAttribute("tension_protocol", m_tension_protocol);
    e.setAttribute("conductor_color", m_wire_color);
    e.setAttribute("conductor_section", m_wire_section);
    e.setAttribute("numsize", QString::number(text_size));
    e.setAttribute("condsize", QString::number(cond_size));
    e.setAttribute("displaytext", m_show_text);
    e.setAttribute("onetextperfolio", m_one_text_per_folio);
    e.setAttribute("vertirotatetext", QString::number(verti_rotate_text));
    e.setAttribute("horizrotatetext", QString::number(horiz_rotate_text));
-    QMetaEnum me = QMetaEnum::fromType<Qt::Alignment>();
+	QString conductor_style = writeStyle();
-    e.setAttribute("horizontal-alignment", me.valueToKey(m_horizontal_alignment));
+	if (!conductor_style.isEmpty())
-    e.setAttribute("vertical-alignment", me.valueToKey(m_vertical_alignment));
+		e.setAttribute("style", conductor_style);
    QString conductor_style = writeStyle();
    if (!conductor_style.isEmpty())
        e.setAttribute("style", conductor_style);
 }
-/** RETURNS True
+/**
 	@brief ConductorProperties::fromXml
 	Import conductor propertie, from the attribute of the xml element 'e'
 	@param e the xml document
 */
-bool ConductorProperties::fromXmlPriv(const QDomElement &e)
+void ConductorProperties::fromXml(QDomElement &e)
 {
 		// get conductor color
-    QETXML::propertyColor(e, "color", &color);
+	QColor xml_color= QColor(e.attribute("color"));
-	QETXML::propertyBool(e, "bicolor", &m_bicolor);
+	color = (xml_color.isValid()? xml_color : QColor(Qt::black));
-    QETXML::propertyColor(e, "color2", &m_color_2);
+
-	QETXML::propertyInteger(e, "dash-size", &m_dash_size);
+	QString bicolor_str = e.attribute("bicolor", "false");
 	m_bicolor = bicolor_str == "true"? true : false;
 	QColor xml_color_2 = QColor(e.attribute("color2"));
 	m_color_2 = xml_color_2.isValid()? xml_color_2 : QColor(Qt::black);
 	m_dash_size = e.attribute("dash-size", QString::number(1)).toInt();
 		// read style of conductor
-	QString style_string;
+	readStyle(e.attribute("style"));
    QETXML::propertyString(e, "style", &style_string);
 	readStyle(style_string);
-	QString type_t;
+	if (e.attribute("type") == typeToString(Single))
    if (QETXML::propertyString(e, "type", &type_t) == QETXML::PropertyFlags::Success) {
 		if (type_t == typeToString(Single))
 	{
 			// get specific properties for single conductor
 		singleLineProperties.fromXml(e);
 		type = Single;
 	}
-		else if (type_t == typeToString(Multi))
+	else
 		type = Multi;
 		else {
 			//Keep retrocompatible with version older than 0,4
 			//If the propertie @type is simple (removed since QET 0,4), we set text no visible.
 			//@TODO remove this code for qet 0.6 or later
-			if (type_t == "simple") m_show_text = false;
+	text                 = e.attribute("num");
 		}
 	}
    QETXML::propertyString(e, "num", &text);
 	// TODO: implement:
 	//m_cable			  = e.attribute("cable");
 	//m_bus				= e.attribute("bus");
 	// get text color
-    QETXML::propertyColor(e, "text_color", &text_color);
+	QColor xml_text_color= QColor(e.attribute("text_color"));
-    QETXML::propertyString(e, "formula", &m_formula);
+	text_color = (xml_text_color.isValid()? xml_text_color : QColor(Qt::black));
-    QETXML::propertyString(e, "function", &m_function);
+	m_formula            = e.attribute("formula");
-    QETXML::propertyString(e, "tension_protocol", &m_tension_protocol);
+	m_cable              = e.attribute("cable");
-    QETXML::propertyString(e, "conductor_color", &m_wire_color);
+	m_bus                = e.attribute("bus");
-    QETXML::propertyString(e, "conductor_section", &m_wire_section);
+	m_function           = e.attribute("function");
-	QETXML::propertyInteger(e, "numsize", &text_size);
+	m_tension_protocol   = e.attribute("tension_protocol");
-	QETXML::propertyDouble(e, "condsize", &cond_size);
+	m_wire_color         = e.attribute("conductor_color");
-	QETXML::propertyBool(e, "displaytext", &m_show_text);
+	m_wire_section       = e.attribute("conductor_section");
-	QETXML::propertyBool(e, "onetextperfolio", &m_one_text_per_folio);
+	text_size            = e.attribute("numsize", QString::number(9)).toInt();
-	QETXML::propertyDouble(e, "vertirotatetext", &verti_rotate_text);
+	cond_size            = e.attribute("condsize", QString::number(1)).toDouble();
-	QETXML::propertyDouble(e, "horizrotatetext", &horiz_rotate_text);
+	m_show_text          = e.attribute("displaytext", QString::number(1)).toInt();
 	m_one_text_per_folio = e.attribute("onetextperfolio", QString::number(0)).toInt();
 	verti_rotate_text    = e.attribute("vertirotatetext").toDouble();
 	horiz_rotate_text    = e.attribute("horizrotatetext").toDouble();
 	QMetaEnum me = QMetaEnum::fromType<Qt::Alignment>();
-	QString alinment_temp;
+	m_horizontal_alignment = Qt::Alignment(
-    if (QETXML::propertyString(e, "horizontal-alignment", &alinment_temp) == QETXML::PropertyFlags::Success)
+				me.keyToValue(
-		m_horizontal_alignment = Qt::Alignment(me.keyToValue(alinment_temp.toStdString().data()));
+					e.attribute(
-    if (QETXML::propertyString(e, "vertical-alignment", &alinment_temp) == QETXML::PropertyFlags::Success)
+						"horizontal-alignment",
-		m_vertical_alignment = Qt::Alignment(me.keyToValue(alinment_temp.toStdString().data()));
+						"AlignBottom"
-
+						).toStdString().data()));
-	return true;
+	m_vertical_alignment = Qt::Alignment(
-}
+				me.keyToValue(
-
+					e.attribute(
-bool ConductorProperties::valideXml(QDomElement& e) {
+						"vertical-alignment",
-    if (QETXML::propertyColor(e, "color") ||
+						"AlignRight"
-		QETXML::propertyBool(e, "bicolor") ||
+						).toStdString().data()));
        QETXML::propertyColor(e, "color2") ||
 		QETXML::propertyInteger(e, "dash-size") ||
        QETXML::propertyString(e, "type") ||
        QETXML::propertyString(e, "num") ||
        QETXML::propertyColor(e, "text_color") ||
        QETXML::propertyString(e, "formula") ||
        QETXML::propertyString(e, "function") ||
        QETXML::propertyString(e, "tension_protocol") ||
        QETXML::propertyString(e, "conductor_color") ||
        QETXML::propertyString(e, "conductor_section") ||
 		QETXML::propertyInteger(e, "numsize") ||
 		QETXML::propertyDouble(e, "condsize") ||
 		QETXML::propertyBool(e, "displaytext") ||
 		QETXML::propertyBool(e, "onetextperfolio") ||
 		QETXML::propertyDouble(e, "vertirotatetext") ||
 		QETXML::propertyDouble(e, "horizrotatetext") ||
        QETXML::propertyString(e, "horizontal-alignment") ||
        QETXML::propertyString(e, "vertical-alignment"))
 		return false;
 	return true;
 }
 QString ConductorProperties::xmlTagName()
 {
    return conductorPropertiesXmlName;
 }
 /**
@@ -477,22 +425,22 @@ void ConductorProperties::fromSettings(QSettings &settings, const QString &prefi
 	singleLineProperties.fromSettings(settings, prefix);
-	text				 = settings.value(prefix + "text", "_").toString();
+	text                 = settings.value(prefix + "text", "_").toString();
 	QColor settings_text_color = QColor(settings.value(prefix + "text_color").toString());
 	text_color = (settings_text_color.isValid()? settings_text_color : QColor(Qt::black));
-	m_formula			= settings.value(prefix + "formula", "").toString();
+	m_formula            = settings.value(prefix + "formula", "").toString();
-	m_cable			  = settings.value(prefix + "cable", "").toString();
+	m_cable              = settings.value(prefix + "cable", "").toString();
-	m_bus				= settings.value(prefix + "bus", "").toString();
+	m_bus                = settings.value(prefix + "bus", "").toString();
-	m_function		   = settings.value(prefix + "function", "").toString();
+	m_function           = settings.value(prefix + "function", "").toString();
 	m_tension_protocol   = settings.value(prefix + "tension_protocol", "").toString();
-	m_wire_color		 = settings.value(prefix + "conductor_color", "").toString();
+	m_wire_color         = settings.value(prefix + "conductor_color", "").toString();
-	m_wire_section	   = settings.value(prefix + "conductor_section", "").toString();
+	m_wire_section       = settings.value(prefix + "conductor_section", "").toString();
-	text_size			= settings.value(prefix + "textsize", "7").toInt();
+	text_size            = settings.value(prefix + "textsize", "7").toInt();
-	cond_size			= settings.value(prefix + "size", "1").toInt();
+	cond_size            = settings.value(prefix + "size", "1").toInt();
-	m_show_text		  = settings.value(prefix + "displaytext", true).toBool();
+	m_show_text          = settings.value(prefix + "displaytext", true).toBool();
 	m_one_text_per_folio = settings.value(prefix + "onetextperfolio", false).toBool();
-	verti_rotate_text	= settings.value((prefix + "vertirotatetext"), "270").toDouble();
+	verti_rotate_text    = settings.value((prefix + "vertirotatetext"), "270").toDouble();
-	horiz_rotate_text	= settings.value((prefix + "horizrotatetext"), "0").toDouble();
+	horiz_rotate_text    = settings.value((prefix + "horizrotatetext"), "0").toDouble();
 	QMetaEnum me = QMetaEnum::fromType<Qt::Alignment>();
 	m_horizontal_alignment = Qt::Alignment(me.keyToValue(settings.value(prefix + "horizontal-alignment", "AlignBottom").toString().toStdString().data()));
@@ -530,25 +478,25 @@ void ConductorProperties::applyForEqualAttributes(QList<ConductorProperties> lis
 	if (clist.size() == 1)
 	{
 		ConductorProperties cp = clist.first();
-		color				= cp.color;
+		color                = cp.color;
-		m_bicolor			= cp.m_bicolor;
+		m_bicolor            = cp.m_bicolor;
-		m_color_2			= cp.m_color_2;
+		m_color_2            = cp.m_color_2;
-		m_dash_size		  = cp.m_dash_size;
+		m_dash_size          = cp.m_dash_size;
-		text				 = cp.text;
+		text                 = cp.text;
-		text_color		   = cp.text_color;
+		text_color           = cp.text_color;
-		m_formula			= cp.m_formula;
+		m_formula            = cp.m_formula;
-		m_cable			  = cp.m_cable;
+		m_cable              = cp.m_cable;
-		m_bus				= cp.m_bus;
+		m_bus                = cp.m_bus;
-		m_function		   = cp.m_function;
+		m_function           = cp.m_function;
 		m_tension_protocol   = cp.m_tension_protocol;
-		m_wire_color		 = cp.m_wire_color;
+		m_wire_color         = cp.m_wire_color;
-		m_wire_section	   = cp.m_wire_section;
+		m_wire_section       = cp.m_wire_section;
-		text_size			= cp.text_size;
+		text_size            = cp.text_size;
-		cond_size			= cp.cond_size;
+		cond_size            = cp.cond_size;
-		m_show_text		  = cp.m_show_text;
+		m_show_text          = cp.m_show_text;
 		m_one_text_per_folio = cp.m_one_text_per_folio;
-		verti_rotate_text	= cp.verti_rotate_text;
+		verti_rotate_text    = cp.verti_rotate_text;
-		horiz_rotate_text	= cp.horiz_rotate_text;
+		horiz_rotate_text    = cp.horiz_rotate_text;
 		m_vertical_alignment = cp.m_vertical_alignment;
 		m_horizontal_alignment = cp.m_horizontal_alignment;
@@ -886,7 +834,7 @@ void ConductorProperties::readStyle(const QString &style_string) {
 		if (!match.hasMatch())
 		{
 			qDebug()<<"no Match"
-				   <<style_str;
+			       <<style_str;
 		} else {
 			QString style_name = match.captured("name");
 			QString style_value = match.captured("value");
@@ -946,12 +894,12 @@ int SingleLineProperties::operator!=(const SingleLineProperties &other) const
 	@param prefix prefix a ajouter devant les noms des parametres
 */
 void SingleLineProperties::toSettings(QSettings &settings,
-					  const QString &prefix) const
+				      const QString &prefix) const
 {
 	settings.setValue(prefix + "hasGround",  hasGround);
 	settings.setValue(prefix + "hasNeutral", hasNeutral);
-	settings.setValue(prefix + "phases",	 phases);
+	settings.setValue(prefix + "phases",     phases);
-	settings.setValue(prefix + "pen",		is_pen);
+	settings.setValue(prefix + "pen",        is_pen);
 }
 /**
@@ -962,6 +910,6 @@ void SingleLineProperties::fromSettings(QSettings &settings,
 					const QString &prefix) {
 	hasGround  = settings.value(prefix + "hasGround",  true).toBool();
 	hasNeutral = settings.value(prefix + "hasNeutral", true).toBool();
-	phases	 = settings.value(prefix + "phases",	 1).toInt();
+	phases     = settings.value(prefix + "phases",     1).toInt();
-	is_pen	 = settings.value(prefix + "pen",		false).toBool();
+	is_pen     = settings.value(prefix + "pen",        false).toBool();
 }
--- a/sources/conductorproperties.h
+++ b/sources/conductorproperties.h
@@ -22,15 +22,13 @@
 #include <QColor>
 #include <QSettings>
 #include "properties/propertiesinterface.h"
 class QPainter;
 /**
 	@brief The SingleLineProperties class
 	This class represents the properties of a singleline conductor.
 */
-class SingleLineProperties: public PropertiesInterface {
+class SingleLineProperties {
 	public:
 	SingleLineProperties();
 	virtual ~SingleLineProperties();
@@ -39,24 +37,23 @@ class SingleLineProperties: public PropertiesInterface {
 	unsigned short int phasesCount();
 	bool isPen() const;
 	void draw(QPainter *, QET::ConductorSegmentType, const QRectF &);
-    void toXmlPriv(QDomElement&) const override;
+	void toXml(QDomElement &) const;
-    bool fromXmlPriv(const QDomElement &) override;
+	void fromXml(QDomElement &);
 	static bool valideXml(QDomElement& element);
 	void toSettings(QSettings &, const QString & = QString()) const;
 	void fromSettings(QSettings &, const QString & = QString());
 	/// Whether the singleline conductor should display the ground symbol
-	bool hasGround{true};
+	bool hasGround;
 	/// Whether the singleline conductor should display the neutral symbol
-	bool hasNeutral{true};
+	bool hasNeutral;
 	/// Protective Earth Neutral: visually merge neutral and ground
-	bool is_pen{false};
+	bool is_pen;
 	int operator==(const SingleLineProperties &) const;
 	int operator!=(const SingleLineProperties &) const;
 	private:
-	unsigned short int phases{1};
+	unsigned short int phases;
 	void drawGround (QPainter *, QET::ConductorSegmentType, QPointF, qreal);
 	void drawNeutral(QPainter *, QPointF, qreal);
 	void drawPen(QPainter *, QET::ConductorSegmentType, QPointF, qreal);
@@ -67,7 +64,7 @@ class SingleLineProperties: public PropertiesInterface {
 	This class represents the functional properties of a particular conductor,
 	i.e. properties other than path and terminals.
 */
-class ConductorProperties: public PropertiesInterface
+class ConductorProperties
 {
 	public:
 		ConductorProperties();
@@ -83,15 +80,15 @@ class ConductorProperties: public PropertiesInterface
 		//Attributes
-        ConductorType type{ConductorType::Multi};
+		ConductorType type;
-		// TODO: set default values!
+		QColor
-		QColor		color{QColor(Qt::black)},
+		color,
-				m_color_2{QColor(Qt::black)},
+		m_color_2,
-				text_color{QColor(Qt::black)};
+		text_color;
 		QString
-        text{"_"},
+		text,
 		m_function,
 		m_tension_protocol,
 		m_wire_color,
@@ -100,31 +97,33 @@ class ConductorProperties: public PropertiesInterface
 		m_bus,
 		m_cable;
-        int text_size{9},
+		int
 		text_size,
 		m_dash_size = 1;
-            double
+		double
-        cond_size{1},
+		cond_size,
-            verti_rotate_text{270},
+		verti_rotate_text,
-            horiz_rotate_text{0};
+		horiz_rotate_text;
-		bool	m_show_text{true},
+		bool
-                m_one_text_per_folio{false},
+		m_show_text,
 		m_one_text_per_folio,
 		m_bicolor = false;
-		Qt::Alignment 
+		Qt::Alignment
-		m_horizontal_alignment = Qt::AlignBottom,        
+		m_horizontal_alignment = Qt::AlignBottom,
 		m_vertical_alignment = Qt::AlignRight;
-		Qt::PenStyle style{Qt::PenStyle::SolidLine};
+		Qt::PenStyle style;
 		SingleLineProperties singleLineProperties;
 		// methods
-		static bool valideXml(QDomElement& element);
+		void toXml(QDomElement &) const;
-        static QString xmlTagName();
+		void fromXml(QDomElement &);
-        void toSettings(QSettings &, const QString & = QString()) const override;
+		void toSettings(QSettings &, const QString & = QString()) const;
-        void fromSettings(QSettings &, const QString & = QString()) override;
+		void fromSettings(QSettings &, const QString & = QString());
 		static QString typeToString(ConductorType);
 		void applyForEqualAttributes(QList<ConductorProperties> list);
@@ -134,10 +133,6 @@ class ConductorProperties: public PropertiesInterface
 		bool operator==(const ConductorProperties &) const;
 		bool operator!=(const ConductorProperties &) const;
    private:
        void toXmlPriv(QDomElement&) const override;
        bool fromXmlPriv(const QDomElement &) override;
 	private:
 		void readStyle(const QString &);
 		QString writeStyle() const;
--- a/sources/diagram.cpp
+++ b/sources/diagram.cpp
@@ -44,8 +44,6 @@
 #include <cassert>
 #include <math.h>
 #include "qetxml.h"
 int Diagram::xGrid  = 10;
 int Diagram::yGrid  = 10;
 int Diagram::xKeyGrid = 10;
@@ -66,11 +64,11 @@ QColor		Diagram::background_color = Qt::white;
 	@param project : The project of this diagram and also parent QObject
 */
 Diagram::Diagram(QETProject *project) :
-	QGraphicsScene		   (project),
+	QGraphicsScene           (project),
-	m_project				 (project),
+	m_project                 (project),
-	draw_grid_			   (true),
+	draw_grid_               (true),
-	use_border_			  (true),
+	use_border_              (true),
-	draw_terminals_		  (true),
+	draw_terminals_          (true),
 	draw_colored_conductors_ (true),
 	m_event_interface (nullptr),
 	m_freeze_new_elements   (false),
@@ -182,7 +180,7 @@ void Diagram::drawBackground(QPainter *p, const QRectF &r) {
 			 */
 		QPen pen;
 		Diagram::background_color == Qt::black? pen.setColor(Qt::white)
-							  : pen.setColor(Qt::black);
+						      : pen.setColor(Qt::black);
 		pen.setCosmetic(true);
 		p->setPen(pen);
@@ -328,9 +326,9 @@ void Diagram::keyPressEvent(QKeyEvent *event)
 {
 	QSettings settings;
 	int xKeyGrid = settings.value("diagrameditor/key_Xgrid",
-					  Diagram::xKeyGrid).toInt();
+				      Diagram::xKeyGrid).toInt();
 	int yKeyGrid = settings.value("diagrameditor/key_Ygrid",
-					  Diagram::yKeyGrid).toInt();
+				      Diagram::yKeyGrid).toInt();
 	int xKeyGridFine = settings.value("diagrameditor/key_fine_Xgrid",
 					  Diagram::xKeyGridFine).toInt();
 	int yKeyGridFine = settings.value("diagrameditor/key_fine_Ygrid",
@@ -585,9 +583,9 @@ void Diagram::setConductorsAutonumName(const QString &name) {
 	@return Une QImage representant le schema
 */
 bool Diagram::toPaintDevice(QPaintDevice &pix,
-				int width,
+			    int width,
-				int height,
+			    int height,
-				Qt::AspectRatioMode aspectRatioMode) {
+			    Qt::AspectRatioMode aspectRatioMode) {
 	// determine the source area = schema content + margins
 	// determine la zone source =  contenu du schema + marges
 	QRectF source_area;
@@ -634,9 +632,9 @@ bool Diagram::toPaintDevice(QPaintDevice &pix,
 	// renders itself
 	// effectue le rendu lui-meme
 	render(&p,
-		   QRect(QPoint(0, 0),image_size),
+	       QRect(QPoint(0, 0),image_size),
-		   source_area,
+	       source_area,
-		   aspectRatioMode);
+	       aspectRatioMode);
 	p.end();
 	// restore selected items
@@ -739,28 +737,29 @@ QDomDocument Diagram::toXml(bool whole_content) {
 	// schema properties
 	// proprietes du schema
 	if (whole_content) {
-		// TODO: compare with old version
+		border_and_titleblock.titleBlockToXml(dom_root);
        dom_root.appendChild(border_and_titleblock.titleBlockToXml(document));
 		border_and_titleblock.borderToXml(dom_root);
 		// Default conductor properties
-        defaultConductorProperties.setTagName("defaultconductor");
+		QDomElement default_conductor =
-        dom_root.appendChild(defaultConductorProperties.toXml(document));
+				document.createElement("defaultconductor");
 		defaultConductorProperties.toXml(default_conductor);
 		dom_root.appendChild(default_conductor);
 		// Conductor autonum
 		if (!m_conductors_autonum_name.isEmpty()) {
 			dom_root.setAttribute("conductorAutonum",
-						  m_conductors_autonum_name);
+					      m_conductors_autonum_name);
 		}
 		//Default New Element
 		dom_root.setAttribute("freezeNewElement",
-					  m_freeze_new_elements ? "true" : "false");
+				      m_freeze_new_elements ? "true" : "false");
 		//Default New Conductor
 		dom_root.setAttribute("freezeNewConductor",
-					  m_freeze_new_conductors_
+				      m_freeze_new_conductors_
-					  ? "true" : "false");
+				      ? "true" : "false");
 		//Element Folio Sequential Variables
 		if (!m_elmt_unitfolio_max.isEmpty()
@@ -774,10 +773,10 @@ QDomDocument Diagram::toXml(bool whole_content) {
 						document.createElement(
 							"elementunitfolioseq");
 				folioSequentialsToXml(&m_elmt_unitfolio_max,
-							  &elmtfolioseq,
+						      &elmtfolioseq,
-							  "sequf_",
+						      "sequf_",
-							  "unitfolioseq",
+						      "unitfolioseq",
-							  &document);
+						      &document);
 				elmtfoliosequential.appendChild(elmtfolioseq);
 			}
 			if (!m_elmt_tenfolio_max.isEmpty()) {
@@ -785,10 +784,10 @@ QDomDocument Diagram::toXml(bool whole_content) {
 						document.createElement(
 							"elementtenfolioseq");
 				folioSequentialsToXml(&m_elmt_tenfolio_max,
-							  &elmtfolioseq,
+						      &elmtfolioseq,
-							  "seqtf_",
+						      "seqtf_",
-							  "tenfolioseq",
+						      "tenfolioseq",
-							  &document);
+						      &document);
 				elmtfoliosequential.appendChild(elmtfolioseq);
 			}
 			if (!m_elmt_hundredfolio_max.isEmpty()) {
@@ -796,10 +795,10 @@ QDomDocument Diagram::toXml(bool whole_content) {
 						document.createElement(
 							"elementhundredfolioseq");
 				folioSequentialsToXml(&m_elmt_hundredfolio_max,
-							  &elmtfolioseq,
+						      &elmtfolioseq,
-							  "seqhf_",
+						      "seqhf_",
-							  "hundredfolioseq",
+						      "hundredfolioseq",
-							  &document);
+						      &document);
 				elmtfoliosequential.appendChild(elmtfolioseq);
 			}
 			dom_root.appendChild(elmtfoliosequential);
@@ -817,10 +816,10 @@ QDomDocument Diagram::toXml(bool whole_content) {
 						document.createElement(
 							"conductorunitfolioseq");
 				folioSequentialsToXml(&m_cnd_unitfolio_max,
-							  &cndfolioseq,
+						      &cndfolioseq,
-							  "sequf_",
+						      "sequf_",
-							  "unitfolioseq",
+						      "unitfolioseq",
-							  &document);
+						      &document);
 				cndfoliosequential.appendChild(cndfolioseq);
 			}
 			if (!m_cnd_tenfolio_max.isEmpty()) {
@@ -828,10 +827,10 @@ QDomDocument Diagram::toXml(bool whole_content) {
 						document.createElement(
 							"conductortenfolioseq");
 				folioSequentialsToXml(&m_cnd_tenfolio_max,
-							  &cndfolioseq,
+						      &cndfolioseq,
-							  "seqtf_",
+						      "seqtf_",
-							  "tenfolioseq",
+						      "tenfolioseq",
-							  &document);
+						      &document);
 				cndfoliosequential.appendChild(cndfolioseq);
 			}
 			if (!m_cnd_hundredfolio_max.isEmpty()) {
@@ -839,10 +838,10 @@ QDomDocument Diagram::toXml(bool whole_content) {
 						document.createElement(
 							"conductorhundredfolioseq");
 				folioSequentialsToXml(&m_cnd_hundredfolio_max,
-							  &cndfolioseq,
+						      &cndfolioseq,
-							  "seqhf_",
+						      "seqhf_",
-							  "hundredfolioseq",
+						      "hundredfolioseq",
-							  &document);
+						      &document);
 				cndfoliosequential.appendChild(cndfolioseq);
 			}
 			dom_root.appendChild(cndfoliosequential);
@@ -919,11 +918,13 @@ QDomDocument Diagram::toXml(bool whole_content) {
 	// correspondence table between the addresses of the terminals and their ids
 	// table de correspondance entre les adresses des bornes et leurs ids
 	QHash<Terminal *, int> table_adr_id;
 	if (!list_elements.isEmpty()) {
 		auto dom_elements = document.createElement("elements");
 		for (auto elmt : list_elements) {
-			dom_elements.appendChild(elmt->toXml(document));
+			dom_elements.appendChild(elmt->toXml(document,
 							     table_adr_id));
 		}
 		dom_root.appendChild(dom_elements);
 	}
@@ -931,7 +932,8 @@ QDomDocument Diagram::toXml(bool whole_content) {
 	if (!list_conductors.isEmpty()) {
 		auto dom_conductors = document.createElement("conductors");
 		for (auto cond : list_conductors) {
-			dom_conductors.appendChild(cond->toXml(document));
+			dom_conductors.appendChild(cond->toXml(document,
 							       table_adr_id));
 		}
 		dom_root.appendChild(dom_conductors);
 	}
@@ -981,18 +983,18 @@ QDomDocument Diagram::toXml(bool whole_content) {
 	@param doc
 */
 void Diagram::folioSequentialsToXml(QHash<QString,
-					QStringList> *hash,
+				    QStringList> *hash,
-					QDomElement *domElement,
+				    QDomElement *domElement,
-					const QString& seq_type,
+				    const QString& seq_type,
-					const QString& type,
+				    const QString& type,
-					QDomDocument *doc) {
+				    QDomDocument *doc) {
 	QHash<QString, QStringList>::iterator i;
 	for (i = hash->begin(); i != hash->end(); i++) {
 		QDomElement folioseq = doc->createElement(type);
 		folioseq.setAttribute("title", i.key());
 		for (int j = 0; j < i.value().size(); j++) {
-            folioseq.setAttribute(seq_type + QString::number(j+1),
+			folioseq.setAttribute(seq_type + QString::number(j+1),
-						  i.value().at(j));
+					      i.value().at(j));
 		}
 		domElement->appendChild(folioseq);
 	}
@@ -1030,9 +1032,9 @@ void Diagram::folioSequentialsToXml(QHash<QString,
 	\~French true si l'import a reussi, false sinon
 */
 bool Diagram::fromXml(QDomDocument &document,
-			  QPointF position,
+		      QPointF position,
-			  bool consider_informations,
+		      bool consider_informations,
-			  DiagramContent *content_ptr) {
+		      DiagramContent *content_ptr) {
 	QDomElement root = document.documentElement();
 	return(fromXml(root, position, consider_informations, content_ptr));
 }
@@ -1094,17 +1096,17 @@ bool Diagram::initFromXml(QDomElement &document,
 	@return
 */
 Terminal* findTerminal(int conductor_index,
-               QDomElement& conductor,
+		       QDomElement& f,
-			   QHash<int,
+		       QHash<int,
-			   Terminal *>& table_adr_id,
+		       Terminal *>& table_adr_id,
-			   QList<Element *>& added_elements) {
+		       QList<Element *>& added_elements) {
 	assert(conductor_index == 1 || conductor_index == 2);
 	QString element_index = "element" + QString::number(conductor_index);
 	QString terminal_index = "terminal" + QString::number(conductor_index);
-	QUuid element_uuid;
+	if (f.hasAttribute(element_index)) {
-    if (QETXML::propertyUuid(conductor, element_index, &element_uuid) == QETXML::PropertyFlags::Success) {
+		QUuid element_uuid = QUuid(f.attribute(element_index));
 		// element1 did not exist in the conductor part of the xml until prior 0.7
 		// It is used as an indicator that uuid's are used to identify terminals
 		bool element_found = false;
@@ -1112,8 +1114,7 @@ Terminal* findTerminal(int conductor_index,
 			if (element->uuid() != element_uuid)
 				continue;
 			element_found = true;
-			QUuid terminal_uuid;
+			QUuid terminal_uuid = QUuid(f.attribute(terminal_index));
            QETXML::propertyUuid(conductor, terminal_index, &terminal_uuid);
 			for (auto terminal: element->terminals()) {
 				if (terminal->uuid() != terminal_uuid)
 					continue;
@@ -1137,11 +1138,9 @@ Terminal* findTerminal(int conductor_index,
 				  << element_uuid
 				  << "not found";
 	} else {
-		// Backward compatibility. Until version 0.7 a generated id is used to link the terminal.
+		// Backward compatibility.
-		int id_p1 = -1;
+		// Until version 0.7 a generated id is used to link the terminal.
-        if (QETXML::propertyInteger(conductor, terminal_index, &id_p1) != QETXML::PropertyFlags::Success) {
+		int id_p1 = f.attribute(terminal_index).toInt();
 			qDebug() << "diagramm.cpp:findTerminal(): Reading Id was not successfull";
 		}
 		if (!table_adr_id.contains(id_p1)) {
 			qDebug() << "Diagram::fromXml() : terminal id "
 				 << id_p1
@@ -1149,7 +1148,6 @@ Terminal* findTerminal(int conductor_index,
 		} else
 			return table_adr_id.value(id_p1);
 	}
 	qDebug() << "Diagram::findTerminal(): No terminal found.";
 	return nullptr;
 }
@@ -1185,20 +1183,17 @@ Terminal* findTerminal(int conductor_index,
 	\~French true si l'import a reussi, false sinon
 */
 bool Diagram::fromXml(QDomElement &document,
-			  QPointF position,
+		      QPointF position,
-			  bool consider_informations,
+		      bool consider_informations,
-			  DiagramContent *content_ptr) {
+		      DiagramContent *content_ptr) {
 	const QDomElement& root = document;
 	// The first element must be a diagram
 	if (root.tagName() != "diagram") return(false);
 	qDebug() << "Diagram::fromXml; Diagram: " << root.attribute("title");
 		// Read attributes of this diagram
 	if (consider_informations)
 	{
 		// Load border and titleblock
 		border_and_titleblock.titleBlockFromXml(root);
 		border_and_titleblock.borderFromXml(root);
@@ -1210,7 +1205,6 @@ bool Diagram::fromXml(QDomElement &document,
 			defaultConductorProperties.fromXml(default_conductor_elmt);
 		}
 		// Load the autonum
 		m_conductors_autonum_name = root.attribute("conductorAutonum");
@@ -1264,7 +1258,7 @@ bool Diagram::fromXml(QDomElement &document,
 	if (root.hasAttribute("projectId")) {
 		QETProject *other_project = QETApp::project(
 					root.attribute("projectId",
-							   "-1").toInt());
+						       "-1").toInt());
 		/* We try to paste from another project,
 		 *  then befor paste elements,
@@ -1276,8 +1270,8 @@ bool Diagram::fromXml(QDomElement &document,
 			ElementCollectionHandler ech;
 			foreach (QDomElement element_xml,
 				 QET::findInDomElement(root,
-							   "elements",
+						       "elements",
-							   "element")) {
+						       "element")) {
 				if (!Element::valideXml(element_xml)) continue;
 				QString type_id = element_xml.attribute("type");
@@ -1287,7 +1281,7 @@ bool Diagram::fromXml(QDomElement &document,
 								type_id,
 								other_project);
 					ech.importFromProject(m_project,
-								  location);
+							      location);
 				}
 			}
 		}
@@ -1333,7 +1327,7 @@ bool Diagram::fromXml(QDomElement &document,
 			removeItem(nvel_elmt);
 			delete nvel_elmt;
 			qDebug() << "Diagram::fromXml() : Le chargement des "
-					"parametres d'un element a echoue";
+				    "parametres d'un element a echoue";
 		} else {
 			added_elements << nvel_elmt;
 		}
@@ -1342,8 +1336,8 @@ bool Diagram::fromXml(QDomElement &document,
 		// Load text
 	QList<IndependentTextItem *> added_texts;
 	foreach (QDomElement text_xml, QET::findInDomElement(root,
-								 "inputs",
+							     "inputs",
-								 "input")) {
+							     "input")) {
 		IndependentTextItem *iti = new IndependentTextItem();
 		iti -> fromXml(text_xml);
 		addItem(iti);
@@ -1353,8 +1347,8 @@ bool Diagram::fromXml(QDomElement &document,
 		// Load image
 	QList<DiagramImageItem *> added_images;
 	foreach (QDomElement image_xml, QET::findInDomElement(root,
-								  "images",
+							      "images",
-								  "image")) {
+							      "image")) {
 		DiagramImageItem *dii = new DiagramImageItem ();
 		dii -> fromXml(image_xml);
 		addItem(dii);
@@ -1364,8 +1358,8 @@ bool Diagram::fromXml(QDomElement &document,
 		// Load shape
 	QList<QetShapeItem *> added_shapes;
 	foreach (QDomElement shape_xml, QET::findInDomElement(root,
-								  "shapes",
+							      "shapes",
-								  "shape")) {
+							      "shape")) {
 		QetShapeItem *dii = new QetShapeItem (QPointF(0,0));
 		dii -> fromXml(shape_xml);
 		addItem(dii);
@@ -1375,8 +1369,8 @@ bool Diagram::fromXml(QDomElement &document,
 		// Load conductor
 	QList<Conductor *> added_conductors;
 	foreach (QDomElement f, QET::findInDomElement(root,
-							  "conductors",
+						      "conductors",
-							  "conductor"))
+						      "conductor"))
 	{
 		if (!Conductor::valideXml(f)) continue;
@@ -1385,7 +1379,7 @@ bool Diagram::fromXml(QDomElement &document,
 		Terminal* p1 = findTerminal(1, f, table_adr_id, added_elements);
 		Terminal* p2 = findTerminal(2, f, table_adr_id, added_elements);
-		if (p1 && p2 && p1 != p2)// TODO: why the condition for unequal is required?
+		if (p1 && p2 && p1 != p2)
 		{
 			Conductor *c = new Conductor(p1, p2);
 			if (c->isValid())
@@ -1396,15 +1390,13 @@ bool Diagram::fromXml(QDomElement &document,
 			}
 			else
 				delete c;
 		} else {
 			qDebug() << "Diagramm::fromXML(): No matching terminals found.";
 		}
 	}
 		//Load tables
 	QVector<QetGraphicsTableItem *> added_tables;
 	for (auto dom_table
-		 : QETXML::subChild(root,
+	     : QETXML::subChild(root,
 				"tables",
 				QetGraphicsTableItem::xmlTagName()))
 	{
@@ -1419,11 +1411,11 @@ bool Diagram::fromXml(QDomElement &document,
 	{
 		QVector <QGraphicsItem *> added_items;
 		for (auto element : added_elements  ) added_items << element;
-		for (auto cond	: added_conductors) added_items << cond;
+		for (auto cond    : added_conductors) added_items << cond;
-		for (auto shape   : added_shapes	) added_items << shape;
+		for (auto shape   : added_shapes    ) added_items << shape;
-		for (auto text	: added_texts	 ) added_items << text;
+		for (auto text    : added_texts     ) added_items << text;
-		for (auto image   : added_images	) added_items << image;
+		for (auto image   : added_images    ) added_items << image;
-		for (auto table   : added_tables	) added_items << table;
+		for (auto table   : added_tables    ) added_items << table;
 		//Get the top left corner of the rectangle that contain all added items
 		QRectF items_rect;
@@ -1445,12 +1437,12 @@ bool Diagram::fromXml(QDomElement &document,
 		//Filling of falculatory lists
 	if (content_ptr) {
-		content_ptr -> m_elements		   = added_elements;
+		content_ptr -> m_elements           = added_elements;
 		content_ptr -> m_conductors_to_move = added_conductors;
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)	// ### Qt 6: remove
-		content_ptr -> m_text_fields		= added_texts.toSet();
+		content_ptr -> m_text_fields        = added_texts.toSet();
-		content_ptr -> m_images				= added_images.toSet();
+		content_ptr -> m_images			    = added_images.toSet();
-		content_ptr -> m_shapes				= added_shapes.toSet();
+		content_ptr -> m_shapes			    = added_shapes.toSet();
 #else
 #if TODO_LIST
 #pragma message("@TODO remove code for QT 5.14 or later")
@@ -1465,7 +1457,7 @@ bool Diagram::fromXml(QDomElement &document,
 					added_shapes.begin(),
 					added_shapes.end());
 #endif
-		content_ptr -> m_tables			 = added_tables;
+		content_ptr -> m_tables             = added_tables;
 	}
 	adjustSceneRect();
@@ -1483,23 +1475,23 @@ bool Diagram::fromXml(QDomElement &document,
 	@param autonumFolioSeqType
 */
 void Diagram::folioSequentialsFromXml(const QDomElement &root,
-					  QHash<QString,
+				      QHash<QString,
-					  QStringList>* hash,
+				      QStringList>* hash,
-					  const QString& folioSeq,
+				      const QString& folioSeq,
-					  const QString& seq,
+				      const QString& seq,
-					  const QString& type,
+				      const QString& type,
-					  const QString& autonumFolioSeqType) {
+				      const QString& autonumFolioSeqType) {
 	foreach (QDomElement folioSeqAutoNum,
 		 QET::findInDomElement(root, autonumFolioSeqType, folioSeq)) {
 		for(QDomElement folioseq
-			= folioSeqAutoNum.firstChildElement(type);
+		    = folioSeqAutoNum.firstChildElement(type);
-			!folioseq.isNull();
+		    !folioseq.isNull();
-			folioseq = folioseq.nextSiblingElement(type)) {
+		    folioseq = folioseq.nextSiblingElement(type)) {
 			QString title = folioseq.attribute("title");
 			QStringList list;
 			int i = 1;
 			while (folioseq.hasAttribute(seq
-							 + QString::number(i))) {
+						     + QString::number(i))) {
 				list << folioseq.attribute(
 						seq + QString::number(i));
 				i++;
@@ -1537,7 +1529,7 @@ void Diagram::refreshContents()
 /**
 	@brief Diagram::addItem
-	R??implemented from QGraphicsScene::addItem(QGraphicsItem *item)
+	Réimplemented from QGraphicsScene::addItem(QGraphicsItem *item)
 	Do some specific operation if item need it (for exemple an element)
 	@param item
 */
@@ -1773,10 +1765,10 @@ void Diagram::insertFolioSeqHash(QHash<QString,
 	@param nc : Context to be manipulated
 */
 void Diagram::loadFolioSeqHash(QHash<QString,
-				   QStringList> *hash,
+			       QStringList> *hash,
-				   const QString& title,
+			       const QString& title,
-				   const QString& type,
+			       const QString& type,
-				   NumerotationContext *nc) {
+			       NumerotationContext *nc) {
 		int j = 0;
 		for (int i = 0; i < nc->size(); i++) {
 			if (nc->itemAt(i).at(0) == type) {
@@ -1801,9 +1793,9 @@ void Diagram::changeZValue(QET::DepthOption option)
 	DiagramContent dc(this);
 	QUndoCommand *undo = new QUndoCommand(tr("Modifier la profondeur"));
 	QList<QGraphicsItem *> l = dc.items(DiagramContent::SelectedOnly | \
-						DiagramContent::Elements | \
+					    DiagramContent::Elements | \
-						DiagramContent::Shapes | \
+					    DiagramContent::Shapes | \
-						DiagramContent::Images);
+					    DiagramContent::Images);
 	QList<QGraphicsObject *> list;
 	for(QGraphicsItem *item : l)
 		list << item->toGraphicsObject();
@@ -1864,28 +1856,6 @@ void Diagram::changeZValue(QET::DepthOption option)
 		delete undo;
 }
 int Diagram::uniqueTerminalID() const
 {
    for (int i=1; i < 10000; i++) {
        bool found = false;
        for (auto element: elements()) {
            for (auto terminal: element->terminals()) {
                if (terminal->ID() == i) {
                    found = true;
                    break;
                }
            }
            if (found) {
                break;
            }
        }
        if (!found)
            return i;
    }
    return -1;
 }
 /**
 	@brief Diagram::loadElmtFolioSeq
 	This class loads all folio sequential variables related
@@ -2214,7 +2184,7 @@ void Diagram::adjustSceneRect()
 {
 	QRectF old_rect = sceneRect();
 	setSceneRect(border_and_titleblock.borderAndTitleBlockRect().united(
-				 itemsBoundingRect()));
+			     itemsBoundingRect()));
 	update(old_rect.united(sceneRect()));
 }
@@ -2235,20 +2205,20 @@ ExportProperties Diagram::applyProperties(
 	// exports current rendering options
 	// exporte les options de rendu en cours
 	ExportProperties old_properties;
-	old_properties.draw_grid			   = displayGrid();
+	old_properties.draw_grid               = displayGrid();
 	old_properties.draw_border = border_and_titleblock.borderIsDisplayed();
 	old_properties.draw_titleblock = border_and_titleblock.titleBlockIsDisplayed();
-	old_properties.draw_terminals		  = drawTerminals();
+	old_properties.draw_terminals          = drawTerminals();
 	old_properties.draw_colored_conductors = drawColoredConductors();
 	old_properties.exported_area = useBorder() ? QET::BorderArea
 						   : QET::ElementsArea;
 	// apply the new rendering options
 	// applique les nouvelles options de rendu
-	setUseBorder			 (new_properties.exported_area == QET::BorderArea);
+	setUseBorder             (new_properties.exported_area == QET::BorderArea);
-	setDrawTerminals		 (new_properties.draw_terminals);
+	setDrawTerminals         (new_properties.draw_terminals);
 	setDrawColoredConductors (new_properties.draw_colored_conductors);
-	setDisplayGrid		   (new_properties.draw_grid);
+	setDisplayGrid           (new_properties.draw_grid);
 	border_and_titleblock.displayBorder(new_properties.draw_border);
 	border_and_titleblock.displayTitleBlock (new_properties.draw_titleblock);
--- a/sources/diagram.h
+++ b/sources/diagram.h
@@ -96,7 +96,7 @@ class Diagram : public QGraphicsScene
 		/// margin around the diagram
 		static const qreal margin;
 		/// background color of diagram
-		static QColor background_color; // default value set in cpp file
+		static QColor background_color;
 		/// Hash containing max values for folio sequential autonums in this diagram
 		QHash <QString, QStringList> m_elmt_unitfolio_max;
 		QHash <QString, QStringList> m_elmt_tenfolio_max;
@@ -108,10 +108,10 @@ class Diagram : public QGraphicsScene
 	private:
 		QGraphicsLineItem *conductor_setter_;
-		ElementsMover	 m_elements_mover;
+		ElementsMover     m_elements_mover;
 		ElementTextsMover m_element_texts_mover;
-		QGIManager		*qgi_manager_;
+		QGIManager        *qgi_manager_;
-		QETProject		*m_project;
+		QETProject        *m_project;
 		QDomDocument xml_document_;
@@ -156,9 +156,9 @@ class Diagram : public QGraphicsScene
 		// methods related to parent project
 		QETProject *project() const;
-		int		 folioIndex() const;
+		int         folioIndex() const;
-		void		showMe() {emit showDiagram(this);}
+		void        showMe() {emit showDiagram(this);}
-		bool		isReadOnly() const;
+		bool        isReadOnly() const;
 		// methods related to conductor creation
 		void setConductor(bool);
@@ -173,13 +173,13 @@ class Diagram : public QGraphicsScene
 				 bool = true,
 				 DiagramContent * = nullptr);
 		bool fromXml(QDomDocument &,
-				 QPointF = QPointF(),
+			     QPointF = QPointF(),
-				 bool = true,
+			     bool = true,
-				 DiagramContent * = nullptr);
+			     DiagramContent * = nullptr);
 		bool fromXml(QDomElement &,
-				 QPointF = QPointF(),
+			     QPointF = QPointF(),
-				 bool = true,
+			     bool = true,
-				 DiagramContent * = nullptr);
+			     DiagramContent * = nullptr);
 		void folioSequentialsToXml(QHash<QString,
 					   QStringList>*,
 					   QDomElement *,
@@ -187,17 +187,17 @@ class Diagram : public QGraphicsScene
 					   const QString&,
 					   QDomDocument *);
 		void folioSequentialsFromXml(const QDomElement&,
-						 QHash<QString,
+					     QHash<QString,
-						 QStringList>*,
+					     QStringList>*,
-						 const QString&,
+					     const QString&,
-						 const QString&,
+					     const QString&,
-						 const QString&,
+					     const QString&,
-						 const QString&);
+					     const QString&);
 		void refreshContents();
 		// methods related to graphics items addition/removal on the diagram
-		virtual void addItem	(QGraphicsItem *item);
+		virtual void addItem    (QGraphicsItem *item);
 		virtual void removeItem (QGraphicsItem *item);
 		// methods related to graphics options
@@ -253,23 +253,16 @@ class Diagram : public QGraphicsScene
 					 const QString& seq,
 					 NumerotationContext *nc);
 		void loadFolioSeqHash (QHash<QString, QStringList> *hash,
-					   const QString& title, const QString& seq,
+				       const QString& title, const QString& seq,
-					   NumerotationContext *nc);
+				       NumerotationContext *nc);
 		void changeZValue(QET::DepthOption option);
 		/*!
 		 * \brief uniqueTerminalID
 		 * Determines a new unique Terminal ID
 		 * This is used only for legacy purpose
 		 */
        int uniqueTerminalID() const;
 	public slots:
 		void adjustSceneRect ();
 		void titleChanged(const QString &);
 		void titleBlockTemplateChanged(const QString &);
 		void titleBlockTemplateRemoved(const QString &,
-						   const QString & = QString());
+					       const QString & = QString());
 		void setTitleBlockTemplate(const QString &);
 		void updateLabels();
 		void loadElmtFolioSeq();
@@ -289,8 +282,6 @@ class Diagram : public QGraphicsScene
 		/// from the diagram within elements collection
 		void findElementRequired(const ElementsLocation &);
 		/// Signal emitted when users wish to edit an element from the diagram
 		void editElementRequired(const ElementsLocation &);
 		void diagramActivated();
 };
 Q_DECLARE_METATYPE(Diagram *)
--- a/sources/diagramcontext.cpp
+++ b/sources/diagramcontext.cpp
@@ -135,7 +135,7 @@ bool DiagramContext::keyMustShow(const QString &key) const
 bool DiagramContext::operator==(const DiagramContext &dc) const
 {
-	return(m_content	 == dc.m_content &&
+	return(m_content     == dc.m_content &&
 		   m_content_show == dc.m_content_show);
 }
--- a/sources/diagramcontext.h
+++ b/sources/diagramcontext.h
@@ -34,23 +34,23 @@
 /**
 * Key for element :
- * label						  -> label or identification of element
+ * label                          -> label or identification of element
- * formula						-> formula used to create the label (formula is make with variable)
+ * formula                        -> formula used to create the label (formula is make with variable)
- * designation					-> exhaustive comment used to explain what the element does.
+ * designation                    -> exhaustive comment used to explain what the element does.
- * description					-> exhaustive description used to explain what the element does.
+ * description                    -> exhaustive description used to explain what the element does.
- * plant						  -> the plant assigned to the element
+ * plant                          -> the plant assigned to the element
- * comment						-> a little comment wich can be displayed in the folio
+ * comment                        -> a little comment wich can be displayed in the folio
- * manufacturer				   -> the manufacturer of the element
+ * manufacturer                   -> the manufacturer of the element
- * manufacturer_reference		 -> the manufacturer reference of the element
+ * manufacturer_reference         -> the manufacturer reference of the element
- * quantity					   -> quantity of the element
+ * quantity                       -> quantity of the element
- * unity						  -> unity of the element
+ * unity                          -> unity of the element
- * auxiliary1					 -> auxiliary 1 of element
+ * auxiliary1                     -> auxiliary 1 of element
- * auxiliary2					 -> auxiliary 2 of element
+ * auxiliary2                     -> auxiliary 2 of element
 * machine_manufacturer_reference -> reference of the machine manufacturer
- * supplier					   -> the supplier of the element
+ * supplier                       -> the supplier of the element
- * function					   -> the function of element
+ * function                       -> the function of element
- * location					   -> the location assigned to the element
+ * location                       -> the location assigned to the element
- * frozenLabel					-> label locked at a given time
+ * frozenLabel                    -> label locked at a given time
 *
 */
 class DiagramContext
--- a/sources/editor/arceditor.cpp
+++ b/sources/editor/arceditor.cpp
@@ -210,7 +210,7 @@ void ArcEditor::updateArcA()
 	@brief ArcEditor::updateForm
 	Update the value of the widgets
 */
-void ArcEditor::updateFormPriv()
+void ArcEditor::updateForm()
 {
 	if (!m_part) return;
 	activeConnections(false);
--- a/sources/editor/arceditor.h
+++ b/sources/editor/arceditor.h
@@ -46,6 +46,8 @@ class ArcEditor : public ElementItemEditor
 		QDoubleSpinBox *x, *y, *h, *v;
 		QSpinBox *angle, *start_angle;
 		bool m_locked;
 		QList <QMetaObject::Connection> m_change_connections;
 		// methods
 	public:
@@ -57,7 +59,7 @@ class ArcEditor : public ElementItemEditor
 	public slots:
 		void updateArcS();
 		void updateArcA();
-        void updateFormPriv() override;
+		void updateForm() override;
 		void updateRect();
 	private:
--- a/sources/editor/elementitemeditor.cpp
+++ b/sources/editor/elementitemeditor.cpp
@@ -42,11 +42,6 @@ ElementScene *ElementItemEditor::elementScene() const
 	return(element_editor -> elementScene());
 }
 void ElementItemEditor::updateForm()
 {
    updateFormPriv();
 }
 /// @return la QUndoStack a utiliser pour les annulations
 QUndoStack &ElementItemEditor::undoStack() const
 {
--- a/sources/editor/elementitemeditor.h
+++ b/sources/editor/elementitemeditor.h
@@ -55,16 +55,8 @@ class ElementItemEditor : public QWidget
 		virtual CustomElementPart *currentPart() const = 0;
 		virtual QList<CustomElementPart*> currentParts() const = 0;
-        /*!
+		virtual void updateForm() = 0;
         * \brief updateForm
         * update the values of the widget
         */
        virtual void updateForm();
    private:
        virtual void updateFormPriv() = 0;
 protected:
        QList<QMetaObject::Connection> m_change_connections;
 		// attributes
 	private:
 		QETElementEditor *element_editor;
--- a/sources/editor/graphicspart/abstractpartellipse.h
+++ b/sources/editor/graphicspart/abstractpartellipse.h
@@ -79,8 +79,8 @@ class AbstractPartEllipse : public CustomElementGraphicPart
 	protected:
 		QList<QPointF> saved_points_;
 		QRectF m_rect;
-        qreal m_start_angle{0};
+		qreal m_start_angle;
-        qreal m_span_angle{-1440};
+		qreal m_span_angle;
 		QVector<QetGraphicsHandlerItem *> m_handler_vector;
 };
--- a/sources/editor/graphicspart/customelementgraphicpart.cpp
+++ b/sources/editor/graphicspart/customelementgraphicpart.cpp
@@ -20,8 +20,6 @@
 #include "../../QPropertyUndoCommand/qpropertyundocommand.h"
 #include "../elementscene.h"
 #include "../../qetxml.h"
 #include <QRegularExpression>
 /**
@@ -116,7 +114,7 @@ qreal CustomElementGraphicPart::penWeight() const
 	if (_lineweight == NoneWeight || _lineweight == ThinWeight) return 0;
 	else if (_lineweight == NormalWeight) return 1;
 	else if (_lineweight == UltraWeight)  return 2;
-	else if (_lineweight == BigWeight)	return 5;
+	else if (_lineweight == BigWeight)    return 5;
 	return 1;
 }
@@ -169,21 +167,21 @@ void CustomElementGraphicPart::stylesToXml(QDomElement &qde) const
 	QString css_like_styles;
 	css_like_styles += "line-style:";
-	if	  (_linestyle == DashedStyle)	 css_like_styles += "dashed";
+	if      (_linestyle == DashedStyle)     css_like_styles += "dashed";
-	else if (_linestyle == DottedStyle)	 css_like_styles += "dotted";
+	else if (_linestyle == DottedStyle)     css_like_styles += "dotted";
 	else if (_linestyle == DashdottedStyle) css_like_styles += "dashdotted";
-	else if (_linestyle == NormalStyle)	 css_like_styles += "normal";
+	else if (_linestyle == NormalStyle)     css_like_styles += "normal";
 	css_like_styles += ";line-weight:";
-	if	  (_lineweight == NoneWeight)   css_like_styles += "none";
+	if      (_lineweight == NoneWeight)   css_like_styles += "none";
 	else if (_lineweight == ThinWeight)   css_like_styles += "thin";
 	else if (_lineweight == NormalWeight) css_like_styles += "normal";
 	else if (_lineweight == UltraWeight)  css_like_styles += "hight";
-	else if (_lineweight == BigWeight)	css_like_styles += "eleve";
+	else if (_lineweight == BigWeight)    css_like_styles += "eleve";
 	css_like_styles += ";filling:";
-	if	  (_filling == NoneFilling)  css_like_styles += "none";
+	if      (_filling == NoneFilling)  css_like_styles += "none";
 	else if (_filling == BlackFilling) css_like_styles += "black";
 	else if (_filling == WhiteFilling) css_like_styles += "white";
 	else if (_filling == GreenFilling) css_like_styles += "green";
@@ -344,7 +342,7 @@ void CustomElementGraphicPart::stylesToXml(QDomElement &qde) const
 	css_like_styles += ";color:";
-	if	  (_color == WhiteColor) css_like_styles += "white";
+	if      (_color == WhiteColor) css_like_styles += "white";
 	else if (_color == BlackColor) css_like_styles += "black";
 	else if (_color == GreenColor) css_like_styles += "green";
 	else if (_color == RedColor)   css_like_styles += "red";
@@ -499,6 +497,7 @@ void CustomElementGraphicPart::stylesToXml(QDomElement &qde) const
 	else if (_color == HTMLGrayBlackColor)  css_like_styles += "HTMLGrayBlack";
 	else if (_color == NoneColor)  css_like_styles += "none";
 	qde.setAttribute("style", css_like_styles);
 	qde.setAttribute("antialias", _antialiased ? "true" : "false");
 }
@@ -513,9 +512,6 @@ void CustomElementGraphicPart::stylesFromXml(const QDomElement &qde)
 {
 	resetStyles();
 	QString style_string;
    QETXML::propertyString(qde, "style", &style_string);
 		//Get the list of pair style/value
 #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)	// ### Qt 6: remove
 	QStringList styles = qde.attribute("style").split(";", QString::SkipEmptyParts);
@@ -903,17 +899,17 @@ void CustomElementGraphicPart::applyStylesToQPainter(QPainter &painter) const
 	QBrush brush = painter.brush();
 		//Apply pen style
-	if	  (_linestyle == DashedStyle)	 pen.setStyle(Qt::DashLine);
+	if      (_linestyle == DashedStyle)     pen.setStyle(Qt::DashLine);
 	else if (_linestyle == DashdottedStyle) pen.setStyle(Qt::DashDotLine);
-	else if (_linestyle == DottedStyle)	 pen.setStyle(Qt::DotLine);
+	else if (_linestyle == DottedStyle)     pen.setStyle(Qt::DotLine);
-	else if (_linestyle == NormalStyle)	 pen.setStyle(Qt::SolidLine);
+	else if (_linestyle == NormalStyle)     pen.setStyle(Qt::SolidLine);
 		//Apply pen width
-	if	  (_lineweight == NoneWeight)   pen.setColor(QColor(0, 0, 0, 0));
+	if      (_lineweight == NoneWeight)   pen.setColor(QColor(0, 0, 0, 0));
 	else if (_lineweight == ThinWeight)   pen.setWidth(0);
 	else if (_lineweight == NormalWeight) pen.setWidthF(1.0);
 	else if (_lineweight == UltraWeight)  pen.setWidthF(2.0);
-	else if (_lineweight == BigWeight)	pen.setWidthF(5.0);
+	else if (_lineweight == BigWeight)    pen.setWidthF(5.0);
 		//Apply brush color
 	if (_filling == NoneFilling) brush.setStyle(Qt::NoBrush);
@@ -924,7 +920,7 @@ void CustomElementGraphicPart::applyStylesToQPainter(QPainter &painter) const
 	else
 	{
 		brush.setStyle(Qt::SolidPattern);
-		if (_filling == BlackFilling)	  brush.setColor(Qt::black);
+		if (_filling == BlackFilling)      brush.setColor(Qt::black);
 		else if (_filling == WhiteFilling) brush.setColor(Qt::white);
 		else if (_filling == GreenFilling) brush.setColor(Qt::green);
 		else if (_filling == RedFilling)   brush.setColor(Qt::red);
@@ -1080,7 +1076,7 @@ void CustomElementGraphicPart::applyStylesToQPainter(QPainter &painter) const
 	}
 		//Apply pen color
-	if	  (_color == WhiteColor) pen.setColor(QColor(255, 255, 255, pen.color().alpha()));
+	if      (_color == WhiteColor) pen.setColor(QColor(255, 255, 255, pen.color().alpha()));
 	else if (_color == BlackColor) pen.setColor(QColor(  0,   0,   0, pen.color().alpha()));
 	else if (_color == GreenColor) pen.setColor(QColor(Qt::green));
 	else if (_color == RedColor)   pen.setColor(QColor(Qt::red));
@@ -1236,8 +1232,8 @@ void CustomElementGraphicPart::applyStylesToQPainter(QPainter &painter) const
 	else if (_color == NoneColor)  pen.setBrush(Qt::transparent);
 		//Apply antialiasing
-	painter.setRenderHint(QPainter::Antialiasing,		  _antialiased);
+	painter.setRenderHint(QPainter::Antialiasing,          _antialiased);
-	painter.setRenderHint(QPainter::TextAntialiasing,	  _antialiased);
+	painter.setRenderHint(QPainter::TextAntialiasing,      _antialiased);
 	painter.setRenderHint(QPainter::SmoothPixmapTransform, _antialiased);
 	painter.setPen(pen);
@@ -1316,7 +1312,7 @@ void CustomElementGraphicPart::mouseReleaseEvent(QGraphicsSceneMouseEvent *event
 	if((event->button() & Qt::LeftButton) && (flags() & QGraphicsItem::ItemIsMovable) && m_origin_pos != pos())
 	{
 		QPropertyUndoCommand *undo = new QPropertyUndoCommand(this, "pos", QVariant(m_origin_pos), QVariant(pos()));
-		undo->setText(tr("D??placer une primitive"));
+		undo->setText(tr("Déplacer une primitive"));
 		undo->enableAnimation();
 		elementScene()->undoStack().push(undo);
 	}
--- a/sources/editor/graphicspart/customelementgraphicpart.h
+++ b/sources/editor/graphicspart/customelementgraphicpart.h
@@ -40,9 +40,9 @@ class CustomElementGraphicPart : public QGraphicsObject, public CustomElementPar
 		Q_PROPERTY(LineStyle line_style   READ lineStyle   WRITE setLineStyle)
 		Q_PROPERTY(LineWeight line_weight READ lineWeight  WRITE setLineWeight)
-		Q_PROPERTY(Filling filling		READ filling	 WRITE setFilling)
+		Q_PROPERTY(Filling filling        READ filling     WRITE setFilling)
-		Q_PROPERTY(Color color			READ color	   WRITE setColor)
+		Q_PROPERTY(Color color            READ color       WRITE setColor)
-		Q_PROPERTY(bool antialias		 READ antialiased WRITE setAntialiased)
+		Q_PROPERTY(bool antialias         READ antialiased WRITE setAntialiased)
 	public:
 			//Line style
@@ -62,122 +62,122 @@ class CustomElementGraphicPart : public QGraphicsObject, public CustomElementPar
 		//Filling color of the part : NoneFilling -> No filling (i.e. transparent)
 		enum Filling { NoneFilling, BlackFilling, WhiteFilling,
-				   GreenFilling, RedFilling, BlueFilling,
+			       GreenFilling, RedFilling, BlueFilling,
-				   GrayFilling, BrunFilling, YellowFilling,
+			       GrayFilling, BrunFilling, YellowFilling,
-				   CyanFilling, MagentaFilling, LightgrayFilling,
+			       CyanFilling, MagentaFilling, LightgrayFilling,
-				   OrangeFilling, PurpleFilling,
+			       OrangeFilling, PurpleFilling,
-				   HTMLPinkPinkFilling, HTMLPinkLightPinkFilling,
+			       HTMLPinkPinkFilling, HTMLPinkLightPinkFilling,
-				   HTMLPinkHotPinkFilling, HTMLPinkDeepPinkFilling,
+			       HTMLPinkHotPinkFilling, HTMLPinkDeepPinkFilling,
-				   HTMLPinkPaleVioletRedFilling,
+			       HTMLPinkPaleVioletRedFilling,
-				   HTMLPinkMediumVioletRedFilling,
+			       HTMLPinkMediumVioletRedFilling,
-				   HTMLRedLightSalmonFilling, HTMLRedSalmonFilling,
+			       HTMLRedLightSalmonFilling, HTMLRedSalmonFilling,
-				   HTMLRedDarkSalmonFilling,
+			       HTMLRedDarkSalmonFilling,
-				   HTMLRedLightCoralFilling,
+			       HTMLRedLightCoralFilling,
-				   HTMLRedIndianRedFilling, HTMLRedCrimsonFilling,
+			       HTMLRedIndianRedFilling, HTMLRedCrimsonFilling,
-				   HTMLRedFirebrickFilling, HTMLRedDarkRedFilling,
+			       HTMLRedFirebrickFilling, HTMLRedDarkRedFilling,
-				   HTMLRedRedFilling, HTMLOrangeOrangeRedFilling,
+			       HTMLRedRedFilling, HTMLOrangeOrangeRedFilling,
-				   HTMLOrangeTomatoFilling, HTMLOrangeCoralFilling,
+			       HTMLOrangeTomatoFilling, HTMLOrangeCoralFilling,
-				   HTMLOrangeDarkOrangeFilling,
+			       HTMLOrangeDarkOrangeFilling,
-				   HTMLOrangeOrangeFilling, HTMLYellowYellowFilling,
+			       HTMLOrangeOrangeFilling, HTMLYellowYellowFilling,
-				   HTMLYellowLightYellowFilling,
+			       HTMLYellowLightYellowFilling,
-				   HTMLYellowLemonChiffonFilling,
+			       HTMLYellowLemonChiffonFilling,
-				   HTMLYellowLightGoldenrodYellowFilling,
+			       HTMLYellowLightGoldenrodYellowFilling,
-				   HTMLYellowPapayaWhipFilling,
+			       HTMLYellowPapayaWhipFilling,
-				   HTMLYellowMoccasinFilling,
+			       HTMLYellowMoccasinFilling,
-				   HTMLYellowPeachPuffFilling,
+			       HTMLYellowPeachPuffFilling,
-				   HTMLYellowPaleGoldenrodFilling,
+			       HTMLYellowPaleGoldenrodFilling,
-				   HTMLYellowKhakiFilling,
+			       HTMLYellowKhakiFilling,
-				   HTMLYellowDarkKhakiFilling,
+			       HTMLYellowDarkKhakiFilling,
-				   HTMLYellowGoldFilling, HTMLBrownCornsilkFilling,
+			       HTMLYellowGoldFilling, HTMLBrownCornsilkFilling,
-				   HTMLBrownBlanchedAlmondFilling,
+			       HTMLBrownBlanchedAlmondFilling,
-				   HTMLBrownBisqueFilling,
+			       HTMLBrownBisqueFilling,
-				   HTMLBrownNavajoWhiteFilling,
+			       HTMLBrownNavajoWhiteFilling,
-				   HTMLBrownWheatFilling, HTMLBrownBurlywoodFilling,
+			       HTMLBrownWheatFilling, HTMLBrownBurlywoodFilling,
-				   HTMLBrownTanFilling, HTMLBrownRosyBrownFilling,
+			       HTMLBrownTanFilling, HTMLBrownRosyBrownFilling,
-				   HTMLBrownSandyBrownFilling,
+			       HTMLBrownSandyBrownFilling,
-				   HTMLBrownGoldenrodFilling,
+			       HTMLBrownGoldenrodFilling,
-				   HTMLBrownDarkGoldenrodFilling,
+			       HTMLBrownDarkGoldenrodFilling,
-				   HTMLBrownPeruFilling, HTMLBrownChocolateFilling,
+			       HTMLBrownPeruFilling, HTMLBrownChocolateFilling,
-				   HTMLBrownSaddleBrownFilling,
+			       HTMLBrownSaddleBrownFilling,
-				   HTMLBrownSiennaFilling, HTMLBrownBrownFilling,
+			       HTMLBrownSiennaFilling, HTMLBrownBrownFilling,
-				   HTMLBrownMaroonFilling,
+			       HTMLBrownMaroonFilling,
-				   HTMLGreenDarkOliveGreenFilling,
+			       HTMLGreenDarkOliveGreenFilling,
-				   HTMLGreenOliveFilling, HTMLGreenOliveDrabFilling,
+			       HTMLGreenOliveFilling, HTMLGreenOliveDrabFilling,
-				   HTMLGreenYellowGreenFilling,
+			       HTMLGreenYellowGreenFilling,
-				   HTMLGreenLimeGreenFilling, HTMLGreenLimeFilling,
+			       HTMLGreenLimeGreenFilling, HTMLGreenLimeFilling,
-				   HTMLGreenLawnGreenFilling,
+			       HTMLGreenLawnGreenFilling,
-				   HTMLGreenChartreuseFilling,
+			       HTMLGreenChartreuseFilling,
-				   HTMLGreenGreenYellowFilling,
+			       HTMLGreenGreenYellowFilling,
-				   HTMLGreenSpringGreenFilling,
+			       HTMLGreenSpringGreenFilling,
-				   HTMLGreenMediumSpringGreenFilling,
+			       HTMLGreenMediumSpringGreenFilling,
-				   HTMLGreenLightGreenFilling,
+			       HTMLGreenLightGreenFilling,
-				   HTMLGreenPaleGreenFilling,
+			       HTMLGreenPaleGreenFilling,
-				   HTMLGreenDarkSeaGreenFilling,
+			       HTMLGreenDarkSeaGreenFilling,
-				   HTMLGreenMediumAquamarineFilling,
+			       HTMLGreenMediumAquamarineFilling,
-				   HTMLGreenMediumSeaGreenFilling,
+			       HTMLGreenMediumSeaGreenFilling,
-				   HTMLGreenSeaGreenFilling,
+			       HTMLGreenSeaGreenFilling,
-				   HTMLGreenForestGreenFilling,
+			       HTMLGreenForestGreenFilling,
-				   HTMLGreenGreenFilling, HTMLGreenDarkGreenFilling,
+			       HTMLGreenGreenFilling, HTMLGreenDarkGreenFilling,
-				   HTMLCyanAquaFilling, HTMLCyanCyanFilling,
+			       HTMLCyanAquaFilling, HTMLCyanCyanFilling,
-				   HTMLCyanLightCyanFilling,
+			       HTMLCyanLightCyanFilling,
-				   HTMLCyanPaleTurquoiseFilling,
+			       HTMLCyanPaleTurquoiseFilling,
-				   HTMLCyanAquamarineFilling,
+			       HTMLCyanAquamarineFilling,
-				   HTMLCyanTurquoiseFilling,
+			       HTMLCyanTurquoiseFilling,
-				   HTMLCyanMediumTurquoiseFilling,
+			       HTMLCyanMediumTurquoiseFilling,
-				   HTMLCyanDarkTurquoiseFilling,
+			       HTMLCyanDarkTurquoiseFilling,
-				   HTMLCyanLightSeaGreenFilling,
+			       HTMLCyanLightSeaGreenFilling,
-				   HTMLCyanCadetBlueFilling,
+			       HTMLCyanCadetBlueFilling,
-				   HTMLCyanDarkCyanFilling, HTMLCyanTealFilling,
+			       HTMLCyanDarkCyanFilling, HTMLCyanTealFilling,
-				   HTMLBlueLightSteelBlueFilling,
+			       HTMLBlueLightSteelBlueFilling,
-				   HTMLBluePowderBlueFilling,
+			       HTMLBluePowderBlueFilling,
-				   HTMLBlueLightBlueFilling, HTMLBlueSkyBlueFilling,
+			       HTMLBlueLightBlueFilling, HTMLBlueSkyBlueFilling,
-				   HTMLBlueLightSkyBlueFilling,
+			       HTMLBlueLightSkyBlueFilling,
-				   HTMLBlueDeepSkyBlueFilling,
+			       HTMLBlueDeepSkyBlueFilling,
-				   HTMLBlueDodgerBlueFilling,
+			       HTMLBlueDodgerBlueFilling,
-				   HTMLBlueCornflowerBlueFilling,
+			       HTMLBlueCornflowerBlueFilling,
-				   HTMLBlueSteelBlueFilling,
+			       HTMLBlueSteelBlueFilling,
-				   HTMLBlueRoyalBlueFilling, HTMLBlueBlueFilling,
+			       HTMLBlueRoyalBlueFilling, HTMLBlueBlueFilling,
-				   HTMLBlueMediumBlueFilling,
+			       HTMLBlueMediumBlueFilling,
-				   HTMLBlueDarkBlueFilling, HTMLBlueNavyFilling,
+			       HTMLBlueDarkBlueFilling, HTMLBlueNavyFilling,
-				   HTMLBlueMidnightBlueFilling,
+			       HTMLBlueMidnightBlueFilling,
-				   HTMLPurpleLavenderFilling,
+			       HTMLPurpleLavenderFilling,
-				   HTMLPurpleThistleFilling, HTMLPurplePlumFilling,
+			       HTMLPurpleThistleFilling, HTMLPurplePlumFilling,
-				   HTMLPurpleVioletFilling, HTMLPurpleOrchidFilling,
+			       HTMLPurpleVioletFilling, HTMLPurpleOrchidFilling,
-				   HTMLPurpleFuchsiaFilling,
+			       HTMLPurpleFuchsiaFilling,
-				   HTMLPurpleMagentaFilling,
+			       HTMLPurpleMagentaFilling,
-				   HTMLPurpleMediumOrchidFilling,
+			       HTMLPurpleMediumOrchidFilling,
-				   HTMLPurpleMediumPurpleFilling,
+			       HTMLPurpleMediumPurpleFilling,
-				   HTMLPurpleBlueVioletFilling,
+			       HTMLPurpleBlueVioletFilling,
-				   HTMLPurpleDarkVioletFilling,
+			       HTMLPurpleDarkVioletFilling,
-				   HTMLPurpleDarkOrchidFilling,
+			       HTMLPurpleDarkOrchidFilling,
-				   HTMLPurpleDarkMagentaFilling,
+			       HTMLPurpleDarkMagentaFilling,
-				   HTMLPurplePurpleFilling, HTMLPurpleIndigoFilling,
+			       HTMLPurplePurpleFilling, HTMLPurpleIndigoFilling,
-				   HTMLPurpleDarkSlateBlueFilling,
+			       HTMLPurpleDarkSlateBlueFilling,
-				   HTMLPurpleSlateBlueFilling,
+			       HTMLPurpleSlateBlueFilling,
-				   HTMLPurpleMediumSlateBlueFilling,
+			       HTMLPurpleMediumSlateBlueFilling,
-				   HTMLWhiteWhiteFilling, HTMLWhiteSnowFilling,
+			       HTMLWhiteWhiteFilling, HTMLWhiteSnowFilling,
-				   HTMLWhiteHoneydewFilling,
+			       HTMLWhiteHoneydewFilling,
-				   HTMLWhiteMintCreamFilling, HTMLWhiteAzureFilling,
+			       HTMLWhiteMintCreamFilling, HTMLWhiteAzureFilling,
-				   HTMLWhiteAliceBlueFilling,
+			       HTMLWhiteAliceBlueFilling,
-				   HTMLWhiteGhostWhiteFilling,
+			       HTMLWhiteGhostWhiteFilling,
-				   HTMLWhiteWhiteSmokeFilling,
+			       HTMLWhiteWhiteSmokeFilling,
-				   HTMLWhiteSeashellFilling, HTMLWhiteBeigeFilling,
+			       HTMLWhiteSeashellFilling, HTMLWhiteBeigeFilling,
-				   HTMLWhiteOldLaceFilling,
+			       HTMLWhiteOldLaceFilling,
-				   HTMLWhiteFloralWhiteFilling,
+			       HTMLWhiteFloralWhiteFilling,
-				   HTMLWhiteIvoryFilling,
+			       HTMLWhiteIvoryFilling,
-				   HTMLWhiteAntiqueWhiteFilling,
+			       HTMLWhiteAntiqueWhiteFilling,
-				   HTMLWhiteLinenFilling,
+			       HTMLWhiteLinenFilling,
-				   HTMLWhiteLavenderBlushFilling,
+			       HTMLWhiteLavenderBlushFilling,
-				   HTMLWhiteMistyRoseFilling,
+			       HTMLWhiteMistyRoseFilling,
-				   HTMLGrayGainsboroFilling,
+			       HTMLGrayGainsboroFilling,
-				   HTMLGrayLightGrayFilling, HTMLGraySilverFilling,
+			       HTMLGrayLightGrayFilling, HTMLGraySilverFilling,
-				   HTMLGrayDarkGrayFilling, HTMLGrayGrayFilling,
+			       HTMLGrayDarkGrayFilling, HTMLGrayGrayFilling,
-				   HTMLGrayDimGrayFilling,
+			       HTMLGrayDimGrayFilling,
-				   HTMLGrayLightSlateGrayFilling,
+			       HTMLGrayLightSlateGrayFilling,
-				   HTMLGraySlateGrayFilling,
+			       HTMLGraySlateGrayFilling,
-				   HTMLGrayDarkSlateGrayFilling,
+			       HTMLGrayDarkSlateGrayFilling,
-				   HTMLGrayBlackFilling, HorFilling, VerFilling,
+			       HTMLGrayBlackFilling, HorFilling, VerFilling,
-				   BdiagFilling, FdiagFilling};
+			       BdiagFilling, FdiagFilling};
 		Q_ENUM (Filling)
 			//Line color
@@ -269,18 +269,18 @@ class CustomElementGraphicPart : public QGraphicsObject, public CustomElementPar
 		~CustomElementGraphicPart() override;
 		static void drawCross (const QPointF &center,
-					   QPainter *painter);
+				       QPainter *painter);
 			//Getter and setter
-		LineStyle lineStyle	() const {return _linestyle;}
+		LineStyle lineStyle    () const {return _linestyle;}
-		void	  setLineStyle (const LineStyle ls);
+		void      setLineStyle (const LineStyle ls);
-		LineWeight lineWeight	() const {return _lineweight;}
+		LineWeight lineWeight    () const {return _lineweight;}
-		void	   setLineWeight (const LineWeight lw);
+		void       setLineWeight (const LineWeight lw);
-		qreal	  penWeight	 () const;
+		qreal      penWeight     () const;
 		Filling filling   () const {return _filling;}
-		void	setFilling(const Filling f);
+		void    setFilling(const Filling f);
 		Color color   () const {return _color;}
 		void  setColor(const Color c);
@@ -299,11 +299,11 @@ class CustomElementGraphicPart : public QGraphicsObject, public CustomElementPar
 		virtual QPainterPath shadowShape ()const = 0;
 		virtual void setHandlerColor(QPointF /*pos*/,
-						 const QColor &/*color*/) {}
+					     const QColor &/*color*/) {}
 		virtual void resetAllHandlerColor() {}
 	protected:
-        void stylesToXml  (QDomElement &) const;
+		void stylesToXml  (QDomElement &) const;
 		void stylesFromXml(const QDomElement &);
 		void resetStyles  ();
 		void applyStylesToQPainter(QPainter &) const;
--- a/sources/editor/graphicspart/customelementpart.h
+++ b/sources/editor/graphicspart/customelementpart.h
@@ -19,7 +19,6 @@
 #define CUSTOM_ELEMENT_PART_H
 #include "../../qet.h"
 #include "../../properties/propertiesinterface.h"
 class CustomElement;
 class ElementPrimitiveDecorator;
@@ -38,7 +37,7 @@ class QGraphicsSceneMouseEvent;
 	there is no point for those classes to store their visual representation
 	with anything more complex than a QImage.
 */
-class CustomElementPart: public PropertiesInterface {
+class CustomElementPart {
 	// constructors, destructor
 	public:
 	/**
@@ -62,6 +61,14 @@ class CustomElementPart: public PropertiesInterface {
 	// methods
 	public:
 	/**
 		Load the primitive from an XML element that describes it
 	*/
 	virtual void fromXml(const QDomElement &) = 0;
 	/**
 		Export the primitive as an XML element
 	*/
 	virtual const QDomElement toXml(QDomDocument &) const = 0;
 	/**
 		Set a specific property of the primitive
 	*/
@@ -85,7 +92,7 @@ class CustomElementPart: public PropertiesInterface {
 		Make this part fit into the provided rectangle.
 	*/
 	virtual void handleUserTransformation(const QRectF &,
-						  const QRectF &) = 0;
+					      const QRectF &) = 0;
 	/// @return a pointer to the parent element editor
 	virtual QETElementEditor *elementEditor() const;
 	/**
--- a/sources/editor/graphicspart/partarc.cpp
+++ b/sources/editor/graphicspart/partarc.cpp
@@ -22,8 +22,6 @@
 #include "../../QetGraphicsItemModeler/qetgraphicshandlerutility.h"
 #include "../elementscene.h"
 #include "../../qetxml.h"
 /**
 	@brief PartArc::PartArc
 	Constructor
@@ -31,9 +29,10 @@
 	@param parent : parent item
 */
 PartArc::PartArc(QETElementEditor *editor, QGraphicsItem *parent) :
-    AbstractPartEllipse(editor, parent)
+	AbstractPartEllipse(editor, parent)
 {
-    setTagName("arc");
+	m_start_angle = 0;
 	m_span_angle = -1440;
 }
 /**
@@ -103,18 +102,19 @@ void PartArc::paint(QPainter *painter, const QStyleOptionGraphicsItem *options,
 	@param xml_document : Xml document to use for create the xml element.
 	@return : an xml element that describe this arc
 */
-void PartArc::toXmlPriv(QDomElement& xml_element) const
+const QDomElement PartArc::toXml(QDomDocument &xml_document) const
 {
-    xml_element.setTagName("arc");
+	QDomElement xml_element = xml_document.createElement("arc");
-    QPointF top_left(sceneTopLeft());
+	QPointF top_left(sceneTopLeft());
-    xml_element.setAttribute("x", QString("%1").arg(top_left.x()));
+	xml_element.setAttribute("x", QString("%1").arg(top_left.x()));
-    xml_element.setAttribute("y", QString("%1").arg(top_left.y()));
+	xml_element.setAttribute("y", QString("%1").arg(top_left.y()));
-    xml_element.setAttribute("width",  QString("%1").arg(rect().width()));
+	xml_element.setAttribute("width",  QString("%1").arg(rect().width()));
-    xml_element.setAttribute("height", QString("%1").arg(rect().height()));
+	xml_element.setAttribute("height", QString("%1").arg(rect().height()));
-        //to maintain compatibility with the previous version, we write the angle in degrees.
+		//to maintain compatibility with the previous version, we write the angle in degrees.
-    xml_element.setAttribute("start", QString("%1").arg(m_start_angle / 16));
+	xml_element.setAttribute("start", QString("%1").arg(m_start_angle / 16));
-    xml_element.setAttribute("angle", QString("%1").arg(m_span_angle / 16));
+	xml_element.setAttribute("angle", QString("%1").arg(m_span_angle / 16));
-    stylesToXml(xml_element);
+	stylesToXml(xml_element);
 	return(xml_element);
 }
 /**
@@ -122,41 +122,15 @@ void PartArc::toXmlPriv(QDomElement& xml_element) const
 	Import the properties of this arc from a xml element.
 	@param qde : Xml document to use.
 */
-bool PartArc::fromXmlPriv(const QDomElement &qde) {
+void PartArc::fromXml(const QDomElement &qde) {
 	stylesFromXml(qde);
 	m_rect = QRectF(mapFromScene(qde.attribute("x", "0").toDouble(),
 								 qde.attribute("y", "0").toDouble()),
 					QSizeF(qde.attribute("width",  "0").toDouble(),
 						   qde.attribute("height", "0").toDouble()) );
-	double x=0, y=0, w=0, h=0;
+	m_start_angle = qde.attribute("start", "0").toDouble() * 16;
-	if (QETXML::propertyDouble(qde, "x", &x) == QETXML::PropertyFlags::NoValidConversion ||
+	m_span_angle  = qde.attribute("angle", "-1440").toDouble() * 16;
 		QETXML::propertyDouble(qde, "y", &y) == QETXML::PropertyFlags::NoValidConversion ||
 		QETXML::propertyDouble(qde, "width", &w) == QETXML::PropertyFlags::NoValidConversion ||
 		QETXML::propertyDouble(qde, "height", &h) == QETXML::PropertyFlags::NoValidConversion)
 		return false;
 	m_rect = QRectF(mapFromScene(x, y), QSizeF(w, h) );
 	m_start_angle = 0;
 	if (QETXML::propertyDouble(qde, "start", &m_start_angle)  == QETXML::PropertyFlags::NoValidConversion)
 		return false;
 	m_start_angle *= 16;
 	m_span_angle = -1440;
 	if (QETXML::propertyDouble(qde, "angle", &m_span_angle) == QETXML::PropertyFlags::NoValidConversion)
 		return false;
 	m_span_angle *= 16;
 	return true;
 }
 bool PartArc::valideXml(QDomElement& element) {
 	if (QETXML::propertyDouble(element, "x") == QETXML::PropertyFlags::NoValidConversion ||
 		QETXML::propertyDouble(element, "y") == QETXML::PropertyFlags::NoValidConversion ||
 		QETXML::propertyDouble(element, "width") == QETXML::PropertyFlags::NoValidConversion ||
 		QETXML::propertyDouble(element, "height") == QETXML::PropertyFlags::NoValidConversion ||
 		QETXML::propertyDouble(element, "start")  == QETXML::PropertyFlags::NoValidConversion ||
 		QETXML::propertyDouble(element, "angle") == QETXML::PropertyFlags::NoValidConversion)
 		return false;
 	return true;
 }
 /**
--- a/sources/editor/graphicspart/partarc.h
+++ b/sources/editor/graphicspart/partarc.h
@@ -49,13 +49,10 @@ class PartArc : public AbstractPartEllipse
 		void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override;
 			//Name and XML
-		QString name()	const override { return(QObject::tr("arc", "element part name")); }
+		QString name()    const override { return(QObject::tr("arc", "element part name")); }
 		QString xmlName() const override { return(QString("arc")); }
-        void toXmlPriv(QDomElement&xml_element) const override;
+		const QDomElement toXml   (QDomDocument &) const override;
-		bool fromXmlPriv (const QDomElement &) override;
+		void              fromXml (const QDomElement &) override;
 		static bool valideXml(QDomElement& element);
        void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/}
        void fromSettings(QSettings &,const QString & = QString()) override{/*TODO: implement*/}
 		QPainterPath shape() const override;
 		QPainterPath shadowShape() const override;
@@ -73,7 +70,7 @@ class PartArc : public AbstractPartEllipse
 		void switchResizeMode();
 		void adjusteHandlerPos();
 		void handlerMousePressEvent   (QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event);
-		void handlerMouseMoveEvent	(QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event);
+		void handlerMouseMoveEvent    (QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event);
 		void handlerMouseReleaseEvent (QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event);
 		void sceneSelectionChanged ();
--- a/sources/editor/graphicspart/partdynamictextfield.cpp
+++ b/sources/editor/graphicspart/partdynamictextfield.cpp
@@ -21,8 +21,6 @@
 #include "../../qetapp.h"
 #include "../elementscene.h"
 #include "../../qetxml.h"
 #include <QColor>
 #include <QFont>
 #include <QGraphicsSceneMouseEvent>
@@ -32,7 +30,6 @@ PartDynamicTextField::PartDynamicTextField(QETElementEditor *editor, QGraphicsIt
 	CustomElementPart(editor),
 	m_uuid(QUuid::createUuid())
 {
    setTagName(xmlName());
 	setDefaultTextColor(Qt::black);
 	setFont(QETApp::dynamicTextsItemFont());
 	QSettings settings;
@@ -96,91 +93,88 @@ void PartDynamicTextField::handleUserTransformation(
 	@param dom_doc
 	@return
 */
-void PartDynamicTextField::toXmlPriv(QDomElement& root_element) const
+const QDomElement PartDynamicTextField::toXml(QDomDocument &dom_doc) const
 {
 	QDomElement root_element = dom_doc.createElement(xmlName());
-    root_element.setAttribute("x", QString::number(pos().x()));
+	root_element.setAttribute("x", QString::number(pos().x()));
-    root_element.setAttribute("y", QString::number(pos().y()));
+	root_element.setAttribute("y", QString::number(pos().y()));
-    root_element.setAttribute("z", QString::number(zValue()));
+	root_element.setAttribute("z", QString::number(zValue()));
-    root_element.setAttribute("rotation", QString::number(QET::correctAngle(rotation())));
+	root_element.setAttribute("rotation", QString::number(QET::correctAngle(rotation())));
-    root_element.setAttribute("font", font().toString());
+	root_element.setAttribute("font", font().toString());
-    root_element.setAttribute("uuid", m_uuid.toString());
+	root_element.setAttribute("uuid", m_uuid.toString());
-    root_element.setAttribute("frame", m_frame? "true" : "false");
+	root_element.setAttribute("frame", m_frame? "true" : "false");
-    root_element.setAttribute("text_width", QString::number(m_text_width));
+	root_element.setAttribute("text_width", QString::number(m_text_width));
-    QMetaEnum me = DynamicElementTextItem::textFromMetaEnum();
+	QMetaEnum me = DynamicElementTextItem::textFromMetaEnum();
-    root_element.setAttribute("text_from", me.valueToKey(m_text_from));
+	root_element.setAttribute("text_from", me.valueToKey(m_text_from));
-    me = QMetaEnum::fromType<Qt::Alignment>();
+	me = QMetaEnum::fromType<Qt::Alignment>();
-    if(this -> alignment() &Qt::AlignRight)
+	if(this -> alignment() &Qt::AlignRight)
-        root_element.setAttribute("Halignment", me.valueToKey(Qt::AlignRight));
+		root_element.setAttribute("Halignment", me.valueToKey(Qt::AlignRight));
-    else if(this -> alignment() &Qt::AlignLeft)
+	else if(this -> alignment() &Qt::AlignLeft)
-        root_element.setAttribute("Halignment", me.valueToKey(Qt::AlignLeft));
+		root_element.setAttribute("Halignment", me.valueToKey(Qt::AlignLeft));
-    else if(this -> alignment() &Qt::AlignHCenter)
+	else if(this -> alignment() &Qt::AlignHCenter)
-        root_element.setAttribute("Halignment", me.valueToKey(Qt::AlignHCenter));
+		root_element.setAttribute("Halignment", me.valueToKey(Qt::AlignHCenter));
-    if(this -> alignment() &Qt::AlignBottom)
+	if(this -> alignment() &Qt::AlignBottom)
-        root_element.setAttribute("Valignment", me.valueToKey(Qt::AlignBottom));
+		root_element.setAttribute("Valignment", me.valueToKey(Qt::AlignBottom));
-    else if(this -> alignment() & Qt::AlignTop)
+	else if(this -> alignment() & Qt::AlignTop)
-        root_element.setAttribute("Valignment", me.valueToKey(Qt::AlignTop));
+		root_element.setAttribute("Valignment", me.valueToKey(Qt::AlignTop));
-    else if(this -> alignment() &Qt::AlignVCenter)
+	else if(this -> alignment() &Qt::AlignVCenter)
-        root_element.setAttribute("Valignment", me.valueToKey(Qt::AlignVCenter));
+		root_element.setAttribute("Valignment", me.valueToKey(Qt::AlignVCenter));
-    QDomElement dom_text = root_element.ownerDocument().createElement("text");
+	QDomElement dom_text = dom_doc.createElement("text");
-    dom_text.appendChild(root_element.ownerDocument().createTextNode(toPlainText()));
+	dom_text.appendChild(dom_doc.createTextNode(toPlainText()));
-    root_element.appendChild(dom_text);
+	root_element.appendChild(dom_text);
-        //Info name
+		//Info name
-    if(!m_info_name.isEmpty()) {
+	if(!m_info_name.isEmpty()) {
-        QDomElement dom_info_name = root_element.ownerDocument().createElement("info_name");
+		QDomElement dom_info_name = dom_doc.createElement("info_name");
-        dom_info_name.appendChild(root_element.ownerDocument().createTextNode(m_info_name));
+		dom_info_name.appendChild(dom_doc.createTextNode(m_info_name));
-        root_element.appendChild(dom_info_name);
+		root_element.appendChild(dom_info_name);
-    }
+	}
-        //Composite text
+		//Composite text
-    if(!m_composite_text.isEmpty()) {
+	if(!m_composite_text.isEmpty()) {
-        QDomElement dom_comp_text = root_element.ownerDocument().createElement("composite_text");
+		QDomElement dom_comp_text = dom_doc.createElement("composite_text");
-        dom_comp_text.appendChild(root_element.ownerDocument().createTextNode(m_composite_text));
+		dom_comp_text.appendChild(dom_doc.createTextNode(m_composite_text));
-        root_element.appendChild(dom_comp_text);
+		root_element.appendChild(dom_comp_text);
-    }
+	}
-        //Color
+		//Color
-    if(color() != QColor(Qt::black)) {
+	if(color() != QColor(Qt::black)) {
-        QDomElement dom_color = root_element.ownerDocument().createElement("color");
+		QDomElement dom_color = dom_doc.createElement("color");
-        dom_color.appendChild(root_element.ownerDocument().createTextNode(color().name()));
+		dom_color.appendChild(dom_doc.createTextNode(color().name()));
-        root_element.appendChild(dom_color);
+		root_element.appendChild(dom_color);
-    }
+	}
 	return root_element;
 }
 /**
 	@brief PartDynamicTextField::fromXml
 	@param dom_elmt
 */
-bool PartDynamicTextField::fromXmlPriv(const QDomElement &dom_elmt)
+void PartDynamicTextField::fromXml(const QDomElement &dom_elmt) {
 {
 	if (dom_elmt.tagName() != xmlName()) {
 		qDebug() << "PartDynamicTextField::fromXml : Wrong tagg name";
-		return false;
+		return;
 	}
-	double x=0, y=0, z=0, rot=0;
+	QGraphicsTextItem::setPos(
-	if (QETXML::propertyDouble(dom_elmt, "x", &x) == QETXML::PropertyFlags::NoValidConversion ||
+		dom_elmt.attribute("x", QString::number(0)).toDouble(),
-		QETXML::propertyDouble(dom_elmt, "y", &y) == QETXML::PropertyFlags::NoValidConversion ||
+		dom_elmt.attribute("y", QString::number(0)).toDouble()
-		QETXML::propertyDouble(dom_elmt, "z", &z) == QETXML::PropertyFlags::NoValidConversion ||
+	);
-		QETXML::propertyDouble(dom_elmt, "rotation", &rot) == QETXML::PropertyFlags::NoValidConversion)
+	setZValue(dom_elmt.attribute("z", QString::number(zValue())).toDouble());
-		return false;
+	QGraphicsTextItem::setRotation(dom_elmt.attribute("rotation", QString::number(0)).toDouble());
 	QGraphicsTextItem::setPos(x, y);
 	setZValue(z);
 	QGraphicsTextItem::setRotation(rot);
-	QString font;
+	if (dom_elmt.hasAttribute("font")) {
    if (QETXML::propertyString(dom_elmt, "font", &font) == QETXML::PropertyFlags::Success)
 	{
 		QFont font_;
-		font_.fromString(font);
+		font_.fromString(dom_elmt.attribute("font"));
 		setFont(font_);
-	} else {	//Keep compatibility TODO remove in futur
+	}
 	else {
 #if TODO_LIST
 #pragma message("@TODO remove in futur")
 #endif
@@ -188,24 +182,19 @@ bool PartDynamicTextField::fromXmlPriv(const QDomElement &dom_elmt)
 		setFont(QETApp::dynamicTextsItemFont(9));
 	}
-    QETXML::propertyUuid(dom_elmt, "uuid", &m_uuid);
+	m_uuid = QUuid(dom_elmt.attribute("uuid", QUuid::createUuid().toString()));
-	bool frame;
+	setFrame(dom_elmt.attribute("frame", "false") == "true"? true : false);
-	QETXML::propertyBool(dom_elmt, "frame", &frame);
+	setTextWidth(dom_elmt.attribute("text_width", QString::number(-1)).toDouble());
 	double text_width=-1;
 	QETXML::propertyDouble(dom_elmt, "text_width", &text_width);
 	setTextWidth(text_width);
 	QMetaEnum me = DynamicElementTextItem::textFromMetaEnum();
-	QString text_from;
+	m_text_from = DynamicElementTextItem::TextFrom(
-    QETXML::propertyString(dom_elmt, "text_from", &text_from);
+		me.keyToValue(dom_elmt.attribute("text_from").toStdString().data()));
 	m_text_from = DynamicElementTextItem::TextFrom(me.keyToValue(text_from.toStdString().data()));
 	me = QMetaEnum::fromType<Qt::Alignment>();
-	QString alignment;
+	if(dom_elmt.hasAttribute("Halignment"))
-    if(QETXML::propertyString(dom_elmt, "Halignment", &alignment) != QETXML::PropertyFlags::NotFound)
+		setAlignment(Qt::Alignment(
-		setAlignment(Qt::Alignment(me.keyToValue(alignment.toStdString().data())));
+			me.keyToValue(dom_elmt.attribute("Halignment").toStdString().data())));
-    if(QETXML::propertyString(dom_elmt, "Valignment", &alignment) != QETXML::PropertyFlags::NotFound)
+	if(dom_elmt.hasAttribute(("Valignment")))
 		setAlignment(Qt::Alignment(
 			me.keyToValue(dom_elmt.attribute("Valignment").toStdString().data())) | this -> alignment());
@@ -232,29 +221,6 @@ bool PartDynamicTextField::fromXmlPriv(const QDomElement &dom_elmt)
 	QDomElement dom_color = dom_elmt.firstChildElement("color");
 	if(!dom_color.isNull())
 		setColor(QColor(dom_color.text()));
 	return true;
 }
 bool PartDynamicTextField::valideXml(QDomElement& dom_elmt) {
 	if (QETXML::propertyDouble(dom_elmt, "x") == QETXML::PropertyFlags::NoValidConversion ||
 		QETXML::propertyDouble(dom_elmt, "y") == QETXML::PropertyFlags::NoValidConversion ||
 		QETXML::propertyDouble(dom_elmt, "z") == QETXML::PropertyFlags::NoValidConversion ||
 		QETXML::propertyDouble(dom_elmt, "rotation") == QETXML::PropertyFlags::NoValidConversion)
 		return false;
    if (QETXML::propertyUuid(dom_elmt, "uuid") == QETXML::PropertyFlags::NoValidConversion)
 		return false;
    if (QETXML::propertyString(dom_elmt, "text_from"))
 		return false;
    if(QETXML::propertyString(dom_elmt, "Halignment") == QETXML::PropertyFlags::NotFound)
 		return false;
    if(QETXML::propertyString(dom_elmt, "Valignment") == QETXML::PropertyFlags::NotFound)
 		return false;
 	return true;
 }
 /**
@@ -498,7 +464,7 @@ void PartDynamicTextField::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
 		m_origine_pos != pos()) {
 			QPropertyUndoCommand *undo =\
 				new QPropertyUndoCommand(this, "pos", QVariant(m_origine_pos), QVariant(pos()));
-			undo -> setText(tr("D??placer un champ texte"));
+			undo -> setText(tr("Déplacer un champ texte"));
 			undo -> enableAnimation();
 			elementScene() -> undoStack().push(undo);
 	}
--- a/sources/editor/graphicspart/partdynamictextfield.h
+++ b/sources/editor/graphicspart/partdynamictextfield.h
@@ -75,12 +75,9 @@ class PartDynamicTextField : public QGraphicsTextItem, public CustomElementPart
 		void startUserTransformation(const QRectF &initial_selection_rect) override;
 		void handleUserTransformation(const QRectF &initial_selection_rect, const QRectF &new_selection_rect) override;
-        void toXmlPriv(QDomElement&root_element) const override;
+		const QDomElement toXml(QDomDocument &dom_doc) const override;
-        bool fromXmlPriv(const QDomElement &dom_elmt) override;
+		void fromXml(const QDomElement &dom_elmt) override;
 		void fromTextFieldXml(const QDomElement &dom_element);
 		static bool valideXml(QDomElement& dom_elmt);
        void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/}
        void fromSettings(QSettings &,const QString & = QString()) override{/*TODO: implement*/}
 		DynamicElementTextItem::TextFrom textFrom() const;
 		void setTextFrom (DynamicElementTextItem::TextFrom text_from);
@@ -119,7 +116,7 @@ class PartDynamicTextField : public QGraphicsTextItem, public CustomElementPart
 				m_info_name,
 				m_composite_text;
 		DynamicElementTextItem::TextFrom m_text_from = DynamicElementTextItem::UserText;
-		QUuid m_uuid{QUuid::createUuid()};
+		QUuid m_uuid;
 		bool m_frame = false,
 			 m_first_add = true,
 			 m_block_alignment = false;
--- a/sources/editor/graphicspart/partellipse.cpp
+++ b/sources/editor/graphicspart/partellipse.cpp
@@ -22,8 +22,6 @@
 #include "../../QetGraphicsItemModeler/qetgraphicshandlerutility.h"
 #include "../elementscene.h"
 #include "../../qetxml.h"
 /**
 	@brief PartEllipse::PartEllipse
 	Constructor
@@ -81,81 +79,56 @@ void PartEllipse::paint(QPainter *painter, const QStyleOptionGraphicsItem *optio
 }
 /**
-    @brief PartEllipse::toXmlPriv
+	@brief PartEllipse::toXml
 	Export this ellipse in xml
 	@param xml_document : Xml document to use for create the xml element.
 	@return : an xml element that describe this ellipse
 */
-void PartEllipse::toXmlPriv(QDomElement& xml_element) const
+const QDomElement PartEllipse::toXml(QDomDocument &xml_document) const
 {
-    if (qFuzzyCompare(rect().width(), rect().height()))
+	QDomElement xml_element;
-    {
+	if (qFuzzyCompare(rect().width(), rect().height()))
-        xml_element.setTagName("circle");
+	{
-        xml_element.setAttribute("diameter", QString("%1").arg(rect().width()));
+		xml_element = xml_document.createElement("circle");
-    }
+		xml_element.setAttribute("diameter", QString("%1").arg(rect().width()));
-    else
+	}
-    {
+	else
-        xml_element.setTagName("ellipse");
+	{
-        xml_element.setAttribute("width",  QString("%1").arg(rect().width()));
+		xml_element = xml_document.createElement("ellipse");
-        xml_element.setAttribute("height", QString("%1").arg(rect().height()));
+		xml_element.setAttribute("width",  QString("%1").arg(rect().width()));
-    }
+		xml_element.setAttribute("height", QString("%1").arg(rect().height()));
 	}
-    QPointF top_left(sceneTopLeft());
+	QPointF top_left(sceneTopLeft());
-    xml_element.setAttribute("x", QString("%1").arg(top_left.x()));
+	xml_element.setAttribute("x", QString("%1").arg(top_left.x()));
-    xml_element.setAttribute("y", QString("%1").arg(top_left.y()));
+	xml_element.setAttribute("y", QString("%1").arg(top_left.y()));
-    stylesToXml(xml_element);
+	stylesToXml(xml_element);
 	return(xml_element);
 }
 /**
-    @brief PartEllipse::fromXmlPriv
+	@brief PartEllipse::fromXml
 	Import the properties of this ellipse from a xml element.
 	@param qde : Xml document to use.
 */
-bool PartEllipse::fromXmlPriv(const QDomElement &qde)
+void PartEllipse::fromXml(const QDomElement &qde)
 {
 	stylesFromXml(qde);
-	double x=0, y=0, width=0, height=0;
+	qreal width, height;
 	if (qde.tagName() == "ellipse")
 	{
-		if (QETXML::propertyDouble(qde, "width", &width) == QETXML::PropertyFlags::NoValidConversion ||
+		width = qde.attribute("width",  "0").toDouble();
-			QETXML::propertyDouble(qde, "height", &height) == QETXML::PropertyFlags::NoValidConversion)
+		height = qde.attribute("height", "0").toDouble();
 			return false;
 	}
 	else {
 		if (QETXML::propertyDouble(qde, "diameter", &width) == QETXML::PropertyFlags::NoValidConversion)
 			return false;
 		height = width;
 	}
 	else
 		width = height = qde.attribute("diameter", "0").toDouble();
-
+	m_rect = QRectF(mapFromScene(qde.attribute("x", "0").toDouble(),
-	if (QETXML::propertyDouble(qde, "x", &x) == QETXML::PropertyFlags::NoValidConversion ||
+								 qde.attribute("y", "0").toDouble()),
-		QETXML::propertyDouble(qde, "y", &y) == QETXML::PropertyFlags::NoValidConversion)
+					QSizeF(width, height));
 		return false;
 	m_rect = QRectF(mapFromScene(x, y), QSizeF(width, height));
 	return true;
 }
 bool PartEllipse::valideXml(QDomElement& element) {
 	if (element.tagName() == "ellipse")
 	{
 		if (QETXML::propertyDouble(element, "width") & QETXML::PropertyFlags::NoValidConversion ||
 			QETXML::propertyDouble(element, "height") & QETXML::PropertyFlags::NoValidConversion)
 			return false;
 	}
 	else {
 		if (QETXML::propertyDouble(element, "diameter") & QETXML::PropertyFlags::NoValidConversion)
 			return false;
 	}
 	if ((QETXML::propertyDouble(element, "x") & QETXML::PropertyFlags::NoValidConversion) ||
 		(QETXML::propertyDouble(element, "y") & QETXML::PropertyFlags::NoValidConversion))
 		return false;
 	return true;
 }
 /**
--- a/sources/editor/graphicspart/partellipse.h
+++ b/sources/editor/graphicspart/partellipse.h
@@ -50,13 +50,10 @@ class PartEllipse : public  AbstractPartEllipse
 		void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget * = nullptr) override;
 			//Name and XML
-		QString name()	const override { return(QObject::tr("ellipse", "element part name")); }
+		QString name()    const override { return(QObject::tr("ellipse", "element part name")); }
 		QString xmlName() const override { return(QString("ellipse")); }
-        void toXmlPriv(QDomElement&xml_element) const override;
+		const QDomElement toXml   (QDomDocument &) const override;
-        bool fromXmlPriv(const QDomElement &) override;
+		void              fromXml (const QDomElement &) override;
 		static bool valideXml(QDomElement& element);
        void toSettings(QSettings &,const QString & = QString()) const override {/*TODO: implement*/}
        void fromSettings(QSettings &,const QString & = QString()) override{/*TODO: implement*/}
 		QPainterPath shape() const override;
 		QPainterPath shadowShape() const override;
 		void setRect(const QRectF &rect) override {AbstractPartEllipse::setRect(rect); adjusteHandlerPos();}
@@ -70,7 +67,7 @@ class PartEllipse : public  AbstractPartEllipse
 		void switchResizeMode();
 		void adjusteHandlerPos();
 		void handlerMousePressEvent   (QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event);
-		void handlerMouseMoveEvent	(QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event);
+		void handlerMouseMoveEvent    (QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event);
 		void handlerMouseReleaseEvent (QetGraphicsHandlerItem *qghi, QGraphicsSceneMouseEvent *event);
 		void sceneSelectionChanged ();
--- a/sources/editor/graphicspart/partline.cpp
+++ b/sources/editor/graphicspart/partline.cpp
@@ -21,8 +21,6 @@
 #include "../../QetGraphicsItemModeler/qetgraphicshandleritem.h"
 #include "../elementscene.h"
 #include "../../qetxml.h"
 #include <cmath>
 /**
@@ -32,10 +30,13 @@
 	@param parent : parent item
 */
 PartLine::PartLine(QETElementEditor *editor, QGraphicsItem *parent) :
-    CustomElementGraphicPart(editor, parent)
+	CustomElementGraphicPart(editor, parent),
-{
+	first_end(Qet::None),
-    setTagName("line");
+	first_length(1.5),
-}
+	second_end(Qet::None),
 	second_length(1.5),
 	m_undo_command(nullptr)
 {}
 /// Destructeur
 PartLine::~PartLine()
@@ -104,26 +105,28 @@ void PartLine::paint(QPainter *painter, const QStyleOptionGraphicsItem *options,
 }
 /**
-    @brief PartLine::toXmlPriv
+	@brief PartLine::toXml
 	Export this line in xml
 	@param xml_document : Xml document to use for create the xml element.
 	@return an xml element that describe this line
 */
-void PartLine::toXmlPriv(QDomElement& xml_element) const
+const QDomElement PartLine::toXml(QDomDocument &xml_document) const
 {
-    QPointF p1(sceneP1());
+	QPointF p1(sceneP1());
-    QPointF p2(sceneP2());
+	QPointF p2(sceneP2());
-    xml_element.setAttribute("x1", QString("%1").arg(p1.x()));
+	QDomElement xml_element = xml_document.createElement("line");
-    xml_element.setAttribute("y1", QString("%1").arg(p1.y()));
+	xml_element.setAttribute("x1", QString("%1").arg(p1.x()));
-    xml_element.setAttribute("x2", QString("%1").arg(p2.x()));
+	xml_element.setAttribute("y1", QString("%1").arg(p1.y()));
-    xml_element.setAttribute("y2", QString("%1").arg(p2.y()));
+	xml_element.setAttribute("x2", QString("%1").arg(p2.x()));
-    xml_element.setAttribute("end1", Qet::endTypeToString(first_end));
+	xml_element.setAttribute("y2", QString("%1").arg(p2.y()));
-    xml_element.setAttribute("length1", QString("%1").arg(first_length));
+	xml_element.setAttribute("end1", Qet::endTypeToString(first_end));
-    xml_element.setAttribute("end2", Qet::endTypeToString(second_end));
+	xml_element.setAttribute("length1", QString("%1").arg(first_length));
-    xml_element.setAttribute("length2", QString("%1").arg(second_length));
+	xml_element.setAttribute("end2", Qet::endTypeToString(second_end));
 	xml_element.setAttribute("length2", QString("%1").arg(second_length));
-    stylesToXml(xml_element);
+	stylesToXml(xml_element);
 	return(xml_element);
 }
 /**
@@ -131,48 +134,17 @@ void PartLine::toXmlPriv(QDomElement& xml_element) const
 	Import the properties of this line from a xml element.
 	@param qde : Xml document to use
 */
-bool PartLine::fromXmlPriv(const QDomElement &qde) {
+void PartLine::fromXml(const QDomElement &qde) {
 	stylesFromXml(qde);
 	m_line = QLineF(mapFromScene(qde.attribute("x1", "0").toDouble(),
 								 qde.attribute("y1", "0").toDouble()),
 					mapFromScene(qde.attribute("x2", "0").toDouble(),
 								 qde.attribute("y2", "0").toDouble()));
-	double x1 = 0, y1 = 0, x2 = 0, y2 = 0;
+	first_end     = Qet::endTypeFromString(qde.attribute("end1"));
-	if (QETXML::propertyDouble(qde, "x1", &x1) == QETXML::PropertyFlags::NoValidConversion ||
+	first_length  = qde.attribute("length1", "1.5").toDouble();
-	QETXML::propertyDouble(qde, "y1", &y1) == QETXML::PropertyFlags::NoValidConversion ||
+	second_end    = Qet::endTypeFromString(qde.attribute("end2"));
-	QETXML::propertyDouble(qde, "x2", &x2) == QETXML::PropertyFlags::NoValidConversion ||
+	second_length = qde.attribute("length2", "1.5").toDouble();
 	QETXML::propertyDouble(qde, "y2", &y2) == QETXML::PropertyFlags::NoValidConversion)
 		return false;
 	m_line = QLineF(mapFromScene(x1, y1),
 					mapFromScene(x2, y2));
 	QString s;
    if (QETXML::propertyString(qde, "end1", &s) != QETXML::PropertyFlags::Success)
 		return false;
 	first_end = Qet::endTypeFromString(s);
    if (QETXML::propertyString(qde, "end2", &s) != QETXML::PropertyFlags::Success)
 		return false;
 	first_end = Qet::endTypeFromString(s);
 	if (QETXML::propertyDouble(qde, "length1", &first_length) == QETXML::PropertyFlags::NoValidConversion ||
 		QETXML::propertyDouble(qde, "length2", &second_length) == QETXML::PropertyFlags::NoValidConversion)
 		return false;
 	return true;
 }
 bool PartLine::valideXml(QDomElement& element) const {
 	if (QETXML::propertyDouble(element, "x1") ||
 		QETXML::propertyDouble(element, "y1") ||
 		QETXML::propertyDouble(element, "x2") ||
 		QETXML::propertyDouble(element, "y2") ||
        QETXML::propertyString(element, "end1") ||
        QETXML::propertyString(element, "end2") ||
 		QETXML::propertyDouble(element, "length1") ||
 		QETXML::propertyDouble(element, "length2") )
 		return false;
 	return true;
 }
 /**
--- a/Show More
+++ b/Show More