Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java	(revision 27043)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java	(revision 27044)
@@ -67,10 +67,9 @@
 				isolButton.setBorderPainted(false);
 			}
-			syncPanel();
+			alTop.actionPerformed(null);
 			dlg.panelMain.panelMore.syncPanel();
 			dlg.mark.paintSign();
 		}
 	};
-
 	private ButtonGroup shapeButtons = new ButtonGroup();
 	public JRadioButton pillarButton = new JRadioButton(new ImageIcon(getClass().getResource("/images/PillarButton.png")));
@@ -117,4 +116,5 @@
 				}
 			}
+			dlg.mark.paintSign();
 		}
 	};
@@ -122,35 +122,33 @@
 	private ActionListener alTop = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
-			if (dlg.mark != null) {
-				if (topmarkButton.isSelected()) {
-					dlg.mark.setTopPattern(Pat.NONE);
-					dlg.mark.setTopColour(Col.BLACK);
-					switch (dlg.mark.getCategory()) {
-					case CAM_NORTH:
-						dlg.mark.setTopmark(Top.NORTH);
-						break;
-					case CAM_SOUTH:
-						dlg.mark.setTopmark(Top.SOUTH);
-						break;
-					case CAM_EAST:
-						dlg.mark.setTopmark(Top.EAST);
-						break;
-					case CAM_WEST:
-						dlg.mark.setTopmark(Top.WEST);
-						break;
-					default:
-						dlg.mark.setTopmark(Top.SPHERES2);
-						break;
-					}
-					topmarkButton.setBorderPainted(true);
-				} else {
-					dlg.mark.setTopmark(Top.NONE);
-					dlg.mark.setTopPattern(Pat.NONE);
-					dlg.mark.setTopColour(Col.UNKNOWN);
-					topmarkButton.setBorderPainted(false);
+			if (topmarkButton.isSelected()) {
+				dlg.mark.setTopPattern(Pat.NONE);
+				dlg.mark.setTopColour(Col.BLACK);
+				switch (dlg.mark.getCategory()) {
+				case CAM_NORTH:
+					dlg.mark.setTopmark(Top.NORTH);
+					break;
+				case CAM_SOUTH:
+					dlg.mark.setTopmark(Top.SOUTH);
+					break;
+				case CAM_EAST:
+					dlg.mark.setTopmark(Top.EAST);
+					break;
+				case CAM_WEST:
+					dlg.mark.setTopmark(Top.WEST);
+					break;
+				default:
+					dlg.mark.setTopmark(Top.SPHERES2);
+					break;
 				}
-				dlg.panelMain.panelTop.syncPanel();
-				dlg.mark.paintSign();
-			}
+				topmarkButton.setBorderPainted(true);
+			} else {
+				dlg.mark.setTopmark(Top.NONE);
+				dlg.mark.setTopPattern(Pat.NONE);
+				dlg.mark.setTopColour(Col.UNKNOWN);
+				topmarkButton.setBorderPainted(false);
+			}
+			dlg.panelMain.panelTop.syncPanel();
+			dlg.mark.paintSign();
 		}
 	};
@@ -193,5 +191,5 @@
 				button.setBorderPainted(false);
 		}
-		topmarkButton.setBorderPainted(topmarkButton.isSelected());
+		topmarkButton.setBorderPainted(dlg.mark.getTopmark() != Top.NONE);
 		topmarkButton.setVisible(dlg.mark.isValid());
 	}
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java	(revision 27043)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMain.java	(revision 27044)
@@ -31,4 +31,5 @@
 	public JLabel fogLabel = null;
 	public JLabel colLabel = null;
+	public JLabel litLabel = null;
 	public JLabel nameLabel = null;
 	public JTextField nameBox = null;
@@ -211,8 +212,11 @@
 		this.add(fogIcon, null);
 		radarLabel = new JLabel("", SwingConstants.CENTER);
-		radarLabel.setBounds(new Rectangle(210, 35, 100, 20));
+		litLabel = new JLabel("", SwingConstants.CENTER);
+		litLabel.setBounds(new Rectangle(210, 35, 100, 20));
+		this.add(litLabel, null);
+		radarLabel.setBounds(new Rectangle(210, 55, 100, 20));
 		this.add(radarLabel, null);
 		fogLabel = new JLabel("", SwingConstants.CENTER);
-		fogLabel.setBounds(new Rectangle(210, 60, 100, 20));
+		fogLabel.setBounds(new Rectangle(210, 75, 100, 20));
 		this.add(fogLabel, null);
 		colLabel = new JLabel("", SwingConstants.CENTER);
@@ -315,4 +319,5 @@
 		fogLabel.setText("");
 		colLabel.setText("");
+		litLabel.setText("");
 		shapeIcon.setIcon(null);
 		lightIcon.setIcon(null);
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 27043)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java	(revision 27044)
@@ -1476,4 +1476,5 @@
 
 		dlg.panelMain.shapeIcon.setIcon(null);
+		dlg.panelMain.litLabel.setText("");
 		dlg.panelMain.colLabel.setText("");
 		dlg.panelMain.radarLabel.setText("");
@@ -1817,6 +1818,58 @@
 		}
 		
-		if ((getLightAtt(Att.COL, 0) != Col.UNKNOWN) && (sectors.size() == 1)) {
-			dlg.panelMain.lightIcon.setIcon(new ImageIcon(getClass().getResource("/images/Light_Magenta_120.png")));
+		if (getLightAtt(Att.COL, 0) != Col.UNKNOWN) {
+			if (sectors.size() == 1) {
+				switch ((Col) getLightAtt(Att.COL, 0)) {
+				case RED:
+					dlg.panelMain.lightIcon.setIcon(new ImageIcon(getClass().getResource("/images/Light_Red_120.png")));
+					break;
+				case GREEN:
+					dlg.panelMain.lightIcon.setIcon(new ImageIcon(getClass().getResource("/images/Light_Green_120.png")));
+					break;
+				case WHITE:
+				case YELLOW:
+					dlg.panelMain.lightIcon.setIcon(new ImageIcon(getClass().getResource("/images/Light_White_120.png")));
+					break;
+				default:
+					dlg.panelMain.lightIcon.setIcon(new ImageIcon(getClass().getResource("/images/Light_Magenta_120.png")));
+				}
+			}
+			String c = (String)getLightAtt(Att.CHR, 0);
+			String tmp = "";
+			if (c.contains("+")) {
+				int i1 = c.indexOf("+");
+				tmp = c.substring(i1, c.length());
+				c = c.substring(0, i1);
+				if (!((String)getLightAtt(Att.GRP, 0)).isEmpty()) {
+					c += "(" + (String)getLightAtt(Att.GRP, 0) + ")";
+				}
+				if (tmp != null)
+					c += tmp;
+			} else if (!((String)getLightAtt(Att.GRP, 0)).isEmpty())
+				c += "(" + (String)getLightAtt(Att.GRP, 0) + ")";
+			switch ((Col)getLightAtt(Att.COL, 0)) {
+			case RED:
+				c += " R";
+				break;
+			case GREEN:
+				c += " G";
+				break;
+			case AMBER:
+				c += " Am";
+				break;
+			case ORANGE:
+				c += " Or";
+				break;
+			case BLUE:
+				c += " Bu";
+				break;
+			case VIOLET:
+				c += " Vi";
+				break;
+			}
+			tmp = (String)getLightAtt(Att.PER, 0);
+			if (!tmp.isEmpty())
+				c += " " + tmp + "s";
+			dlg.panelMain.litLabel.setText(c);
 		}