Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties	(revision 27440)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties	(revision 27441)
@@ -301,4 +301,13 @@
 SBM=SBM Buoy
 
+CoastguardStation=Coastguard Station
+PilotBoarding=Pilot Boarding
+CruisingVessel=Cruising Vessel
+Helicopter=Helicopter
+FromShore=From Shore
+RescueStation=Rescue Station
+RadioStation=Radio Station
+RadarStation=Radar Station
+
 NotDecimal=Not a valid decimal string
 TooBig=Maximum value exceeded
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java	(revision 27440)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java	(revision 27441)
@@ -77,4 +77,17 @@
 				int idx = pilotCats.get(cat);
 				if (dlg.node != null && (idx == pilotCatBox.getSelectedIndex())) {
+					dlg.panelMain.mark.setCategory(cat);
+					dlg.panelMain.mark.testValid();
+				}
+			}
+		}
+	};
+	public JComboBox rescueCatBox;
+	public EnumMap<Cat, Integer> rescueCats = new EnumMap<Cat, Integer>(Cat.class);
+	private ActionListener alRescueCatBox = new ActionListener() {
+		public void actionPerformed(java.awt.event.ActionEvent e) {
+			for (Cat cat : rescueCats.keySet()) {
+				int idx = rescueCats.get(cat);
+				if (dlg.node != null && (idx == rescueCatBox.getSelectedIndex())) {
 					dlg.panelMain.mark.setCategory(cat);
 					dlg.panelMain.mark.testValid();
@@ -158,5 +171,5 @@
 		add(getObjButton(trafficButton, 68, 35, 34, 32, "SSTraffic", Obj.SISTAT));
 		add(getObjButton(warningButton, 102, 35, 34, 32, "SSWarning", Obj.SISTAW));
-		add(getObjButton(coastguardButton, 0, 70, 34, 32, "Coastguard", Obj.CGUSTA));
+		add(getObjButton(coastguardButton, 0, 70, 34, 32, "CoastguardStation", Obj.CGUSTA));
 		add(getObjButton(pilotButton, 34, 70, 34, 32, "PilotBoarding", Obj.PILBOP));
 		add(getObjButton(rescueButton, 68, 70, 34, 32, "RescueStation", Obj.RSCSTA));