Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java	(revision 27939)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java	(revision 27941)
@@ -120,6 +120,6 @@
 					switch (dlg.panelMain.mark.getCategory()) {
 					case LAM_PORT:
-					case LAM_PPORT:
-						dlg.panelMain.mark.setTopmark(Top.CAN);
+					case LAM_PSTBD:
+						dlg.panelMain.mark.setTopmark(Top.CYL);
 						switch (dlg.panelMain.mark.getRegion()) {
 						case A:
@@ -132,12 +132,17 @@
 							break;
 						case C:
-							dlg.panelMain.mark.setTopPattern(Pat.HSTRP);
-							dlg.panelMain.mark.setTopColour(Col.RED);
-							dlg.panelMain.mark.addTopColour(Col.WHITE);
+							if (dlg.panelMain.mark.getCategory() == Cat.LAM_PORT) {
+								dlg.panelMain.mark.setTopPattern(Pat.HSTRP);
+								dlg.panelMain.mark.setTopColour(Col.RED);
+								dlg.panelMain.mark.addTopColour(Col.WHITE);
+							} else {
+								dlg.panelMain.mark.setTopPattern(Pat.NOPAT);
+								dlg.panelMain.mark.setTopColour(Col.RED);
+							}
 							break;
 						}
 						break;
 					case LAM_STBD:
-					case LAM_PSTBD:
+					case LAM_PPORT:
 						dlg.panelMain.mark.setTopmark(Top.CONE);
 						switch (dlg.panelMain.mark.getRegion()) {
@@ -151,7 +156,12 @@
 							break;
 						case C:
-							dlg.panelMain.mark.setTopPattern(Pat.HSTRP);
-							dlg.panelMain.mark.setTopColour(Col.GREEN);
-							dlg.panelMain.mark.addTopColour(Col.WHITE);
+							if (dlg.panelMain.mark.getCategory() == Cat.LAM_STBD) {
+								dlg.panelMain.mark.setTopPattern(Pat.HSTRP);
+								dlg.panelMain.mark.setTopColour(Col.GREEN);
+								dlg.panelMain.mark.addTopColour(Col.WHITE);
+							} else {
+								dlg.panelMain.mark.setTopPattern(Pat.NOPAT);
+								dlg.panelMain.mark.setTopColour(Col.GREEN);
+							}
 							break;
 						}
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMore.java
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMore.java	(revision 27939)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelMore.java	(revision 27941)
@@ -272,5 +272,5 @@
 		addCnsItem(Messages.getString("Wooden"), Cns.WOOD);
 		addCnsItem(Messages.getString("Metal"), Cns.METAL);
-		addCnsItem(Messages.getString("GRP"), Cns.GRP);
+		addCnsItem(Messages.getString("GRP"), Cns.GLAS);
 		addCnsItem(Messages.getString("Painted"), Cns.PAINT);
 		add(constrBox);
Index: applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelTop.java
===================================================================
--- applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelTop.java	(revision 27939)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelTop.java	(revision 27941)
@@ -53,5 +53,5 @@
 		add(panelPat);
 		add(getTopButton(noTopButton, 0, 5, 27, 27, "NoTop", Top.NOTOP));
-		add(getTopButton(canTopButton, 30, 5, 27, 27, "CanTop", Top.CAN));
+		add(getTopButton(canTopButton, 30, 5, 27, 27, "CanTop", Top.CYL));
 		add(getTopButton(coneTopButton, 60, 5, 27, 27, "ConeTop", Top.CONE));
 		add(getTopButton(sphereTopButton, 90, 5, 27, 27, "SphereTop", Top.SPHERE));
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 27939)
+++ applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java	(revision 27941)
@@ -773,10 +773,10 @@
 
 	public enum Top {
-		NOTOP, CAN, CONE, SPHERE, X_SHAPE, NORTH, SOUTH, EAST, WEST, SPHERES2, BOARD, RHOMBUS, CIRCLE, TRIANGLE, TRIANGLE_INV, SQUARE
+		NOTOP, CYL, CONE, SPHERE, X_SHAPE, NORTH, SOUTH, EAST, WEST, SPHERES2, BOARD, RHOMBUS, CIRCLE, TRIANGLE, TRIANGLE_INV, SQUARE
 	}
 
 	public static final EnumMap<Top, String> TopSTR = new EnumMap<Top, String>(Top.class);
 	static {
-		TopSTR.put(Top.CAN, "cylinder");
+		TopSTR.put(Top.CYL, "cylinder");
 		TopSTR.put(Top.CONE, "cone, point up");
 		TopSTR.put(Top.SPHERE, "sphere");
@@ -1016,5 +1016,5 @@
 
 	public enum Cns {
-		UNKCNS, BRICK, CONC, BOULD, HSURF, USURF, WOOD, METAL, GRP, PAINT
+		UNKCNS, BRICK, CONC, BOULD, HSURF, USURF, WOOD, METAL, GLAS, PAINT
 	}
 
@@ -1028,5 +1028,5 @@
 		CnsSTR.put(Cns.WOOD, "wooden");
 		CnsSTR.put(Cns.METAL, "metal");
-		CnsSTR.put(Cns.GRP, "grp");
+		CnsSTR.put(Cns.GLAS, "grp");
 		CnsSTR.put(Cns.PAINT, "painted");
 	}
@@ -2021,5 +2021,5 @@
 			imgStr = "/images/Top_";
 			switch (getTopmark()) {
-			case CAN:
+			case CYL:
 				imgStr += "Can";
 				break;