Index: applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 23007)
+++ applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 23009)
@@ -134,10 +134,10 @@
 	public JComboBox cbM01Racon = null;
 	public JTextField tfM01Racon = null;
-	private JLabel lM01Racon = null;
+	public JLabel lM01Racon = null;
 	public JCheckBox cM01Fog = null;
 	public JComboBox cbM01Fog = null;
-	private JLabel lM01FogGroup = null;
+	public JLabel lM01FogGroup = null;
 	public JTextField tfM01FogGroup = null;
-	private JLabel lM01FogPeriod = null;
+	public JLabel lM01FogPeriod = null;
 	public JTextField tfM01FogPeriod = null;
 	public JCheckBox cM01Fired = null;
@@ -145,18 +145,18 @@
 	public JRadioButton rbM01Fired1 = null;
 	public JRadioButton rbM01FiredN = null;
-	private JLabel lM01Kennung = null;
+	public JLabel lM01Kennung = null;
 	public JComboBox cbM01Kennung = null;
-	private JLabel lM01Height = null;
+	public JLabel lM01Height = null;
 	public JTextField tfM01Height = null;
-	private JLabel lM01Range = null;
-	private JLabel lM01Group = null;
+	public JLabel lM01Range = null;
+	public JLabel lM01Group = null;
 	public JTextField tfM01Group = null;
-	private JLabel lM01RepeatTime = null;
+	public JLabel lM01RepeatTime = null;
 	public JTextField tfM01RepeatTime = null;
-	private JLabel lM01Sector = null;
+	public JLabel lM01Sector = null;
 	public JComboBox cbM01Sector = null;
-	private JLabel lM01Colour = null;
+	public JLabel lM01Colour = null;
 	public JComboBox cbM01Colour = null;
-	private JLabel lM01Bearing = null;
+	public JLabel lM01Bearing = null;
 	public JTextField tfM01Bearing = null;
 	public JTextField tfM02Bearing = null;
@@ -439,8 +439,4 @@
 				} else if (str.equals("yellow")) { //$NON-NLS-1$
 					buoy = new BuoySaw(this, node);
-					return;
-				} else {
-					buoy = new BuoyUkn(this, Messages.getString("SmpDialogAction.82")); //$NON-NLS-1$
-					buoy.setNode(node);
 					return;
 				}
Index: applications/editors/josm/plugins/toms/src/toms/msg/messages.properties
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/msg/messages.properties	(revision 23007)
+++ applications/editors/josm/plugins/toms/src/toms/msg/messages.properties	(revision 23009)
@@ -17,5 +17,5 @@
 SmpDialogAction.129=Sector:
 SmpDialogAction.131=Colour:
-SmpDialogAction.133=Brg:         \uFFFD-        \uFFFD, r:
+SmpDialogAction.133=Brg:         \u00B0-        \u00B0, r:
 SmpDialogAction.134=-A
 SmpDialogAction.140=Single
@@ -47,5 +47,5 @@
 SmpDialogAction.191=R
 SmpDialogAction.192=G
-SmpDialogAction.194=Com
+SmpDialogAction.194=All
 SmpDialogAction.195=1
 SmpDialogAction.196=2
Index: applications/editors/josm/plugins/toms/src/toms/msg/messages_de.properties
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/msg/messages_de.properties	(revision 23007)
+++ applications/editors/josm/plugins/toms/src/toms/msg/messages_de.properties	(revision 23009)
@@ -61,5 +61,4 @@
 SmpDialogAction.27=Bitte einen Knoten anwählen
 SmpDialogAction.28=Bitte nur einen Knoten anwählen
-SmpDialogAction.82=Parse-Error: ungültige Farbe
 SmpDialogAction.9=Seamap Editor
 SmpDialogAction.4=OpenSeaMap Editor
Index: applications/editors/josm/plugins/toms/src/toms/msg/messages_en.properties
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/msg/messages_en.properties	(revision 23007)
+++ applications/editors/josm/plugins/toms/src/toms/msg/messages_en.properties	(revision 23009)
@@ -17,5 +17,5 @@
 SmpDialogAction.129=Sector:
 SmpDialogAction.131=Colour:
-SmpDialogAction.133=Brg:         \uFFFD-        \uFFFD, r:
+SmpDialogAction.133=Brg:         \u00B0-        \u00B0, r:
 SmpDialogAction.134=-A
 SmpDialogAction.140=Single
