Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 10910)
+++ /trunk/data/defaultpresets.xml	(revision 10911)
@@ -8198,5 +8198,5 @@
         <space />
         <key key="amenity" value="vending_machine" />
-        <multiselect key="vending" text="Vending products" values="animal_food;bicycle_tube;cigarettes;condoms;drinks;excrement_bags;food;milk;newspapers;parking_tickets;photos;public_transport_plans;public_transport_tickets;SIM_cards;stamps;sweets;tampons;telephone_vouchers;toys;vouchers" values_searchable="true" />
+        <multiselect key="vending" text="Vending products" values="admission_tickets;animal_feed;bicycle_tube;cigarettes;condoms;drinks;elongated_coin;excrement_bags;food;milk;newspapers;parking_tickets;parcel_pickup;parcel_mail_in;photos;public_transport_plans;public_transport_tickets;SIM_cards;stamps;sweets;telephone_vouchers;toys" values_searchable="true" />
         <text key="operator" text="Operator" />
         <text key="ref" text="Reference number" />
Index: /trunk/data/validator/deprecated.mapcss
===================================================================
--- /trunk/data/validator/deprecated.mapcss	(revision 10910)
+++ /trunk/data/validator/deprecated.mapcss	(revision 10911)
@@ -891,2 +891,16 @@
   fixRemove: "landuse";
 }
+
+*[shop=souvenir],
+*[shop=souvenirs],
+*[shop=souveniers] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "shop=gift";
+  fixAdd: "shop=gift";
+}
+
+*[vending=animal_food] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "vending=animal_feed";
+  fixAdd: "vending=animal_feed";
+}
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 10910)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 10911)
@@ -745,5 +745,5 @@
     set icon_z17;
 }
-node[highway=ford], node[ford?] {
+node[ford?] {
     icon-image: "presets/vehicle/ford.svg";
     set icon_z17;
@@ -1841,5 +1841,4 @@
 area[shop=boutique],
 area[shop=car],
-area[shop=car_dealer],
 area[shop=car_repair],
 area[shop=tyres],
@@ -1968,6 +1967,5 @@
     set icon_z17;
 }
-node[shop=car],
-node[shop=car_dealer] {
+node[shop=car] {
     icon-image: "presets/shop/vehicle.svg";
     set icon_z17;