Index: /applications/editors/josm/plugins/smed2/src/symbols/Areas.java
===================================================================
--- /applications/editors/josm/plugins/smed2/src/symbols/Areas.java	(revision 29108)
+++ /applications/editors/josm/plugins/smed2/src/symbols/Areas.java	(revision 29109)
@@ -10,5 +10,25 @@
 package symbols;
 
+import java.util.ArrayList;
+
+import symbols.Symbols.Instr;
+
 public class Areas {
-
+	public static final ArrayList<Instr> Cable = new ArrayList<Instr>();
+	public static final ArrayList<Instr> LaneArrow = new ArrayList<Instr>();
+	public static final ArrayList<Instr> LineAnchor = new ArrayList<Instr>();
+	public static final ArrayList<Instr> LinePlane = new ArrayList<Instr>();
+	public static final ArrayList<Instr> MarineFarm = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoWake = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Pipeline = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Restricted = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Rock = new ArrayList<Instr>();
+	public static final ArrayList<Instr> RockA = new ArrayList<Instr>();
+	public static final ArrayList<Instr> RockC = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Sandwaves = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Seaplane = new ArrayList<Instr>();
+	public static final ArrayList<Instr> WindFarm = new ArrayList<Instr>();
+	public static final ArrayList<Instr> WreckD = new ArrayList<Instr>();
+	public static final ArrayList<Instr> WreckND = new ArrayList<Instr>();
+	public static final ArrayList<Instr> WreckS = new ArrayList<Instr>();
 }
Index: /applications/editors/josm/plugins/smed2/src/symbols/Beacons.java
===================================================================
--- /applications/editors/josm/plugins/smed2/src/symbols/Beacons.java	(revision 29108)
+++ /applications/editors/josm/plugins/smed2/src/symbols/Beacons.java	(revision 29109)
@@ -10,19 +10,148 @@
 package symbols;
 
+import java.awt.BasicStroke;
+import java.awt.Color;
+import java.awt.geom.Ellipse2D;
+import java.awt.geom.GeneralPath;
+import java.awt.geom.Line2D;
+import java.awt.geom.Path2D;
 import java.util.ArrayList;
 
 import symbols.Symbols.Instr;
