Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 5079)
+++ trunk/data/defaultpresets.xml	(revision 5080)
@@ -4312,9 +4312,14 @@
             <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" default="" delete_if_empty="true" />
         </item>
-        <item name="Organic" icon="presets/fruits.png" type="node,closedway">
-            <label text="Edit Organic Shop" />
-            <key key="shop" value="organic" />
-            <text key="name" text="Name" default="" delete_if_empty="true" />
-            <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" default="" delete_if_empty="true" />
+        <separator/>
+        <item name="Organic" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Key:organic" />
+            <label text="Edit Organic/Bio" />
+            <combo text="Organic/Bio" key="organic" values="no,yes,only" />
+        </item>
+        <item name="Fair Trade" type="node,closedway">
+            <link href="http://wiki.openstreetmap.org/wiki/Key:fair_trade" />
+            <label text="Edit Fair Trade" />
+            <combo text="Fair Trade" key="fair_trade" values="no,yes,only" />
         </item>
         <separator/>
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java	(revision 5079)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/DeprecatedTags.java	(revision 5080)
@@ -72,4 +72,9 @@
                 test("power_rating").
                 alternative("generator:output"));
+        // from http://wiki.openstreetmap.org/wiki/Tag:shop%3Dorganic
+        checks.add(new DeprecationCheck(2114).
+                testAndRemove("shop", "organic").
+                add("shop", "supermarket").
+                add("organic", "only"));
     }
 
Index: trunk/styles/standard/elemstyles.xml
===================================================================
--- trunk/styles/standard/elemstyles.xml	(revision 5079)
+++ trunk/styles/standard/elemstyles.xml	(revision 5080)
@@ -2426,10 +2426,4 @@
 
 	<rule>
-		<condition k="shop" v="organic"/>
-		<icon annotate="true" src="shop/groceries/fruits.png"/>
-		<area colour="shop#00005f"/>
-	</rule>
-
-	<rule>
 		<condition k="shop" v="optician"/>
 		<icon annotate="true" src="shop/optician.png"/>