diff --git a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/010_switch_1pos.elmt b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/010_switch_1pos.elmt
new file mode 100644
index 000000000..4a47a4fde
--- /dev/null
+++ b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/010_switch_1pos.elmt
@@ -0,0 +1,33 @@
+<definition hotspot_x="11" type="element" link_type="simple" width="20" version="0.80" hotspot_y="29" height="60">
+    <uuid uuid="{d3b03c88-7d17-4c10-adb8-94fe40b2f53b}"/>
+    <names>
+        <name lang="pt">Interruptor</name>
+        <name lang="nl">Contact (NO)</name>
+        <name lang="es">Interruptor</name>
+        <name lang="ar">مفتاح</name>
+        <name lang="en">Switch</name>
+        <name lang="it">Interruttore</name>
+        <name lang="ru">Переключатель</name>
+        <name lang="pl">Łącznik</name>
+        <name lang="de">Ein-/Ausschalter</name>
+        <name lang="fr">Interrupteur</name>
+        <name lang="cs">Spínač</name>
+        <name lang="el">Διακόπτης</name>
+    </names>
+    <elementInformations/>
+    <informations>Author: The QElectroTech team
+License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
+    <description>
+        <circle x="-1.75" diameter="3.5" antialias="true" y="8.25" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line y1="-20" y2="-12.5" x1="0" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="0" length2="1.5" end2="none"/>
+        <dynamic_text x="2.75" Valignment="AlignTop" Halignment="AlignLeft" rotation="0" z="3" font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" text_from="ElementInfo" uuid="{06a2b3b1-c587-454b-89e3-4d8b41413e44}" y="-8.5" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <circle x="-1.75" diameter="3.5" antialias="true" y="-11.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line y1="-10" y2="8" x1="-5" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="-0.7" length2="1.5" end2="none"/>
+        <line y1="12" y2="17" x1="0" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="0" length2="1.5" end2="none"/>
+        <terminal x="0" orientation="s" uuid="{eabdd4d0-f563-43b0-b1e3-4f7f816d79b1}" y="21" name=""/>
+        <terminal x="0" orientation="n" uuid="{6f505308-b294-48e4-821c-da003e1cff89}" y="-21" name=""/>
+    </description>
+</definition>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/012_switch_dpst.elmt b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/012_switch_dpst.elmt
new file mode 100644
index 000000000..4fd8d20dd
--- /dev/null
+++ b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/012_switch_dpst.elmt
@@ -0,0 +1,34 @@
+<definition hotspot_x="22" type="element" link_type="simple" width="40" version="0.80" hotspot_y="34" height="50">
+    <uuid uuid="{292876ce-c7fc-4eed-b957-ba6eecbd5ef2}"/>
+    <names>
+        <name lang="es">Conmutador bipolar NA</name>
+        <name lang="en">Switch, DPST, n.o.</name>
+        <name lang="ro">Comutator bipolar n,d.</name>
+        <name lang="pl">Zestyki zwierne o przełączaniu niezawodnym</name>
+        <name lang="fr">Conmutateur bipolaire NO</name>
+        <name lang="cs">Dvoupólový spínač</name>
+    </names>
+    <elementInformations/>
+    <informations></informations>
+    <description>
+        <circle x="8.25" diameter="3.5" antialias="true" y="-21.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="8.25" diameter="3.5" antialias="true" y="-1.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="-11.75" diameter="3.5" antialias="true" y="-1.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="-11.75" diameter="3.5" antialias="true" y="-21.75" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line y1="-30" y2="-22" x1="-10" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="-10" length2="1.5" end2="none"/>
+        <line y1="-30" y2="-22" x1="10" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="10" length2="1.5" end2="none"/>
+        <line y1="-10" y2="-10" x1="-18" length1="1.5" antialias="false" style="line-style:dotted;line-weight:normal;filling:none;color:black" end1="none" x2="13" length2="1.5" end2="none"/>
+        <dynamic_text x="16" Valignment="AlignTop" Halignment="AlignLeft" rotation="0" z="9" font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" text_from="ElementInfo" uuid="{131bf174-6f11-49a5-8e31-1366974c78b9}" y="-18" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <line y1="10" y2="2" x1="-10" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="-10" length2="1.5" end2="none"/>
+        <line y1="10" y2="2" x1="10" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="10" length2="1.5" end2="none"/>
+        <line y1="-1.7" y2="-20" x1="-10.6" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="-15" length2="1.5" end2="none"/>
+        <line y1="-1.7" y2="-20" x1="9.4" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="5" length2="1.5" end2="none"/>
+        <terminal x="10" orientation="s" uuid="{62d6aa78-c93e-4ce0-9108-17cc95085452}" y="10" name=""/>
+        <terminal x="-10" orientation="s" uuid="{52bf346a-cfa7-498c-85fd-4400fd338bc3}" y="10" name=""/>
+        <terminal x="-10" orientation="n" uuid="{53465032-346d-4056-9a81-87c47bb07dda}" y="-30" name=""/>
+        <terminal x="10" orientation="n" uuid="{b2675506-49be-4c22-8d32-aa9be7a200d4}" y="-30" name=""/>
+    </description>
+</definition>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/inter_2.elmt b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/015_inter_2.elmt
similarity index 100%
rename from elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/inter_2.elmt
rename to elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/015_inter_2.elmt
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/switch 3 contacts.elmt b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/020_switch 3 contacts.elmt
similarity index 87%
rename from elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/switch 3 contacts.elmt
rename to elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/020_switch 3 contacts.elmt
index 195ac4658..6bed8fc0a 100644
--- a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/switch 3 contacts.elmt	
+++ b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/020_switch 3 contacts.elmt	
@@ -1,13 +1,13 @@
 <definition width="30" version="0.4" hotspot_x="4" hotspot_y="34" height="50" link_type="simple" type="element">
 <uuid uuid="{C08E215A-998C-44C4-BE38-6A9E638C7CDB}"/><names>
         <name lang="ar">مفتاح بوضعين</name>
