Index: data/defaultpresets.xml
===================================================================
--- data/defaultpresets.xml (revision 6208)
+++ data/defaultpresets.xml (working copy)
@@ -28,7 +28,7 @@
 
 space: empty line
 
-optional: optional tags, short for "label" plus "space"
+optional: optional tags, short for "space" plus "label" plus "space"
   text: the text to display (defaults to "Optional Attributes:")
 
 separator: separator line in menus
@@ -67,7 +67,7 @@
                       display_value. (Only if it is not possible to describe
                       the entry in 2-3 words.) Instead of comma separated list
   instead using values, display_values and short_descriptions, the following form is also supported:
-    <list_entry value="" display_value="" short_description="" icon="" icon_size=""/>
+    <list_entry value="" display_value="" short_description="" icon="" icon_size="" />
         icon: location of icon
         icon_size: maximal size of icon. If tag is not setup it is taken default size of icon file
   default: default string to display (defaults to "")
@@ -92,7 +92,7 @@
                       display_value. (Only if it is not possible to describe
                       the entry in 2-3 words.) Instead of a separated list
   instead using values, display_values and short_descriptions, the following form is also supported:
-    <list_entry value="" display_value="' short_description="" icon="" icon_size=""/>
+    <list_entry value="" display_value="' short_description="" icon="" icon_size="" />
         icon: location of icon
         icon_size: maximal size of icon. If tag is not setup it is taken default size of icon file
   default: default string to display (defaults to "")
@@ -2520,9 +2520,12 @@
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=car"
                   ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=car" />
             <label text="Edit Car Shop" />
+            <space />
             <key key="shop" value="car" />
             <text key="name" text="Name" />
+            <text key="brand" text="Brand" />
             <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
         <item name="Repair" icon="presets/car_repair.png" type="node,closedway">
             <label text="Edit Car Repair" />
@@ -2532,6 +2535,17 @@
             <text key="operator" text="Operator" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
+        <item name="Parts" icon="presets/car_repair.png" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car_parts"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=car_parts" />
+            <label text="Edit Car Parts" />
+            <space />
+            <key key="shop" value="car_parts" />
+            <text key="name" text="Name" />
+            <text key="brand" text="Brand" />
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+        </item>
         <item name="Tyres" icon="presets/tyres.png" type="node,closedway">
             <label text="Edit Tyres" />
             <key key="shop" value="tyres" />
@@ -5557,6 +5571,20 @@
             <text key="name" text="Name" />
             <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
         </item>
+        <item name="Beauty" icon="styles/standard/shop/" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/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"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:shop=beauty"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=beauty" />
+            <label text="Edit Beauty Shop" />
+            <space />            
+            <key key="shop" value="beauty" />
+            <text key="name" text="Name" />
+            <text key="beauty:type" text="Beauty services" />
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00;Sa 08:00-12:00" />
+        </item>
         <item name="Optician" icon="styles/standard/shop/optician.png" type="node,closedway">
             <label text="Edit Optician" />
             <key key="shop" value="optician" />
@@ -5565,17 +5593,34 @@
         </item>
         <item name="Jewelry" icon="styles/standard/shop/jewelry.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=jewelry"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=jewelry"/>
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=jewelry" />
             <label text="Edit Jewelry" />
             <space />            
             <key key="shop" value="jewelry" />
             <text key="name" text="Name" />            
             <text key="operator" text="Operator" />
-            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" /> 
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
+        </item>                               
+        <item name="Gift" icon="http://openclipart.org/people/secretlondon/secretlondon_chocolate_present.svg" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/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"
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=gift"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=gift" />
+            <label text="Edit Gift Shop" />
+            <space />            
+            <key key="shop" value="gift" />
+            <text key="name" text="Name" />            
+            <text key="operator" text="Operator" />
+            <combo key="opening_hours" text="Opening Hours" values="24/7,Mo-Fr 08:30-20:00,Tu-Su 08:00-15:00; Sa 08:00-12:00" />
+            <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>
         </item>                               
         <item name="Erotic" icon="presets/erotic.png" type="node,closedway">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=erotic"
-                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=erotic"/>
+                  pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:shop=erotic" />
             <label text="Edit Erotic" />
             <space />            
             <key key="shop" value="erotic" />