+import symbols.Symbols.Prim;
 
 public class Beacons {
 	public static final ArrayList<Instr> Beacon = new ArrayList<Instr>();
+	static {
+		ArrayList<Instr> colours = new ArrayList<Instr>();
+		Path2D.Double p = new Path2D.Double(); p.moveTo(-6.0,-8.5); p.lineTo(-6.0,-70.0); p.lineTo(6.0,-70.0); p.lineTo(6.0,-8.5); p.curveTo(6.0,-10.0,-6.0,-10.0,-6.0,-8.5); p.closePath();
+		colours.add(new Instr(Prim.P1, p));
+		p = new Path2D.Double(); p.moveTo(-6.0,-8.5); p.lineTo(-6.0,-40.0); p.lineTo(6.0,-40.0); p.lineTo(6.0,-8.5); p.curveTo(6.0,-10.0,-6.0,-10.0,-6.0,-8.5); p.closePath();
+    colours.add(new Instr(Prim.H2, p));
+		p = new Path2D.Double(); p.moveTo(-6.0,-30.0); p.lineTo(-6.0,-50.0); p.lineTo(6.0,-50.0); p.lineTo(6.0,-30.0); p.closePath();
+    colours.add(new Instr(Prim.H3, p));
+		p = new Path2D.Double(); p.moveTo(-6.0,-40.0); p.lineTo(-6.0,-55.0); p.lineTo(6.0,-55.0); p.lineTo(6.0,-40.0); p.closePath();
+    colours.add(new Instr(Prim.H4, p));
+		p = new Path2D.Double(); p.moveTo(-6.0,-25.0); p.lineTo(-6.0,-40.0); p.lineTo(6.0,-40.0); p.lineTo(6.0,-25.0); p.closePath();
+    colours.add(new Instr(Prim.H5, p));
+		p = new Path2D.Double(); p.moveTo(0.0,-70.0); p.lineTo(6.0,-70.0); p.lineTo(6.0,-8.5); p.quadTo(3.0,-9.3,0.0,-10.0); p.closePath();
+    colours.add(new Instr(Prim.V2, p));
+    Beacon.add(new Instr(Prim.COLR, colours));
+    Beacon.add(new Instr(Prim.STRK, new BasicStroke(4.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND)));
+    Beacon.add(new Instr(Prim.FILL, Color.black));
+    Beacon.add(new Instr(Prim.ELPS, new Ellipse2D.Double(-10,-10,20,20)));
+    Beacon.add(new Instr(Prim.LINE, new Line2D.Double(-20,0,-10,0)));
+    Beacon.add(new Instr(Prim.LINE, new Line2D.Double(10,0,20,0)));
+		p = new Path2D.Double(); p.moveTo(-6.0,-8.5); p.lineTo(-6.0,-70.0); p.lineTo(6.0,-70.0); p.lineTo(6.0,-8.5);
+		Beacon.add(new Instr(Prim.PLIN, p));
+	}
 	public static final ArrayList<Instr> Cairn = new ArrayList<Instr>();
+	static {
+		Cairn.add(new Instr(Prim.STRK, new BasicStroke(4.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND)));
+		Cairn.add(new Instr(Prim.FILL, Color.black));
+		Cairn.add(new Instr(Prim.ELPS, new Ellipse2D.Double(-10,-10,20,20)));
+		Cairn.add(new Instr(Prim.LINE, new Line2D.Double(-40,0,-10,0)));
+		Cairn.add(new Instr(Prim.LINE, new Line2D.Double(10,0,40,0)));
+		Cairn.add(new Instr(Prim.ELPS, new Ellipse2D.Double(3,-40,40,40)));
+		Cairn.add(new Instr(Prim.ELPS, new Ellipse2D.Double(-43,-40,40,40)));
+		Cairn.add(new Instr(Prim.ELPS, new Ellipse2D.Double(-18,-70,36,36)));
+	}
 	public static final ArrayList<Instr> LightMajor = new ArrayList<Instr>();
+	static {
+		Path2D.Double p = new Path2D.Double(); p.setWindingRule(GeneralPath.WIND_NON_ZERO);
+		p.moveTo(0.0,-7.0); p.curveTo(-9.3,-7.0,-9.3,7.0,0.0,7.0); p.curveTo(9.3,7.0,9.3,-7.0,0.0,-7.0); 
+		p.moveTo(0.0,-35.5); p.lineTo(8.0,-11.2); p.lineTo(33.5,-11.2); p.lineTo(12.8,4.0);
+		p.lineTo(20.5,28.5); p.lineTo(0.0,13.0); p.lineTo(-20.5,28.5); p.lineTo(-12.8,4.0); p.lineTo(-33.5,-11.2); p.lineTo(-8.0,-11.2); p.closePath();
+		LightMajor.add(new Instr(Prim.PGON, p));
+	}
 	public static final ArrayList<Instr> LightMinor = new ArrayList<Instr>();
+	static {
+		Path2D.Double p = new Path2D.Double(); p.moveTo(0.0,-26.5); p.lineTo(6.0,-8.4); p.lineTo(25.1,-8.4); p.lineTo(9.6,3.0);
+		p.lineTo(15.4,21.4); p.lineTo(0.0,9.8); p.lineTo(-15.4,21.4); p.lineTo(-9.6,3.0); p.lineTo(-25.1,-8.4); p.lineTo(-6.0,-8.4); p.closePath();
+		LightMinor.add(new Instr(Prim.PGON, p));
+	}
 	public static final ArrayList<Instr> PerchPort = new ArrayList<Instr>();
+	static {
+		PerchPort.add(new Instr(Prim.STRK, new BasicStroke(4.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND)));
+		PerchPort.add(new Instr(Prim.FILL, Color.black));
+		PerchPort.add(new Instr(Prim.LINE, new Line2D.Double(-10,0,10,0)));
+		PerchPort.add(new Instr(Prim.LINE, new Line2D.Double(0,0,0,-40)));
+		PerchPort.add(new Instr(Prim.LINE, new Line2D.Double(25,-70,0,-40)));
+		PerchPort.add(new Instr(Prim.LINE, new Line2D.Double(-25,-70,0,-40)));
+	}
 	public static final ArrayList<Instr> PerchStarboard = new ArrayList<Instr>();
+	static {
+		PerchStarboard.add(new Instr(Prim.STRK, new BasicStroke(4.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND)));
+		PerchStarboard.add(new Instr(Prim.FILL, Color.black));
+		PerchStarboard.add(new Instr(Prim.LINE, new Line2D.Double(-10,0,10,0)));
+		PerchStarboard.add(new Instr(Prim.LINE, new Line2D.Double(0,0,0,-70)));
+		PerchStarboard.add(new Instr(Prim.LINE, new Line2D.Double(25,-40,0,-68.7)));
+		PerchStarboard.add(new Instr(Prim.LINE, new Line2D.Double(-25,-40,0,-68.7)));
+	}
 	public static final ArrayList<Instr> Stake = new ArrayList<Instr>();
+	static {
+		Stake.add(new Instr(Prim.STRK, new BasicStroke(4.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND)));
+		Stake.add(new Instr(Prim.FILL, Color.black));
+		Stake.add(new Instr(Prim.LINE, new Line2D.Double(0,0,0,-70)));
+		ArrayList<Instr> colours = new ArrayList<Instr>();
+		Path2D.Double p = new Path2D.Double(); p.moveTo(-2.0,0.0); p.lineTo(-2.0,-70.0); p.lineTo(2.0,-70.0); p.lineTo(2.0,0.0); p.closePath();
+		colours.add(new Instr(Prim.P1, p));
+		p = new Path2D.Double(); p.moveTo(-2.0,0.0); p.lineTo(-2.0,-35.0); p.lineTo(2.0,-35.0); p.lineTo(2.0,0.0); p.closePath();
+		colours.add(new Instr(Prim.H2, p));
+		p = new Path2D.Double(); p.moveTo(-2.0,-23.3); p.lineTo(-2.0,-46.7); p.lineTo(2.0,-46.7); p.lineTo(2.0,-23.3); p.closePath();
+		colours.add(new Instr(Prim.H3, p));
+		p = new Path2D.Double(); p.moveTo(-2.0,-35.0); p.lineTo(-2.0,-52.5); p.lineTo(2.0,-52.5); p.lineTo(2.0,-35.0); p.closePath();
+		colours.add(new Instr(Prim.H4, p));
+		p = new Path2D.Double(); p.moveTo(-2.0,-17.5); p.lineTo(-2.0,-35.0); p.lineTo(2.0,-35.0); p.lineTo(2.0,-17.5); p.closePath();
+		colours.add(new Instr(Prim.H5, p));
+    Stake.add(new Instr(Prim.COLR, colours));
+		Stake.add(new Instr(Prim.FILL, Color.black));
+		Stake.add(new Instr(Prim.LINE, new Line2D.Double(-10,0,10,0)));
+	}
 	public static final ArrayList<Instr> Tower = new ArrayList<Instr>();
+	static {
+		ArrayList<Instr> colours = new ArrayList<Instr>();
+		Path2D.Double p = new Path2D.Double(); p.moveTo(-25.0,0.0); p.lineTo(-20.0,-70.0); p.lineTo(20.0,-70.0); p.lineTo(25.0,0.0); p.lineTo(10.0,0.0); p.curveTo(10.0,-13.3,-10.0,-13.3,-10.0,0.0); p.closePath();
+		colours.add(new Instr(Prim.P1, p));
+		p = new Path2D.Double(); p.moveTo(-25.0,0.0); p.lineTo(-22.5,-35.0); p.lineTo(22.5,-35.0); p.lineTo(25.0,0.0); p.lineTo(10.0,0.0); p.curveTo(10.0,-13.3,-10.0,-13.3,-10.0,0.0); p.closePath();
+    colours.add(new Instr(Prim.H2, p));
+		p = new Path2D.Double(); p.moveTo(-23.3,-23.3); p.lineTo(-21.7,-46.7); p.lineTo(21.7,-46.7); p.lineTo(23.3,-23.3); p.closePath();
+    colours.add(new Instr(Prim.H3, p));
+		p = new Path2D.Double(); p.moveTo(-22.5,-35.0); p.lineTo(-21.0,-52.5); p.lineTo(21.0,-52.5); p.lineTo(22.5,-35.0); p.closePath();
+    colours.add(new Instr(Prim.H4, p));
+		p = new Path2D.Double(); p.moveTo(-23.6,-17.5); p.lineTo(-22.5,-35.0); p.lineTo(22.5,-35.0); p.lineTo(23.6,-17.5); p.closePath();
+    colours.add(new Instr(Prim.H5, p));
+		p = new Path2D.Double(); p.moveTo(0.0,-70.0); p.lineTo(20.0,-70.0); p.lineTo(25.0,0.0); p.lineTo(10.0,0.0); p.quadTo(10.0,-10.0,0.0,-10.0); p.closePath();
+    colours.add(new Instr(Prim.V2, p));
+    Tower.add(new Instr(Prim.COLR, colours));
+    Tower.add(new Instr(Prim.STRK, new BasicStroke(4.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND)));
+    Tower.add(new Instr(Prim.FILL, Color.black));
+    Tower.add(new Instr(Prim.ELPS, new Ellipse2D.Double(-10,-10,20,20)));
+    Tower.add(new Instr(Prim.LINE, new Line2D.Double(-35,0,-10,0)));
+    Tower.add(new Instr(Prim.LINE, new Line2D.Double(10,0,35,0)));
+		p = new Path2D.Double(); p.moveTo(-25.0,0.0); p.lineTo(-20.0,-70.0); p.lineTo(20.0,-70.0); p.lineTo(25.0,0.0);
+		Tower.add(new Instr(Prim.PLIN, p));
+	}
 	public static final ArrayList<Instr> WithyPort = new ArrayList<Instr>();
+	static {
+		WithyPort.add(new Instr(Prim.STRK, new BasicStroke(4.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND)));
+		WithyPort.add(new Instr(Prim.FILL, Color.black));
+		WithyPort.add(new Instr(Prim.LINE, new Line2D.Double(-10,0,10,0)));
+		WithyPort.add(new Instr(Prim.LINE, new Line2D.Double(0,0,0,-70)));
+		WithyPort.add(new Instr(Prim.LINE, new Line2D.Double(20,-60,0,-50)));
+		WithyPort.add(new Instr(Prim.LINE, new Line2D.Double(-20,-60,0,-50)));
+		WithyPort.add(new Instr(Prim.LINE, new Line2D.Double(30,-35,0,-21)));
+		WithyPort.add(new Instr(Prim.LINE, new Line2D.Double(-30,-35,0,-21)));
+	}
 	public static final ArrayList<Instr> WithyStarboard = new ArrayList<Instr>();
-
+	static {
+		WithyStarboard.add(new Instr(Prim.STRK, new BasicStroke(4.0f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_ROUND)));
+		WithyStarboard.add(new Instr(Prim.FILL, Color.black));
+		WithyStarboard.add(new Instr(Prim.LINE, new Line2D.Double(-10,0,10,0)));
+		WithyStarboard.add(new Instr(Prim.LINE, new Line2D.Double(0,0,0,-70)));
+		WithyStarboard.add(new Instr(Prim.LINE, new Line2D.Double(20,-50,0,-60)));
+		WithyStarboard.add(new Instr(Prim.LINE, new Line2D.Double(-20,-50,0,-60)));
+		WithyStarboard.add(new Instr(Prim.LINE, new Line2D.Double(30,-21,0,-35)));
+		WithyStarboard.add(new Instr(Prim.LINE, new Line2D.Double(-30,-21,0,-35)));
+	}
 }
