Index: /utils/josm/plugins/landsat/src/landsat/LandsatPlugin.java
===================================================================
--- /utils/josm/plugins/landsat/src/landsat/LandsatPlugin.java	(revision 1563)
+++ /utils/josm/plugins/landsat/src/landsat/LandsatPlugin.java	(revision 1564)
@@ -36,6 +36,8 @@
 
 			Main.map.toolBarActions.addSeparator();
-			Main.map.toolBarActions.add(new IconToggleButton
-						(new LandsatAdjustAction(Main.map)));
+			IconToggleButton button = new IconToggleButton
+						(new LandsatAdjustAction(Main.map));
+			Main.map.toolBarActions.add(button);
+			Main.map.toolGroup.add(button);
 		} else if (oldFrame!=null && newFrame==null ) {
 			task.setEnabled(false);
Index: /utils/josm/plugins/mappaint/src/mappaint/MapPaintVisitor.java
===================================================================
--- /utils/josm/plugins/mappaint/src/mappaint/MapPaintVisitor.java	(revision 1563)
+++ /utils/josm/plugins/mappaint/src/mappaint/MapPaintVisitor.java	(revision 1564)
@@ -14,4 +14,6 @@
 import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.SimplePaintVisitor;
 
@@ -50,5 +52,5 @@
 	 */
 	@Override public void visit(Segment ls) {
-		drawSegment(ls, Color.GRAY);
+		drawSegment(ls, getPreferencesColor("untagged",Color.GRAY));
 	}
 
@@ -59,5 +61,5 @@
 	// Altered from SimplePaintVisitor
 	@Override public void visit(Way w) {
-		Color colour = Color.GRAY;
+		Color colour = getPreferencesColor("untagged",Color.GRAY);
 		int width=1;
 		boolean area=false;
@@ -126,5 +128,5 @@
 		if (name!=null)
 		{
-			g.setColor(Color.WHITE);
+			g.setColor( getPreferencesColor ("text", Color.WHITE));
 			g.setFont (new Font("Helvetica", Font.PLAIN, 8));
 			g.drawString (name, p.x+w/2+2, p.y+h/2+2);
@@ -179,3 +181,29 @@
 	}
 
+	// NW 111106 Overridden from SimplePaintVisitor in josm-1.4-nw1
+	// Shows areas before non-areas
+	public void visitAll(DataSet data) {
+
+		for (final OsmPrimitive osm : data.segments)
+			if (!osm.deleted)
+				osm.visit(this);
+
+		for (final OsmPrimitive osm : data.ways) {
+			if(!osm.deleted && MapPaintPlugin.elemStyles.isArea(osm))
+				osm.visit(this);
+		}
+
+		for (final OsmPrimitive osm : data.ways) {
+			if(!osm.deleted && !MapPaintPlugin.elemStyles.isArea(osm))
+				osm.visit(this);
+		}
+
+		for (final OsmPrimitive osm : data.nodes)
+			if (!osm.deleted)
+				osm.visit(this);
+
+		for (final OsmPrimitive osm : data.getSelected())
+			if (!osm.deleted)
+				osm.visit(this);
+	}
 }