Index: /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 22691)
+++ /applications/editors/josm/plugins/toms/src/toms/dialogs/SmpDialogAction.java	(revision 22692)
@@ -779,4 +779,7 @@
 					buoy = new BuoySaw(this, SeaMark.SAFE_WATER);
 					buoy.setColour(SeaMark.RED_WHITE);
+				} else if (str.equals("yellow")) {
+					buoy = new BuoySaw(this, SeaMark.SPECIAL_PURPOSE);
+					buoy.setColour(SeaMark.YELLOW);
 				} else {
 					buoy = new BuoyUkn(this, "Parse-Error: Invalid colour");
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyIsol.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyIsol.java	(revision 22691)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyIsol.java	(revision 22692)
@@ -82,8 +82,7 @@
 
 					c = getLightChar();
-
+					if (getLightGroup() != "")
+						c = c + "(" + getLightGroup() + ")";
 					dlg.cbM01Kennung.setSelectedItem(c);
-					if (dlg.cbM01Kennung.getSelectedItem().equals("Not set"))
-						c = "";
 				}
 			}
@@ -172,5 +171,5 @@
 			str = keys.get("seamark:topmark:shape");
 
-			if (str.compareTo("2 spheres") == 0) {
+			if (str.equals("2 spheres")) {
 				setTopMark(true);
 
@@ -202,5 +201,5 @@
 			}
 
-			if (str.compareTo("white") == 0) {
+			if (str.equals("white")) {
 				setFired(true);
 				setLightColour("W");
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java	(revision 22691)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyLat.java	(revision 22692)
@@ -349,5 +349,4 @@
 			image += ".png";
 
-			// System.out.println("finename: " + image);
 			dlg.lM01Icon01.setIcon(new ImageIcon(getClass().getResource(image)));
 		} else
@@ -752,5 +751,5 @@
 			}
 			if (!hasTopMark()) {
-				setErrMsg("Parse-Error: Topmark falsch");
+				setErrMsg("Parse-Error: Invalid topmark");
 				ret = false;
 			}
@@ -784,7 +783,7 @@
 			} else {
 				if (getErrMsg() == null)
-					setErrMsg("Parse-Error: Befeuerung falsch");
+					setErrMsg("Parse-Error: Invalid light");
 				else
-					setErrMsg(getErrMsg() + " / Befeuerung falsch");
+					setErrMsg(getErrMsg() + " / Invalid light");
 			}
 
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyNota.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyNota.java	(revision 22691)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyNota.java	(revision 22692)
@@ -148,5 +148,6 @@
 
 				String c = keys.get("seamark:light:character");
-				String ce = c;
+				if (getLightGroup() != "")
+					c = c + "(" + getLightGroup() + ")";
 				setLightChar(c);
 				setLightPeriod(keys);
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java	(revision 22691)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySaw.java	(revision 22692)
@@ -203,4 +203,6 @@
 				setLightGroup(keys);
 				String c = keys.get("seamark:light:character");
+				if (getLightGroup() != "")
+					c = c + "(" + getLightGroup() + ")";
 				setLightChar(c);
 				setLightPeriod(keys);
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java	(revision 22691)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoySpec.java	(revision 22692)
@@ -147,5 +147,5 @@
 			break;
 		case SPEC_FLOAT:
-			super.saveSign("light_Float");
+			super.saveSign("light_float");
 			Main.main.undoRedo.add(new ChangePropertyCommand(node,
 					"seamark:light_float:colour", "yellow"));
@@ -207,4 +207,6 @@
 
 				String c = keys.get("seamark:light:character");
+				if (getLightGroup() != "")
+					c = c + "(" + getLightGroup() + ")";
 
 				setLightChar(c);
@@ -218,7 +220,7 @@
 			} else {
 				if (getErrMsg() == null)
-					setErrMsg("Parse-Error: Licht falsch");
+					setErrMsg("Parse-Error: Invalid light");
 				else
-					setErrMsg(getErrMsg() + " / Licht falsch");
+					setErrMsg(getErrMsg() + " / Invalid light");
 
 				ret = false;
Index: /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyUkn.java
===================================================================
--- /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyUkn.java	(revision 22691)
+++ /applications/editors/josm/plugins/toms/src/toms/seamarks/buoys/BuoyUkn.java	(revision 22692)
@@ -12,4 +12,7 @@
 	public BuoyUkn(SmpDialogAction dia, String Msg) {
 		super(dia);
+
+		dlg.cbM01StyleOfMark.removeAllItems();
+		dlg.cbM01StyleOfMark.addItem("Not set");
 
 		if (dlg.cbM01Kennung != null) {