Index: /applications/editors/josm/plugins/smed2/src/symbols/Buoys.java
===================================================================
--- /applications/editors/josm/plugins/smed2/src/symbols/Buoys.java	(revision 29108)
+++ /applications/editors/josm/plugins/smed2/src/symbols/Buoys.java	(revision 29109)
@@ -36,5 +36,4 @@
     Barrel.add(new Instr(Prim.PLIN, p));
 	}
-
 	public static final ArrayList<Instr> Can = new ArrayList<Instr>();
 	static {
@@ -63,5 +62,4 @@
     Can.add(new Instr(Prim.PLIN, p));
 	}
-	
 	public static final ArrayList<Instr> Cone = new ArrayList<Instr>();
 	static {
@@ -90,5 +88,4 @@
     Cone.add(new Instr(Prim.PLIN, p));
 	}
-	
 	public static final ArrayList<Instr> Float = new ArrayList<Instr>();
 	static {
@@ -122,5 +119,4 @@
     Float.add(new Instr(Prim.PLIN, p));
 	}
-	
 	public static final ArrayList<Instr> Ice = new ArrayList<Instr>();
 	static {
@@ -140,5 +136,4 @@
 		Ice.add(new Instr(Prim.PLIN, p));
 	}
-
 	public static final ArrayList<Instr> Pillar = new ArrayList<Instr>();
 	static {
@@ -168,5 +163,4 @@
 		Pillar.add(new Instr(Prim.PLIN, p));
 	}
