Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 8888)
+++ trunk/data/defaultpresets.xml	(revision 8890)
@@ -6997,4 +6997,106 @@
         </item> <!-- Ticket -->
     </group> <!-- Printed Material -->
+    <group name="For the body" icon="D:/Stefan/OSM/TestNew/01.svg">
+        <item name="Chemist" icon="styles/standard/shop/chemist.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=chemist"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=chemist"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=chemist"
+                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=chemist"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=chemist"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=chemist"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=chemist" />
+            <space />
+            <key key="shop" value="chemist" />
+            <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Chemist -->
+        <item name="Hairdresser/Barber" icon="styles/standard/shop/hairdresser.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hairdresser"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=hairdresser"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=hairdresser"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=hairdresser"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=hairdresser"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=hairdresser"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=hairdresser" />
+            <space />
+            <key key="shop" value="hairdresser" />
+            <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Hairdresser/Barber -->
+        <item name="Beauty" icon="styles/standard/shop/beauty.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beauty"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=beauty"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=beauty"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=beauty"
+                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=beauty"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=beauty"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=beauty" />
+            <space />
+            <key key="shop" value="beauty" />
+            <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Beauty -->
+        <item name="Tattoo" icon="styles/standard/shop/tattoo.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tattoo"
+                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=tattoo"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=tattoo"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=tattoo" />
+            <space />
+            <key key="shop" value="tattoo" />
+            <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Tattoo -->
+        <item name="Optician" icon="styles/standard/shop/optician.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=optician"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=optician"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=optician"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=optician"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:shop=optician" />
+            <space />
+            <key key="shop" value="optician" />
+            <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Optician -->
+        <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hearing_aids"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=hearing_aids"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=hearing_aids" />
+            <space />
+            <key key="shop" value="hearing_aids" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Hearing Aids -->
+        <item name="Medical Supply" icon="styles/standard/shop/medical_supply.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=medical_supply"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=medical_supply"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=medical_supply" />
+            <space />
+            <key key="shop" value="medical_supply" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <check key="dispensing" text="Dispensing" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Medical Supply -->
+        <item name="Jewellery" icon="styles/standard/shop/jewelry.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=jewelry"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=jewelry"
+                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=jewelry"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=jewelry"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=jewelry" />
+            <space />
+            <key key="shop" value="jewelry" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Jewellery -->
+        <item name="Erotic" icon="presets/erotic.png" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=erotic"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=erotic"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=erotic"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=erotic" />
+            <space />
+            <key key="shop" value="erotic" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Erotic -->
+    </group> <!-- For the body -->
     <group name="Other" icon="styles/standard/shop/mall.png">
         <item name="Department Store" icon="styles/standard/shop/mall.png" type="node,closedway" preset_name_label="true">
@@ -7023,122 +7125,4 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Mall -->
-        <separator/>
-        <item name="Chemist" icon="styles/standard/shop/chemist.png" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=chemist"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=chemist"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=chemist"
-                  it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=chemist"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=chemist"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=chemist"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=chemist" />
-            <space />
-            <key key="shop" value="chemist" />
-            <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address_payment" />
-        </item> <!-- Chemist -->
-        <item name="Hairdresser/Barber" icon="styles/standard/shop/hairdresser.png" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hairdresser"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=hairdresser"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=hairdresser"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=hairdresser"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=hairdresser"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=hairdresser"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=hairdresser" />
-            <space />
-            <key key="shop" value="hairdresser" />
-            <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address_payment" />
-        </item> <!-- Hairdresser/Barber -->
-        <item name="Beauty" icon="styles/standard/shop/beauty.svg" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=beauty"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=beauty"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=beauty"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=beauty"
-                  pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=beauty"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=beauty"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=beauty" />
-            <space />
-            <key key="shop" value="beauty" />
-            <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address_payment" />
-        </item> <!-- Beauty -->
-        <item name="Tattoo" icon="styles/standard/shop/tattoo.svg" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=tattoo"
-                  es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=tattoo"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=tattoo"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=tattoo" />
-            <space />
-            <key key="shop" value="tattoo" />
-            <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address_payment" />
-        </item> <!-- Tattoo -->
-        <item name="Optician" icon="styles/standard/shop/optician.svg" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=optician"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=optician"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=optician"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=optician"
-                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:shop=optician" />
-            <space />
-            <key key="shop" value="optician" />
-            <reference ref="name_oh_wheelchair" />
-            <reference ref="link_contact_address_payment" />
-        </item> <!-- Optician -->
-        <item name="Hearing Aids" icon="presets/hearing_aids.png" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hearing_aids"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=hearing_aids"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=hearing_aids" />
-            <space />
-            <key key="shop" value="hearing_aids" />
-            <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address_payment" />
-        </item> <!-- Hearing Aids -->
-        <item name="Medical Supply" icon="styles/standard/shop/medical_supply.svg" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=medical_supply"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=medical_supply"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=medical_supply" />
-            <space />
-            <key key="shop" value="medical_supply" />
-            <reference ref="name_operator_oh_wheelchair" />
-            <check key="dispensing" text="Dispensing" />
-            <reference ref="link_contact_address_payment" />
-        </item> <!-- Medical Supply -->
-        <item name="Jewellery" icon="styles/standard/shop/jewelry.png" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=jewelry"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=jewelry"
-                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=jewelry"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=jewelry"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=jewelry" />
-            <space />
-            <key key="shop" value="jewelry" />
-            <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address_payment" />
-        </item> <!-- Jewellery -->
-        <item name="Gift/Souvenir" icon="presets/present.svg" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=gift"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=gift"
-                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=gift"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=gift"
-                  ko.href="http://wiki.openstreetmap.org/wiki/Ko:Tag:shop=gift"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=gift"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=gift" />
-            <space />
-            <key key="shop" value="gift" />
-            <reference ref="name_operator_oh_wheelchair" />
-            <optional>
-                <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
-                <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
-            </optional>
-            <reference ref="link_contact_address_payment" />
-        </item> <!-- Gift/Souvenir -->
-        <item name="Erotic" icon="presets/erotic.png" type="node,closedway" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=erotic"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=erotic"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=erotic"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=erotic" />
-            <space />
-            <key key="shop" value="erotic" />
-            <reference ref="name_operator_oh_wheelchair" />
-            <reference ref="link_contact_address_payment" />
-        </item> <!-- Erotic -->
         <separator/>
         <item name="Florist" icon="styles/standard/shop/florist.png" type="node,closedway" preset_name_label="true">
@@ -7235,4 +7219,21 @@
             <reference ref="link_contact_address_payment" />
         </item> <!-- Toys -->
+        <item name="Gift/Souvenir" icon="presets/present.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=gift"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=gift"
+                  fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=gift"
+                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=gift"
+                  ko.href="http://wiki.openstreetmap.org/wiki/Ko:Tag:shop=gift"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=gift"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=gift" />
+            <space />
+            <key key="shop" value="gift" />
+            <reference ref="name_operator_oh_wheelchair" />
+            <optional>
+                <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
+                <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
+            </optional>
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Gift/Souvenir -->
         <item name="Variety Store" icon="presets/variety_store.png" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=variety_store"