Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 790)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 791)
@@ -121,5 +121,5 @@
 	 */
 	public static Collection<String> uninteresting = 
-		new HashSet<String>(Arrays.asList(new String[] {"source", "note", "created_by"}));
+		new HashSet<String>(Arrays.asList(new String[] {"source", "note", "converted_by", "created_by"}));
 	
 	/**
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java	(revision 790)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java	(revision 791)
@@ -87,25 +87,28 @@
 				for (int count=0; count<atts.getLength(); count++) {
 					if (atts.getQName(count).equals("src")) {
-						String imageFile = MapPaintStyles.getImageDir()+atts.getValue(count); 
-						File f = new File(imageFile);
-						if (f.exists()) {
-							//open icon from user directory
-							curIcon = new ImageIcon(imageFile);
-						} else {
-							try {
-								URL path = getClass().getResource(MapPaintStyles.getImageDir()+atts.getValue(count));
-								if (path == null) {
-									/* icon not found, using default */
-									System.out.println("Mappaint: Icon " + atts.getValue(count) + " not found, using default icon");
-									path = getClass().getResource(MapPaintStyles.getImageDir()+"misc/no_icon.png");
-									curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
-								} else {
-									curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
-								}
+						if(!MapPaintStyles.isInternal())
+						{
+							String imageFile = MapPaintStyles.getImageDir()+atts.getValue(count); 
+							File f = new File(imageFile);
+							if (f.exists()) {
+								//open icon from user directory
+								curIcon = new ImageIcon(imageFile);
+								continue;
 							}
-							catch (Exception e){
-								URL path = getClass().getResource(MapPaintStyles.getImageDir()+"incomming/amenity.png");
+						}
+						try {
+							URL path = getClass().getResource(MapPaintStyles.getInternalImageDir()+atts.getValue(count));
+							if (path == null) {
+								/* icon not found, using default */
+								System.out.println("Mappaint: Icon " + atts.getValue(count) + " not found, using default icon");
+								path = getClass().getResource(MapPaintStyles.getInternalImageDir()+"misc/no_icon.png");
+								curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
+							} else {
 								curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
 							}
+						}
+						catch (Exception e){
+							URL path = getClass().getResource(MapPaintStyles.getInternalImageDir()+"incomming/amenity.png");
+							curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
 						}
 					} else if (atts.getQName(count).equals("annotate")) {
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java	(revision 790)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java	(revision 791)
@@ -8,5 +8,5 @@
 {
 	HashMap<String, ElemStyle> styles;
-	static int nr = 0;
+	// static int nr = 0;
 
 
@@ -69,5 +69,5 @@
 				}
 			}
-
+/**
             // not a known key/value combination
 			boolean first_line = true;
@@ -103,6 +103,6 @@
 				}
 			}
+*/		
 		}
-		
 		return null;
 	}
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 790)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 791)
@@ -16,6 +16,8 @@
 public class MapPaintStyles {
 
-	public static String styleDir;
-	public static String imageDir;
+	private static String styleDir;
+	private static String imageDir;
+	private static String internalImageDir;
+	private static Boolean isInternal = false;
 	private static HashMap<String, ElemStyle> styles = new HashMap<String, ElemStyle>();
 	
@@ -25,4 +27,10 @@
 	public static String getImageDir(){
 		return imageDir;
+	}
+	public static String getInternalImageDir(){
+		return internalImageDir;
+	}
+	public static Boolean isInternal(){
+		return isInternal;
 	}
 
@@ -62,5 +70,6 @@
 			if (elemStylesPath != null)
 			{
-				imageDir = "/images/styles/standard/";
+				internalImageDir = "/images/styles/"+styleName+"/";
+				isInternal = true;
 				try
 				{