Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java	(revision 1970)
+++ /trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java	(revision 1971)
@@ -294,3 +294,8 @@
         return getStyleSet(null, false);
     }
+
+    public Collection<String> getStyleNames()
+    {
+        return styleSet.keySet();
+    }
 }
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java	(revision 1970)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/MapPaintPreference.java	(revision 1971)
@@ -5,4 +5,6 @@
 
 import java.awt.GridBagLayout;
+import java.util.Collection;
+import java.util.TreeSet;
 
 import javax.swing.BorderFactory;
@@ -35,16 +37,16 @@
                 Main.pref.getBoolean("mappaint.icon.enable-defaults", true));
 
-        styleCombo.addItem("standard");
-
         sources = new StyleSources("mappaint.style.sources", "mappaint.icon.sources",
         "http://josm.openstreetmap.de/styles", false, tr("Map Paint Styles"));
 
-        String style = Main.pref.get("mappaint.style", "standard");
-        if(!style.equals("standard"))
+        Collection<String> styles = new TreeSet<String>(MapPaintStyles.getStyles().getStyleNames());
+        String defstyle = Main.pref.get("mappaint.style", "standard");
+        styles.add(defstyle);
+        for(String style : styles)
             styleCombo.addItem(style);
 
         styleCombo.setEditable(true);
         for (int i = 0; i < styleCombo.getItemCount(); ++i) {
-            if (((String)styleCombo.getItemAt(i)).equals(style)) {
+            if (((String)styleCombo.getItemAt(i)).equals(defstyle)) {
                 styleCombo.setSelectedIndex(i);
                 break;