@@ -47,5 +47,5 @@
 SmpDialogAction.191=R
 SmpDialogAction.192=G
-SmpDialogAction.194=Com
+SmpDialogAction.194=All
 SmpDialogAction.195=1
 SmpDialogAction.196=2
@@ -63,5 +63,4 @@
 SmpDialogAction.28=Please select only one node
 SmpDialogAction.4=Edit OpenSeaMap
-SmpDialogAction.82=Parse-Error: Invalid colour
 SmpDialogAction.9=Seamark Editor
 SmpDialogAction.91=Seamark not set
Index: applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java
===================================================================
--- applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 23007)
+++ applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/Buoy.java	(revision 23009)
@@ -339,5 +339,5 @@
 		dlg.cM01TopMark.setEnabled(false);
 		dlg.cbM01TopMark.removeAllItems();
-		dlg.cbM01TopMark.setEnabled(false);
+		dlg.cbM01TopMark.setVisible(false);
 		setTopMark(false);
 		dlg.cM01Radar.setSelected(false);
@@ -346,15 +346,18 @@
 		dlg.cM01Racon.setEnabled(false);
 		dlg.cbM01Racon.removeAllItems();
-		dlg.cbM01Racon.setEnabled(false);
+		dlg.cbM01Racon.setVisible(false);
 		dlg.tfM01Racon.setText("");
-		dlg.tfM01Racon.setEnabled(false);
+		dlg.tfM01Racon.setVisible(false);
+		dlg.lM01Racon.setVisible(false);
 		dlg.cM01Fog.setSelected(false);
 		dlg.cM01Fog.setEnabled(false);
 		dlg.cbM01Fog.removeAllItems();
-		dlg.cbM01Fog.setEnabled(false);
+		dlg.cbM01Fog.setVisible(false);
 		dlg.tfM01FogGroup.setText("");
-		dlg.tfM01FogGroup.setEnabled(false);
+		dlg.tfM01FogGroup.setVisible(false);
+		dlg.lM01FogGroup.setVisible(false);
 		dlg.tfM01FogPeriod.setText("");
-		dlg.tfM01FogPeriod.setEnabled(false);
+		dlg.tfM01FogPeriod.setVisible(false);
+		dlg.lM01FogPeriod.setVisible(false);
 		dlg.cM01Fired.setSelected(false);
 		dlg.cM01Fired.setEnabled(false);
@@ -363,21 +366,29 @@
 		dlg.rbM01FiredN.setEnabled(false);
 		dlg.cbM01Kennung.removeAllItems();
-		dlg.cbM01Kennung.setEnabled(false);
+		dlg.cbM01Kennung.setVisible(false);
+		dlg.lM01Kennung.setVisible(false);
 		dlg.tfM01Height.setText("");
-		dlg.tfM01Height.setEnabled(false);
+		dlg.tfM01Height.setVisible(false);
+		dlg.lM01Height.setVisible(false);
 		dlg.tfM01Range.setText("");
-		dlg.tfM01Range.setEnabled(false);
-		dlg.cbM01Colour.setEnabled(false);
-		dlg.cbM01Sector.setEnabled(false);
+		dlg.tfM01Range.setVisible(false);
+		dlg.lM01Range.setVisible(false);
+		dlg.cbM01Colour.setVisible(false);
+		dlg.lM01Colour.setVisible(false);
+		dlg.cbM01Sector.setVisible(false);
+		dlg.lM01Sector.setVisible(false);
 		dlg.tfM01Group.setText("");
-		dlg.tfM01Group.setEnabled(false);
+		dlg.tfM01Group.setVisible(false);
+		dlg.lM01Group.setVisible(false);
 		dlg.tfM01RepeatTime.setText("");
-		dlg.tfM01RepeatTime.setEnabled(false);
+		dlg.tfM01RepeatTime.setVisible(false);
+		dlg.lM01RepeatTime.setVisible(false);
 		dlg.tfM01Bearing.setText("");
-		dlg.tfM01Bearing.setEnabled(false);
+		dlg.tfM01Bearing.setVisible(false);
+		dlg.lM01Bearing.setVisible(false);
 		dlg.tfM02Bearing.setText("");
-		dlg.tfM02Bearing.setEnabled(false);
+		dlg.tfM02Bearing.setVisible(false);
 		dlg.tfM01Radius.setText("");
-		dlg.tfM01Radius.setEnabled(false);
+		dlg.tfM01Radius.setVisible(false);
 
 		dlg.bM01Save.setEnabled(false);