Index: resources/data/defaultpresets.xml
===================================================================
--- resources/data/defaultpresets.xml	(revision 19148)
+++ resources/data/defaultpresets.xml	(working copy)
@@ -5123,15 +5123,17 @@
                 <check key="recycling:beverage_cartons" text="Beverage cartons" />
                 <check key="recycling:glass" text="Glass" />
                 <check key="recycling:glass_bottles" text="Glass Bottles" />
-                <check key="recycling:cans" text="Cans" />
                 <check key="recycling:clothes" text="Clothes" />
                 <check key="recycling:shoes" text="Shoes" />
+                <check key="recycling:cans" text="Cans" />
                 <check key="recycling:scrap_metal" text="Scrap Metal" />
+                <check key="recycling:metal_packaging" text="Metal Packaging"/>
                 <check key="recycling:wood" text="Wood" />
                 <check key="recycling:green_waste" text="Green Waste" />
+                <check key="recycling:cooking_oil" text="Cooking Oil"/>
                 <check key="recycling:waste" text="Waste" />
                 <check key="recycling:batteries" text="Batteries" />
-                <check key="recycling:small_appliances" text="Small Appliances" />
+                <check key="recycling:small_electrical_appliances" text="Small Electrical Appliances" />
                 <check key="recycling:electrical_appliances" text="Electrical Appliances" />
             </checkgroup>
         </item> <!-- Recycling Container-->
@@ -5155,15 +5157,17 @@
                 <check key="recycling:beverage_cartons" text="Beverage cartons" />
                 <check key="recycling:glass" text="Glass" />
                 <check key="recycling:glass_bottles" text="Glass Bottles" />
-                <check key="recycling:cans" text="Cans" />
                 <check key="recycling:clothes" text="Clothes" />
                 <check key="recycling:shoes" text="Shoes" />
+                <check key="recycling:cans" text="Cans" />
                 <check key="recycling:scrap_metal" text="Scrap Metal" />
+                <check key="recycling:metal_packaging" text="Metal Packaging"/>
                 <check key="recycling:wood" text="Wood" />
                 <check key="recycling:green_waste" text="Green Waste" />
+                <check key="recycling:cooking_oil" text="Cooking Oil"/>
                 <check key="recycling:waste" text="Waste" />
                 <check key="recycling:batteries" text="Batteries" />
-                <check key="recycling:small_appliances" text="Small Appliances" />
+                <check key="recycling:small_electrical_appliances" text="Small Eletrical Appliances" />
                 <check key="recycling:electrical_appliances" text="Electrical Appliances" />
             </checkgroup>
             <reference ref="link_contact_address_payment" />
Index: src/org/openstreetmap/josm/actions/CreateCircleAction.java
===================================================================
--- src/org/openstreetmap/josm/actions/CreateCircleAction.java	(revision 19148)
+++ src/org/openstreetmap/josm/actions/CreateCircleAction.java	(working copy)
@@ -195,14 +195,14 @@
 
         double radiusInMeters = nodes.get(0).greatCircleDistance(ll2);
 
-        int numberOfNodesInCircle = (int) Math.ceil(6.0 * Math.pow(radiusInMeters, 0.5));
+        int numberOfNodesInCircle = (int) Math.ceil(10.0 * Math.pow(radiusInMeters, 0.5));
         // an odd number of nodes makes the distribution uneven
         if ((numberOfNodesInCircle % 2) != 0) {
             // add 1 to make it even
             numberOfNodesInCircle += 1;
         }
-        if (numberOfNodesInCircle < 6) {
-            numberOfNodesInCircle = 6;
+        if (numberOfNodesInCircle < 12) {
+            numberOfNodesInCircle = 12;
         }
 
         // Order nodes by angle