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 26566)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java	(revision 26568)
@@ -13,5 +13,5 @@
 
 	private OSeaMAction dlg;
-	private ButtonGroup catButtons = new ButtonGroup();
+	private ButtonGroup objButtons = new ButtonGroup();
 	public JRadioButton houseButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LighthouseButton.png")));
 	public JRadioButton majorButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/LightMajorButton.png")));
@@ -21,13 +21,11 @@
 	public JRadioButton trafficButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/TrafficButton.png")));
 	public JRadioButton warningButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/WarningButton.png")));
-	private EnumMap<Cat, JRadioButton> categories = new EnumMap<Cat, JRadioButton>(Cat.class);
-	private EnumMap<Cat, Obj> objects = new EnumMap<Cat, Obj>(Cat.class);
-	private ActionListener alCat = new ActionListener() {
+	private EnumMap<Obj, JRadioButton> objects = new EnumMap<Obj, JRadioButton>(Obj.class);
+	private ActionListener alObj = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
-			for (Cat cat : categories.keySet()) {
-				JRadioButton button = categories.get(cat);
+			for (Obj obj : objects.keySet()) {
+				JRadioButton button = objects.get(obj);
 				if (button.isSelected()) {
-					dlg.mark.setCategory(cat);
-					dlg.mark.setObject(objects.get(cat));
+					dlg.mark.setObject(obj);
 					button.setBorderPainted(true);
 				} else
@@ -40,11 +38,11 @@
 		dlg = dia;
 		this.setLayout(null);
-		this.add(getCatButton(houseButton, 0, 0, 34, 32, "Lighthouse", Cat.LIGHT_HOUSE, Obj.LNDMRK), null);
-		this.add(getCatButton(majorButton, 35, 0, 34, 32, "MajorLight", Cat.LIGHT_MAJOR, Obj.LITMAJ), null);
-		this.add(getCatButton(minorButton, 70, 0, 34, 32, "MinorLight", Cat.LIGHT_MINOR, Obj.LITMIN), null);
-		this.add(getCatButton(vesselButton, 105, 0, 34, 32, "LightVessel", Cat.LIGHT_VESSEL, Obj.LITVES), null);
-		this.add(getCatButton(floatButton, 140, 0, 34, 32, "LightFloat", Cat.LIGHT_FLOAT, Obj.LITFLT), null);
-		this.add(getCatButton(trafficButton, 50, 32, 34, 32, "SSTraffic", Cat.SIGNAL_STATION, Obj.SIGSTA), null);
-		this.add(getCatButton(warningButton, 125, 32, 34, 32, "SSWarning", Cat.SIGNAL_STATION, Obj.SIGSTA), null);
+		this.add(getObjButton(houseButton, 0, 0, 34, 32, "Lighthouse", Obj.LNDMRK), null);
+		this.add(getObjButton(majorButton, 35, 0, 34, 32, "MajorLight", Obj.LITMAJ), null);
+		this.add(getObjButton(minorButton, 70, 0, 34, 32, "MinorLight", Obj.LITMIN), null);
+		this.add(getObjButton(vesselButton, 105, 0, 34, 32, "LightVessel", Obj.LITVES), null);
+		this.add(getObjButton(floatButton, 140, 0, 34, 32, "LightFloat", Obj.LITFLT), null);
+		this.add(getObjButton(trafficButton, 50, 35, 34, 32, "SSTraffic", Obj.SISTAT), null);
+		this.add(getObjButton(warningButton, 90, 35, 34, 32, "SSWarning", Obj.SISTAW), null);
 	}
 
@@ -53,12 +51,11 @@
 	}
 
-	private JRadioButton getCatButton(JRadioButton button, int x, int y, int w, int h, String tip, Cat cat, Obj obj) {
+	private JRadioButton getObjButton(JRadioButton button, int x, int y, int w, int h, String tip,Obj obj) {
 		button.setBounds(new Rectangle(x, y, w, h));
 		button.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 		button.setToolTipText(Messages.getString(tip));
-		button.addActionListener(alCat);
-		catButtons.add(button);
-		categories.put(cat, button);
-		objects.put(cat, obj);
+		button.addActionListener(alObj);
+		objButtons.add(button);
+		objects.put(obj, button);
 		return button;
 	}
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java	(revision 26566)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java	(revision 26568)
@@ -47,5 +47,6 @@
 
 	public enum Obj {
-		UNKNOWN, BCNCAR, BCNISD, BCNLAT, BCNSAW, BCNSPP, BOYCAR, BOYISD, BOYLAT, BOYSAW, BOYSPP, FLTCAR, FLTISD, FLTLAT, FLTSAW, FLTSPP, LITMAJ, LITMIN, LITFLT, LITVES, LNDMRK, MORFAC, SIGSTA
+		UNKNOWN, BCNCAR, BCNISD, BCNLAT, BCNSAW, BCNSPP, BOYCAR, BOYISD, BOYLAT, BOYSAW, BOYSPP, FLTCAR, FLTISD, FLTLAT, FLTSAW, FLTSPP,
+		LITMAJ, LITMIN, LITFLT, LITVES, LNDMRK, MORFAC, SISTAW, SISTAT
 	}
 
@@ -72,6 +73,6 @@
 		ObjSTR.put(Obj.LNDMRK, "landmark");
 		ObjSTR.put(Obj.MORFAC, "mooring");
-		ObjSTR.put(Obj.SIGSTA, "signal_station_warning");
-		ObjSTR.put(Obj.SIGSTA, "signal_station_traffic");
+		ObjSTR.put(Obj.SISTAW, "signal_station_warning");
+		ObjSTR.put(Obj.SISTAT, "signal_station_traffic");
 	}
 
@@ -108,5 +109,6 @@
 		EntMAP.put(Obj.LNDMRK, Ent.LIGHT);
 		EntMAP.put(Obj.MORFAC, Ent.MOORING);
-		EntMAP.put(Obj.SIGSTA, Ent.STATION);
+		EntMAP.put(Obj.SISTAW, Ent.STATION);
+		EntMAP.put(Obj.SISTAT, Ent.STATION);
 	}
 
@@ -134,9 +136,10 @@
 		GrpMAP.put(Obj.LNDMRK, Grp.LIT);
 		GrpMAP.put(Obj.MORFAC, Grp.SPP);
-		GrpMAP.put(Obj.SIGSTA, Grp.SIS);
+		GrpMAP.put(Obj.SISTAW, Grp.SIS);
+		GrpMAP.put(Obj.SISTAT, Grp.SIS);
 	}
 
 	public enum Cat {
-		UNKNOWN, LAT_PORT, LAT_STBD, LAT_PREF_PORT, LAT_PREF_STBD, CARD_NORTH, CARD_EAST, CARD_SOUTH, CARD_WEST, LIGHT_HOUSE, LIGHT_MAJOR, LIGHT_MINOR, LIGHT_VESSEL, LIGHT_FLOAT, MOORING_BUOY, SIGNAL_STATION
+		UNKNOWN, LAT_PORT, LAT_STBD, LAT_PREF_PORT, LAT_PREF_STBD, CARD_NORTH, CARD_EAST, CARD_SOUTH, CARD_WEST, MOORING_BUOY
 	}