Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 7599)
+++ /trunk/data/defaultpresets.xml	(revision 7600)
@@ -6373,4 +6373,13 @@
             <reference ref="link_contact" />
         </item> <!-- Interior Decoration -->
+        <item name="Antiques" icon="styles/standard/shop/antique.svg" type="node,closedway" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=antiques"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:shop=antiques"
+                  uk.href="http://wiki.openstreetmap.org/wiki/Uk:Tag:shop=antiques" />
+            <space />
+            <key key="shop" value="antiques" />
+            <reference ref="name_oh" />
+            <reference ref="link_contact" />
+        </item> <!-- Antiques -->
     </group> <!-- Home decoration -->
     <group name="Printed Material" icon="presets/stationery.png">
Index: /trunk/data/validator/deprecated.mapcss
===================================================================
--- /trunk/data/validator/deprecated.mapcss	(revision 7599)
+++ /trunk/data/validator/deprecated.mapcss	(revision 7600)
@@ -82,4 +82,14 @@
 }
   
+*[shop=antique] {
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  fixAdd: "shop=antiques";
+}
+
+*[shop=bags] {
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  fixAdd: "shop=bag";
+}
+
 *[shop=organic] {
   /* from http://wiki.openstreetmap.org/wiki/Tag:shop=organic */
@@ -88,5 +98,15 @@
   fixAdd: "organic=only";
 }
-  
+
+*[shop=pets] {
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  fixAdd: "shop=pet";
+}
+
+*[shop=pharmacy] {
+  throwWarning: tr("{0}={1} is deprecated", "{0.key}", "{0.value}");
+  fixChangeKey: "shop => amenity";
+}
+
 *[bicycle_parking=sheffield] {
   /* from http://wiki.openstreetmap.org/wiki/Key:bicycle_parking */
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 7599)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 7600)
@@ -1505,4 +1505,5 @@
 area[shop=tea],
 area[shop=coffee],
+area[shop=antiques],
 area[shop=bag] {
     fill-color: shop#00005f;
@@ -1854,4 +1855,9 @@
 node[shop=coffee] {
     icon-image: "shop/groceries/coffee.svg";
+    set icon_z17;
+    text: auto;
+}
+node[shop=antiques] {
+    icon-image: "shop/antique.svg";
     set icon_z17;
     text: auto;