-	
 	public static final ArrayList<Instr> Spar = new ArrayList<Instr>();
 	static {
@@ -193,5 +187,4 @@
 		Spar.add(new Instr(Prim.PLIN, p));
 	}
-	
 	public static final ArrayList<Instr> Sphere = new ArrayList<Instr>();
 	static {
@@ -219,5 +212,5 @@
     Sphere.add(new Instr(Prim.EARC, new Arc2D.Double(-26.5,-39.4,60.0,60.0,-18.0,216.0,Arc2D.OPEN)));
 	}
-	
+	public static final ArrayList<Instr> Storage = new ArrayList<Instr>();
 	public static final ArrayList<Instr> Super = new ArrayList<Instr>();
 	static {
Index: /applications/editors/josm/plugins/smed2/src/symbols/Facilities.java
===================================================================
--- /applications/editors/josm/plugins/smed2/src/symbols/Facilities.java	(revision 29108)
+++ /applications/editors/josm/plugins/smed2/src/symbols/Facilities.java	(revision 29109)
@@ -10,5 +10,20 @@
 package symbols;
 
+import java.util.ArrayList;
+
+import symbols.Symbols.Instr;
+
 public class Facilities {
-
+	public static final ArrayList<Instr> Boatlift = new ArrayList<Instr>();//was Crane
+	public static final ArrayList<Instr> Boatyard = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Chandler = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Fuel = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Laundrette = new ArrayList<Instr>();
+	public static final ArrayList<Instr> PumpOut = new ArrayList<Instr>();
+	public static final ArrayList<Instr> SailingClub = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Shower = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Slipway = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Toilet = new ArrayList<Instr>();
+	public static final ArrayList<Instr> VisitorBerth = new ArrayList<Instr>();
+	public static final ArrayList<Instr> VisitorMooring = new ArrayList<Instr>();
 }
Index: /applications/editors/josm/plugins/smed2/src/symbols/Harbours.java
===================================================================
--- /applications/editors/josm/plugins/smed2/src/symbols/Harbours.java	(revision 29108)
+++ /applications/editors/josm/plugins/smed2/src/symbols/Harbours.java	(revision 29109)
@@ -10,5 +10,28 @@
 package symbols;
 
+import java.util.ArrayList;
+
+import symbols.Symbols.Instr;
+
 public class Harbours {
-
+	public static final ArrayList<Instr> AnchorBerth = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Anchorage = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Bollard = new ArrayList<Instr>();
+	public static final ArrayList<Instr> ClearV = new ArrayList<Instr>();
+	public static final ArrayList<Instr> ContainerCrane = new ArrayList<Instr>();
+	public static final ArrayList<Instr> DeviationDolphin = new ArrayList<Instr>();
+	public static final ArrayList<Instr> DistanceI = new ArrayList<Instr>();
+	public static final ArrayList<Instr> DistanceU = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Dolphin = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Harbour = new ArrayList<Instr>();
+	public static final ArrayList<Instr> HarbourMaster = new ArrayList<Instr>();
+	public static final ArrayList<Instr> LandingSteps = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Lock_Gate = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Lock = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Marina = new ArrayList<Instr>();
+	public static final ArrayList<Instr> MarinaNF = new ArrayList<Instr>();
+	public static final ArrayList<Instr> PortCrane = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Post = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Signal_Station = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Tide_Gauge = new ArrayList<Instr>();
 }
Index: /applications/editors/josm/plugins/smed2/src/symbols/Landmarks.java
===================================================================
--- /applications/editors/josm/plugins/smed2/src/symbols/Landmarks.java	(revision 29108)
+++ /applications/editors/josm/plugins/smed2/src/symbols/Landmarks.java	(revision 29109)
@@ -10,5 +10,28 @@
 package symbols;
 
+import java.util.ArrayList;
+
+import symbols.Symbols.Instr;
+
 public class Landmarks {
-
+	public static final ArrayList<Instr> Chimney = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Church = new ArrayList<Instr>();
+	public static final ArrayList<Instr> ChurchTower = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Cross = new ArrayList<Instr>();
+	public static final ArrayList<Instr> DishAerial = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Dome = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Flagstaff = new ArrayList<Instr>();
+	public static final ArrayList<Instr> FlareStack = new ArrayList<Instr>();
+	public static final ArrayList<Instr> LandTower = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Mast = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Minaret = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Monument = new ArrayList<Instr>();
+	public static final ArrayList<Instr> RadioMast = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Platform = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Spire = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Temple = new ArrayList<Instr>();
+	public static final ArrayList<Instr> WaterTower = new ArrayList<Instr>();
+	public static final ArrayList<Instr> WindMotor = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Windmill = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Windsock = new ArrayList<Instr>();
 }
Index: /applications/editors/josm/plugins/smed2/src/symbols/Notices.java
===================================================================
--- /applications/editors/josm/plugins/smed2/src/symbols/Notices.java	(revision 29108)
+++ /applications/editors/josm/plugins/smed2/src/symbols/Notices.java	(revision 29109)
@@ -10,5 +10,81 @@
 package symbols;
 
+import java.util.ArrayList;
+
+import symbols.Symbols.Instr;
+
 public class Notices {
-
+	public static final ArrayList<Instr> Notice = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeA = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeA1 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeA1a = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Notice2 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Notice3 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Notice4 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Notice4_1 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Notice9 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Notice10a = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Notice10b = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeAnchor = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeB = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeB2a = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeB2b = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeB3a = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeB3b = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeB4a = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeB4b = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeB5 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeB7 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeB8 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeBollard = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeC1 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeC2 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeC3 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeC5a = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeC5b = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeCrossing = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeCrossingL = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeCrossingR = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeD1a = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeD1b = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeD2a = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeD2b = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeE = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeE1 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeE2 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeE3 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeE4a = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeE4b = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeE5_4 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeE5_5 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeE5_6 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeE5_7 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeE5_8 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeE5_9 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeE5_10 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeE5_11 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeE5_12 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeE5_13 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeE5_14 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeE5_15 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeE7_1 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Notice11 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Notice13 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Notice14 = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeJunction = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeJunctionL = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeJunctionR = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeMotor = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeP = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeProceed = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeRowboat = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeSailboard = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeSailboat = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeSlipway = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeSpeedboat = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeSport = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeTurn = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeVHF = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeWaterbike = new ArrayList<Instr>();
+	public static final ArrayList<Instr> NoticeWaterski = new ArrayList<Instr>();
 }
Index: /applications/editors/josm/plugins/smed2/src/symbols/Topmarks.java
===================================================================
--- /applications/editors/josm/plugins/smed2/src/symbols/Topmarks.java	(revision 29108)
+++ /applications/editors/josm/plugins/smed2/src/symbols/Topmarks.java	(revision 29109)
@@ -22,5 +22,8 @@
 
 public class Topmarks {
-
+	
+	public static final ArrayList<Instr> FogSignal = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Light = new ArrayList<Instr>();
+	public static final ArrayList<Instr> Radar = new ArrayList<Instr>();
 	public static final ArrayList<Instr> TopBoard = new ArrayList<Instr>();
 	static {