-        <name lang="de">Wahlschalter 2 Positionen</name>
-        <name lang="ru">Переключатель 2-х позиционный</name>
-        <name lang="pt">Interruptor 2 posições</name>
+        <name lang="de">Wahlschalter 3 Positionen</name>
+        <name lang="ru">Переключатель 3-х позиционный</name>
+        <name lang="pt">Interruptor 3 posições</name>
         <name lang="el">Διακόπτης 2 θέσεων</name>
-        <name lang="en">Switch 2 positions</name>
-        <name lang="it">Interruttore a 2 posizioni</name>
-        <name lang="fr">Interrupteur 2 positions</name>
+        <name lang="en">Switch 3 positions</name>
+        <name lang="it">Interruttore a 3 posizioni</name>
+        <name lang="fr">Interrupteur 3 positions</name>
         <name lang="pl">Zestyk przełączny przerwowy</name>
         <name lang="es">Interruptor 3 posiciones</name>
         <name lang="nl">WisselContact (NC/NO)</name>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/021_switch_3pos.elmt b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/021_switch_3pos.elmt
new file mode 100644
index 000000000..054bec644
--- /dev/null
+++ b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/021_switch_3pos.elmt
@@ -0,0 +1,39 @@
+<definition hotspot_x="24" type="element" link_type="simple" width="50" version="0.80" hotspot_y="34" height="50">
+    <uuid uuid="{6a6396ac-0161-4b29-be22-b69e52599c55}"/>
+    <names>
+        <name lang="pt">Interruptor 3 posições</name>
+        <name lang="es">Interruptor 3 posiciones</name>
+        <name lang="en">Switch 3 positions</name>
+        <name lang="it">Interruttore a 3 posizioni</name>
+        <name lang="ro">comutatorcu3pozitii</name>
+        <name lang="pl">Zestyk przełączny, trójpozycyjny</name>
+        <name lang="ru">Переключатель 3-х позиционный</name>
+        <name lang="de">Wahlschalter 3 Positionen</name>
+        <name lang="fr">Interrupteur 3 positions</name>
+        <name lang="cs">Třípolohový přepínač</name>
+        <name lang="el">Διακόπτης 3 θέσεων</name>
+    </names>
+    <elementInformations/>
+    <informations>Author: titus
+titus0818@yahoo.com
+</informations>
+    <description>
+        <dynamic_text x="18" Valignment="AlignTop" Halignment="AlignLeft" rotation="0" z="1" font="Sans Serif,9,-1,5,50,0,0,0,0,0" frame="false" text_from="ElementInfo" uuid="{41daec74-14cf-4605-bb4d-22f9cecc0c85}" y="-33" text_width="-1">
+            <text></text>
+            <info_name>label</info_name>
+        </dynamic_text>
+        <circle x="18.5" diameter="3" antialias="true" y="-1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line y1="2" y2="10" x1="20" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="20" length2="1.5" end2="none"/>
+        <line y1="-18.8" y2="1" x1="-1.2" length1="1.5" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="-18" length2="1.5" end2="none"/>
+        <circle x="-1.5" diameter="3" antialias="true" y="-1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="-1.5" diameter="3" antialias="true" y="-21.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <circle x="-21.5" diameter="3" antialias="true" y="-1.5" style="line-style:normal;line-weight:normal;filling:none;color:black"/>
+        <line y1="2" y2="10" x1="-20" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="-20" length2="1.5" end2="none"/>
+        <line y1="2" y2="10" x1="0" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="0" length2="1.5" end2="none"/>
+        <line y1="-22" y2="-25.5943" x1="0" length1="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" end1="none" x2="0" length2="1.5" end2="none"/>
+        <terminal x="0" orientation="s" uuid="{41a23056-b737-48fe-8bef-7a75fdcf8cd9}" y="10" name=""/>
+        <terminal x="-20" orientation="s" uuid="{bc263590-b9f0-4386-9b01-8ee2cda81a36}" y="10" name=""/>
+        <terminal x="0" orientation="n" uuid="{02106d3b-b190-4331-8a8e-8f608bf54299}" y="-30" name=""/>
+        <terminal x="20" orientation="s" uuid="{283aaa3e-05cb-4b11-bcb8-beb1f4b6ae87}" y="10" name=""/>
+    </description>
+</definition>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/inter_2n.elmt b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/022_inter_2n.elmt
similarity index 100%
rename from elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/inter_2n.elmt
rename to elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/022_inter_2n.elmt
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/comutator bipolar n.d.elmt b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/comutator bipolar n.d.elmt
deleted file mode 100644
index 5e8f137af..000000000
--- a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/comutator bipolar n.d.elmt	
+++ /dev/null
@@ -1,26 +0,0 @@
-<definition type="element" link_type="simple" hotspot_x="21" hotspot_y="34" version="0.5" width="40" height="50">
-<uuid uuid="{1518186B-7F8F-4A69-A715-937286537ED9}"/><names>
-        <name lang="ro">Comutator bipolar n,d.</name>
-        <name lang="pl">Zestyki zwierne o przełączaniu niezawodnym</name>
-        <name lang="es">Conmutador bipolar NA</name>
-        <name lang="fr">Conmutateur bipolaire NO</name>
-        <name lang="cs">Dvoupólový spínač</name>
-    </names>
-    <informations>Author:titus
-titus0818@yahoo.com</informations>
-    <description>
-        <circle x="-13.5" y="-11" antialias="true" diameter="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <polygon y2="0" y3="10" x1="-15" x2="-10" closed="false" x3="-10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <line y2="-20" x1="-10" end1="none" x2="-10" end2="none" length1="1.5" length2="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
-        <polygon y2="0" y3="10" x1="5" x2="10" closed="false" x3="10" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20"/>
-        <line y2="-20" x1="10" end1="none" x2="10" end2="none" length1="1.5" length2="1.5" antialias="false" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-30"/>
-        <circle x="6.5" y="-11" antialias="true" diameter="2" style="line-style:normal;line-weight:normal;filling:black;color:black"/>
-        <line y2="-11" x1="-13" end1="none" x2="7" end2="none" length1="1.5" length2="1.5" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-11"/>
-        <line y2="-9" x1="-13" end1="none" x2="7" end2="none" length1="1.5" length2="1.5" antialias="false" style="line-style:normal;line-weight:thin;filling:none;color:black" y1="-9"/>
-        <input rotate="true" tagg="label" size="9" x="16" y="-6.5" text="_"/>
-        <terminal orientation="s" x="10" y="10"/>
-        <terminal orientation="n" x="10" y="-30"/>
-        <terminal orientation="s" x="-10" y="10"/>
-        <terminal orientation="n" x="-10" y="-30"/>
-    </description>
-</definition>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/comutator3pozi&#539;ii.elmt b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/comutator3pozi&#539;ii.elmt
deleted file mode 100644
index 21e02b4d3..000000000
--- a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/comutator3pozi&#539;ii.elmt
+++ /dev/null
@@ -1,34 +0,0 @@
-<definition type="element" height="50" version="0.5" width="50" link_type="simple" hotspot_x="24" hotspot_y="34">
-<uuid uuid="{D2C838A8-2C15-4977-880A-42CF376AB71B}"/><names>
-        <name lang="es">Interruptor 3 posiciones</name>
-        <name lang="pt">Interruptor 3 posições</name>
-        <name lang="de">Wahlschalter 3 Positionen</name>
-        <name lang="it">Interruttore a 3 posizioni</name>
-        <name lang="ro">comutatorcu3pozitii</name>
-        <name lang="el">Διακόπτης 3 θέσεων</name>
-        <name lang="en">Switch 3 positions</name>
-        <name lang="pl">Zestyk przełączny, trójpozycyjny</name>
-        <name lang="fr">Interrupteur 3 positions</name>
-        <name lang="ru">Переключатель 3-х позиционный</name>
-        <name lang="cs">Třípolohový přepínač</name>
-    </names>
-    <informations>Author: titus
-titus0818@yahoo.com
-</informations>
-    <description>
-        <input tagg="label" size="9" x="18" text="_" y="-21.5"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3" antialias="true" x="18.5" y="-1.5"/>
-        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" y2="10" antialias="false" x1="20" x2="20" length1="1.5" length2="1.5"/>
-        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" y2="1" antialias="true" x1="0" x2="-18" length1="1.5" length2="1.5"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3" antialias="true" x="-1.5" y="-1.5"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3" antialias="true" x="-1.5" y="-21.5"/>
-        <circle style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3" antialias="true" x="-21.5" y="-1.5"/>
-        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" y2="10" antialias="false" x1="-20" x2="-20" length1="1.5" length2="1.5"/>
-        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="2" y2="10" antialias="false" x1="0" x2="0" length1="1.5" length2="1.5"/>
-        <line end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20.4057" y2="-25.5943" antialias="false" x1="0" x2="0" length1="1.5" length2="1.5"/>
-        <terminal x="-20" y="10" orientation="s"/>
-        <terminal x="0" y="10" orientation="s"/>
-        <terminal x="0" y="-30" orientation="n"/>
-        <terminal x="20" y="10" orientation="s"/>
-    </description>
-</definition>
diff --git a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/interrupteur.elmt b/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/interrupteur.elmt
deleted file mode 100644
index be77fa447..000000000
--- a/elements/10_electric/10_allpole/380_signaling&operating/21_selector_switches/interrupteur.elmt
+++ /dev/null
@@ -1,29 +0,0 @@
-<definition width="30" version="0.3" hotspot_x="10" hotspot_y="25" height="50" type="element" orientation="dnny">
-<uuid uuid="{1DF6CC2E-009C-40B6-A165-FD2494620646}"/><names>
-        <name lang="ar">مفتاح</name>
-        <name lang="de">Ein-/Ausschalter</name>
-        <name lang="ru">Переключатель</name>
-        <name lang="pt">Interruptor</name>
-        <name lang="el">Διακόπτης</name>
-        <name lang="en">Switch</name>
-        <name lang="it">Interruttore</name>
-        <name lang="fr">Interrupteur</name>
-        <name lang="pl">Łącznik</name>
-        <name lang="es">Interruptor</name>
-        <name lang="cs">Spínač</name>
-        <name lang="nl">Contact (NO)</name>
-    </names>
-    <kindInformations>
-        <kindInformation show="1" name="type">commutator</kindInformation>
-    </kindInformations>
-    <informations>Author: The QElectroTech team
-License: see http://qelectrotech.org/wiki/doc/elements_license</informations>
-    <description>
-        <polygon antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" closed="false" y1="-10" x1="-5" y2="10" x2="0" y3="20" x3="0"/>
-        <line length1="1.5" length2="1.5" antialias="false" end1="none" end2="none" style="line-style:normal;line-weight:normal;filling:none;color:black" y1="-20" x1="0" y2="-12.5" x2="0"/>
-        <input x="2.75" y="3" size="9" text="_" tagg="label"/>
-        <circle x="-1.75" y="-11.75" antialias="true" style="line-style:normal;line-weight:normal;filling:none;color:black" diameter="3.5"/>
-        <terminal x="0" y="-21" orientation="n"/>
-        <terminal x="0" y="21" orientation="s"/>
-    </description>
-</definition>