Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/AlternatingButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/AlternatingButton.svg	(revision 26086)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/AlternatingButton.svg	(revision 26087)
@@ -11,11 +11,11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
+   width="40"
    height="16"
    id="svg2"
    version="1.1"
    inkscape:version="0.48.1 r9760"
-   sodipodi:docname="MorseButton.svg"
-   inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/MorseButton.png"
+   sodipodi:docname="AlternatingButton.svg"
+   inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/AlternatingButton.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
@@ -2903,9 +2903,9 @@
      inkscape:showpageshadow="false"
      inkscape:snap-grids="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="786"
+     inkscape:window-width="1920"
+     inkscape:window-height="1088"
      inkscape:window-x="0"
      inkscape:window-y="0"
-     inkscape:window-maximized="1">
+     inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
@@ -2935,7 +2935,7 @@
      style="display:inline">
     <rect
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="rect9640"
-       width="29.249414"
+       width="39.249416"
        height="15.249415"
        x="0.37529233"
@@ -2949,14 +2949,14 @@
        style="fill:#ffffff;fill-opacity:1;stroke:none"
        id="rect4197"
-       width="14"
+       width="18.786421"
        height="6"
-       x="1"
+       x="1.2135795"
        y="1041.3622" />
     <rect
        style="fill:#d40000;fill-opacity:1;stroke:none"
        id="rect4201"
-       width="14"
+       width="18.786421"
        height="6"
-       x="15"
+       x="20"
        y="1041.3622" />
   </g>
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FixedButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FixedButton.svg	(revision 26086)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FixedButton.svg	(revision 26087)
@@ -11,10 +11,10 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
+   width="40"
    height="16"
    id="svg2"
    version="1.1"
    inkscape:version="0.48.1 r9760"
-   sodipodi:docname="NoCharButton.svg"
+   sodipodi:docname="FixedButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OrangeButton.png"
    inkscape:export-xdpi="90"
@@ -2897,5 +2897,5 @@
      inkscape:zoom="22.627416"
      inkscape:cx="16.32572"
-     inkscape:cy="8.0491388"
+     inkscape:cy="7.3505427"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -2935,7 +2935,7 @@
      style="display:inline">
     <rect
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="rect9640"
-       width="29.249414"
+       width="39.249416"
        height="15.249415"
        x="0.37529233"
@@ -2943,5 +2943,5 @@
        rx="5"
        ry="5"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OffButton.png"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/FixedButton.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
@@ -2949,8 +2949,11 @@
        style="fill:#ffffff;fill-opacity:1"
        id="rect4184"
-       width="28"
+       width="37.572842"
        height="6"
-       x="1"
-       y="1041.3622" />
+       x="1.2135795"
+       y="1041.3622"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/FixedButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
   </g>
 </svg>
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FlashButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FlashButton.svg	(revision 26086)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/FlashButton.svg	(revision 26087)
@@ -11,10 +11,10 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
+   width="40"
    height="16"
    id="svg2"
    version="1.1"
    inkscape:version="0.48.1 r9760"
-   sodipodi:docname="FixedButton.svg"
+   sodipodi:docname="FlashButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OrangeButton.png"
    inkscape:export-xdpi="90"
@@ -2903,9 +2903,9 @@
      inkscape:showpageshadow="false"
      inkscape:snap-grids="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="786"
+     inkscape:window-width="1920"
+     inkscape:window-height="1088"
      inkscape:window-x="0"
      inkscape:window-y="0"
-     inkscape:window-maximized="1">
+     inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
@@ -2935,7 +2935,7 @@
      style="display:inline">
     <rect
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="rect9640"
-       width="29.249414"
+       width="39.249416"
        height="15.249415"
        x="0.37529233"
@@ -2943,22 +2943,31 @@
        rx="5"
        ry="5"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OffButton.png"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/FlashButton.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 1,1047.3622 4,0 -1.9780219,-6 z"
+       d="m 1.2135796,1047.3622 5.3675488,0 -2.6542823,-6 z"
        id="path3404"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/FlashButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        inkscape:connector-curvature="0"
        id="path4174"
-       d="m 13,1047.3622 4,0 -1.978022,-6 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+       d="m 17.316226,1047.3622 5.367549,0 -2.654282,-6 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/FlashButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 25,1047.3622 4,0 -1.978022,-6 z"
+       d="m 33.418873,1047.3622 5.367549,0 -2.654283,-6 z"
        id="path4176"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/FlashButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
   </g>
 </svg>
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/InterruptedQuickButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/InterruptedQuickButton.svg	(revision 26086)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/InterruptedQuickButton.svg	(revision 26087)
@@ -11,10 +11,10 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
+   width="40"
    height="16"
    id="svg2"
    version="1.1"
    inkscape:version="0.48.1 r9760"
-   sodipodi:docname="QuickButton.svg"
+   sodipodi:docname="InterruptedQuickButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OrangeButton.png"
    inkscape:export-xdpi="90"
@@ -2903,9 +2903,9 @@
      inkscape:showpageshadow="false"
      inkscape:snap-grids="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="786"
+     inkscape:window-width="1920"
+     inkscape:window-height="1088"
      inkscape:window-x="0"
      inkscape:window-y="0"
-     inkscape:window-maximized="1">
+     inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
@@ -2935,7 +2935,7 @@
      style="display:inline">
     <rect
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="rect9640"
-       width="29.249414"
+       width="39.249416"
        height="15.249415"
        x="0.37529233"
@@ -2943,27 +2943,39 @@
        rx="5"
        ry="5"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OffButton.png"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/InterruptedQuickButton.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 1,1047.3622 4,0 -1.9780219,-6 z"
+       d="m 1.2135796,1047.3622 5.3675488,0 -2.6542823,-6 z"
        id="path3404"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/InterruptedQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 25,1047.3622 4,0 -1.978022,-6 z"
+       d="m 33.418873,1047.3622 5.367549,0 -2.654283,-6 z"
        id="path4176"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/InterruptedQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        inkscape:connector-curvature="0"
        id="path4721"
-       d="m 7,1047.3622 4,0 -1.9780219,-6 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+       d="m 9.2649029,1047.3622 5.3675491,0 -2.654283,-6 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/InterruptedQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 19,1047.3622 4,0 -1.978022,-6 z"
+       d="m 25.367549,1047.3622 5.367549,0 -2.654282,-6 z"
        id="path4723"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/InterruptedQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
   </g>
 </svg>
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/InterruptedUltraQuickButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/InterruptedUltraQuickButton.svg	(revision 26086)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/InterruptedUltraQuickButton.svg	(revision 26087)
@@ -11,10 +11,10 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
+   width="40"
    height="16"
    id="svg2"
    version="1.1"
    inkscape:version="0.48.1 r9760"
-   sodipodi:docname="UltraQuickButton.svg"
+   sodipodi:docname="InterruptedUltraQuickButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/VeryQuickButton.png"
    inkscape:export-xdpi="90"
@@ -2903,9 +2903,9 @@
      inkscape:showpageshadow="false"
      inkscape:snap-grids="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="786"
+     inkscape:window-width="1920"
+     inkscape:window-height="1088"
      inkscape:window-x="0"
      inkscape:window-y="0"
-     inkscape:window-maximized="1">
+     inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
@@ -2935,7 +2935,7 @@
      style="display:inline">
     <rect
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="rect9640"
-       width="29.249414"
+       width="39.249416"
        height="15.249415"
        x="0.37529233"
@@ -2943,47 +2943,71 @@
        rx="5"
        ry="5"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OffButton.png"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/InterruptedUltraQuickButton.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 1,1047.3622 2,0 -0.9890109,-6 z"
+       d="m 1.2135796,1047.3622 2.6837744,0 -1.3271411,-6 z"
        id="path3404"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/InterruptedUltraQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        inkscape:connector-curvature="0"
        id="path4174"
-       d="m 7.5,1047.3622 2,0 -0.989011,-6 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+       d="m 9.9358465,1047.3622 2.6837745,0 -1.327141,-6 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/InterruptedUltraQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        inkscape:connector-curvature="0"
        id="path4721"
-       d="m 4.25,1047.3622 2,0 -0.9890109,-6 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+       d="m 5.574713,1047.3622 2.6837745,0 -1.3271411,-6 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/InterruptedUltraQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 10.75,1047.3622 2,0 -0.989011,-6 z"
+       d="m 14.29698,1047.3622 2.683774,0 -1.327141,-6 z"
        id="path4723"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/InterruptedUltraQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        inkscape:connector-curvature="0"
        id="path4744"
-       d="m 17.25,1047.3622 2,0 -0.989011,-6 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+       d="m 23.019247,1047.3622 2.683774,0 -1.327141,-6 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/InterruptedUltraQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 20.5,1047.3622 2,0 -0.989011,-6 z"
+       d="m 27.38038,1047.3622 2.683775,0 -1.327141,-6 z"
        id="path4746"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/InterruptedUltraQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        inkscape:connector-curvature="0"
        id="path4767"
-       d="m 23.75,1047.3622 2,0 -0.989011,-6 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+       d="m 31.741514,1047.3622 2.683774,0 -1.327141,-6 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/InterruptedUltraQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 27,1047.3622 2,0 -0.989011,-6 z"
+       d="m 36.102647,1047.3622 2.683775,0 -1.327142,-6 z"
        id="path4769"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/InterruptedUltraQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
   </g>
 </svg>
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/InterruptedVeryQuickButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/InterruptedVeryQuickButton.svg	(revision 26086)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/InterruptedVeryQuickButton.svg	(revision 26087)
@@ -11,10 +11,10 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
+   width="40"
    height="16"
    id="svg2"
    version="1.1"
    inkscape:version="0.48.1 r9760"
-   sodipodi:docname="VeryQuickButton.svg"
+   sodipodi:docname="InterruptedVeryQuickButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/QuickButton.png"
    inkscape:export-xdpi="90"
@@ -2903,9 +2903,9 @@
      inkscape:showpageshadow="false"
      inkscape:snap-grids="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="786"
+     inkscape:window-width="1920"
+     inkscape:window-height="1088"
      inkscape:window-x="0"
      inkscape:window-y="0"
-     inkscape:window-maximized="1">
+     inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
@@ -2935,7 +2935,7 @@
      style="display:inline">
     <rect
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="rect9640"
-       width="29.249414"
+       width="39.249416"
        height="15.249415"
        x="0.37529233"
@@ -2943,37 +2943,55 @@
        rx="5"
        ry="5"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OffButton.png"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/InterruptedVeryQuickButton.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 1,1047.3622 3,0 -1.4835164,-6 z"
+       d="m 1.2135796,1047.3622 4.0256616,0 -1.9907117,-6 z"
        id="path3404"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/InterruptedVeryQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        inkscape:connector-curvature="0"
        id="path4174"
-       d="m 9.333,1047.3622 3,0 -1.483516,-6 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+       d="m 12.395526,1047.3622 4.025661,0 -1.990711,-6 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/InterruptedVeryQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 17.667,1047.4064 3,0 -1.483517,-6 z"
+       d="m 23.578814,1047.4064 4.025661,0 -1.990712,-6 z"
        id="path4176"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/InterruptedVeryQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        inkscape:connector-curvature="0"
        id="path4721"
-       d="m 5.167,1047.3622 3,0 -1.4835164,-6 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+       d="m 6.8052236,1047.3622 4.0256614,0 -1.9907114,-6 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/InterruptedVeryQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        inkscape:connector-curvature="0"
        id="path4744"
-       d="m 21.835,1047.3622 3,0 -1.483517,-6 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+       d="m 29.1718,1047.3622 4.025661,0 -1.990712,-6 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/InterruptedVeryQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 26,1047.3622 3,0 -1.483517,-6 z"
+       d="m 34.76076,1047.3622 4.025662,0 -1.990713,-6 z"
        id="path4746"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/InterruptedVeryQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
   </g>
 </svg>
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/IsophasedButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/IsophasedButton.svg	(revision 26086)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/IsophasedButton.svg	(revision 26087)
@@ -11,5 +11,5 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
+   width="40"
    height="16"
    id="svg2"
@@ -2903,9 +2903,9 @@
      inkscape:showpageshadow="false"
      inkscape:snap-grids="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="786"
+     inkscape:window-width="1920"
+     inkscape:window-height="1088"
      inkscape:window-x="0"
      inkscape:window-y="0"
-     inkscape:window-maximized="1">
+     inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
@@ -2935,7 +2935,7 @@
      style="display:inline">
     <rect
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="rect9640"
-       width="29.249414"
+       width="39.249416"
        height="15.249415"
        x="0.37529233"
@@ -2943,5 +2943,5 @@
        rx="5"
        ry="5"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OffButton.png"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/IsophasedButton.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
@@ -2949,22 +2949,31 @@
        style="fill:#ffffff;fill-opacity:1;stroke:none"
        id="rect4197"
-       width="5.5999999"
+       width="7.5145683"
        height="6"
-       x="1"
-       y="1041.3622" />
+       x="1.2135795"
+       y="1041.3622"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/IsophasedButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <rect
        y="1041.3622"
-       x="12.2"
+       x="16.242716"
        height="6"
-       width="5.5999999"
+       width="7.5145683"
        id="rect4199"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/IsophasedButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <rect
        style="fill:#ffffff;fill-opacity:1;stroke:none"
        id="rect4201"
-       width="5.5999999"
+       width="7.5145683"
        height="6"
-       x="23.4"
-       y="1041.3622" />
+       x="31.271852"
+       y="1041.3622"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/IsophasedButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
   </g>
 </svg>
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/LongFlashButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/LongFlashButton.svg	(revision 26086)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/LongFlashButton.svg	(revision 26087)
@@ -11,10 +11,10 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
+   width="40"
    height="16"
    id="svg2"
    version="1.1"
    inkscape:version="0.48.1 r9760"
-   sodipodi:docname="FlashButton.svg"
+   sodipodi:docname="LongFlashButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/FlashButton.png"
    inkscape:export-xdpi="90"
@@ -2903,9 +2903,9 @@
      inkscape:showpageshadow="false"
      inkscape:snap-grids="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="786"
+     inkscape:window-width="1920"
+     inkscape:window-height="1088"
      inkscape:window-x="0"
      inkscape:window-y="0"
-     inkscape:window-maximized="1">
+     inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
@@ -2935,7 +2935,7 @@
      style="display:inline">
     <rect
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="rect9640"
-       width="29.249414"
+       width="39.249416"
        height="15.249415"
        x="0.37529233"
@@ -2943,5 +2943,5 @@
        rx="5"
        ry="5"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OffButton.png"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/LongFlashButton.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
@@ -2949,22 +2949,31 @@
        style="fill:#ffffff;fill-opacity:1;stroke:none"
        id="rect4197"
-       width="4"
+       width="5.3675489"
        height="6"
-       x="1"
-       y="1041.3622" />
+       x="1.2135795"
+       y="1041.3622"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/LongFlashButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <rect
        y="1041.3622"
-       x="13"
+       x="17.316227"
        height="6"
-       width="4"
+       width="5.3675489"
        id="rect4199"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/LongFlashButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <rect
        style="fill:#ffffff;fill-opacity:1;stroke:none"
        id="rect4201"
-       width="4"
+       width="5.3675489"
        height="6"
-       x="25"
-       y="1041.3622" />
+       x="33.418873"
+       y="1041.3622"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/LongFlashButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
   </g>
 </svg>
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/MorseButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/MorseButton.svg	(revision 26086)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/MorseButton.svg	(revision 26087)
@@ -11,10 +11,10 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
+   width="40"
    height="16"
    id="svg2"
    version="1.1"
    inkscape:version="0.48.1 r9760"
-   sodipodi:docname="OccultingButton.svg"
+   sodipodi:docname="MorseButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OccultingButton.png"
    inkscape:export-xdpi="90"
@@ -2903,9 +2903,9 @@
      inkscape:showpageshadow="false"
      inkscape:snap-grids="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="786"
+     inkscape:window-width="1920"
+     inkscape:window-height="1088"
      inkscape:window-x="0"
      inkscape:window-y="0"
-     inkscape:window-maximized="1">
+     inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
@@ -2935,7 +2935,7 @@
      style="display:inline">
     <rect
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="rect9640"
-       width="29.249414"
+       width="39.249416"
        height="15.249415"
        x="0.37529233"
@@ -2943,5 +2943,5 @@
        rx="5"
        ry="5"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OffButton.png"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/MorseButton.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
@@ -2949,29 +2949,41 @@
        style="fill:#ffffff;fill-opacity:1;stroke:none"
        id="rect4197"
-       width="9"
+       width="12.076985"
        height="6"
-       x="1"
-       y="1041.3622" />
+       x="1.2135795"
+       y="1041.3622"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/MorseButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <rect
        y="1041.3622"
-       x="11.333"
+       x="15.079301"
        height="6"
-       width="3"
+       width="4.0256615"
        id="rect4199"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/MorseButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <rect
        style="fill:#ffffff;fill-opacity:1;stroke:none"
        id="rect4201"
-       width="9"
+       width="12.076985"
        height="6"
-       x="20"
-       y="1041.3622" />
+       x="26.709436"
+       y="1041.3622"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/MorseButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <rect
        style="fill:#ffffff;fill-opacity:1;stroke:none"
        id="rect4260"
-       width="3"
+       width="4.0256615"
        height="6"
-       x="15.667"
-       y="1041.3622" />
+       x="20.895039"
+       y="1041.3622"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/MorseButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
   </g>
 </svg>
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/NoCharButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/NoCharButton.svg	(revision 26086)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/NoCharButton.svg	(revision 26087)
@@ -11,11 +11,11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
+   width="40"
    height="16"
    id="svg2"
    version="1.1"
    inkscape:version="0.48.1 r9760"
-   sodipodi:docname="OffButton.svg"
-   inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OrangeButton.png"
+   sodipodi:docname="NoCharButton.svg"
+   inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/NoCharButton.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
@@ -2896,5 +2896,5 @@
      inkscape:pageshadow="2"
      inkscape:zoom="22.627416"
-     inkscape:cx="16.32572"
+     inkscape:cx="15.530225"
      inkscape:cy="8.0491388"
      inkscape:document-units="px"
@@ -2903,6 +2903,6 @@
      inkscape:showpageshadow="false"
      inkscape:snap-grids="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="786"
+     inkscape:window-width="1920"
+     inkscape:window-height="1088"
      inkscape:window-x="0"
      inkscape:window-y="0"
@@ -2935,7 +2935,7 @@
      style="display:inline">
     <rect
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="rect9640"
-       width="29.249414"
+       width="39.249416"
        height="15.249415"
        x="0.37529233"
@@ -2949,12 +2949,12 @@
        xml:space="preserve"
        style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans Bold"
-       x="11.092738"
-       y="1047.6777"
+       x="16.219263"
+       y="1047.7661"
        id="text13697"
        sodipodi:linespacing="125%"><tspan
          sodipodi:role="line"
          id="tspan13699"
-         x="11.092738"
-         y="1047.6777">x</tspan></text>
+         x="16.219263"
+         y="1047.7661">x</tspan></text>
   </g>
 </svg>
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/OccultingButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/OccultingButton.svg	(revision 26086)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/OccultingButton.svg	(revision 26087)
@@ -11,10 +11,10 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
+   width="40"
    height="16"
    id="svg2"
    version="1.1"
    inkscape:version="0.48.1 r9760"
-   sodipodi:docname="IsophasedButton.svg"
+   sodipodi:docname="OccultingButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/IsophasedButton.png"
    inkscape:export-xdpi="90"
@@ -2903,9 +2903,9 @@
      inkscape:showpageshadow="false"
      inkscape:snap-grids="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="786"
+     inkscape:window-width="1920"
+     inkscape:window-height="1088"
      inkscape:window-x="0"
      inkscape:window-y="0"
-     inkscape:window-maximized="1">
+     inkscape:window-maximized="0">
     <inkscape:grid
        type="xygrid"
@@ -2935,7 +2935,7 @@
      style="display:inline">
     <rect
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="rect9640"
-       width="29.249414"
+       width="39.249416"
        height="15.249415"
        x="0.37529233"
@@ -2943,5 +2943,5 @@
        rx="5"
        ry="5"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OffButton.png"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OccultingButton.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
@@ -2949,22 +2949,31 @@
        style="fill:#ffffff;fill-opacity:1;stroke:none"
        id="rect4197"
-       width="8"
+       width="10.735098"
        height="6"
-       x="1"
-       y="1041.3622" />
+       x="1.2135795"
+       y="1041.3622"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OccultingButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <rect
        y="1041.3622"
-       x="11"
+       x="14.632452"
        height="6"
-       width="8"
+       width="10.735098"
        id="rect4199"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OccultingButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <rect
        style="fill:#ffffff;fill-opacity:1;stroke:none"
        id="rect4201"
-       width="8"
+       width="10.735098"
        height="6"
-       x="21"
-       y="1041.3622" />
+       x="28.051325"
+       y="1041.3622"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OccultingButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
   </g>
 </svg>
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/QuickButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/QuickButton.svg	(revision 26086)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/QuickButton.svg	(revision 26087)
@@ -11,10 +11,10 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
+   width="40"
    height="16"
    id="svg2"
    version="1.1"
    inkscape:version="0.48.1 r9760"
-   sodipodi:docname="FlashButton.svg"
+   sodipodi:docname="QuickButton.svg"
    inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OrangeButton.png"
    inkscape:export-xdpi="90"
@@ -2903,6 +2903,6 @@
      inkscape:showpageshadow="false"
      inkscape:snap-grids="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="786"
+     inkscape:window-width="1920"
+     inkscape:window-height="1088"
      inkscape:window-x="0"
      inkscape:window-y="0"
@@ -2935,7 +2935,7 @@
      style="display:inline">
     <rect
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="rect9640"
-       width="29.249414"
+       width="39.249416"
        height="15.249415"
        x="0.37529233"
@@ -2943,32 +2943,47 @@
        rx="5"
        ry="5"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OffButton.png"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/QuickButton.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 1,1047.3622 4,0 -1.9780219,-6 z"
+       d="m 1.2135796,1047.3622 5.3675488,0 -2.6542823,-6 z"
        id="path3404"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/QuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        inkscape:connector-curvature="0"
        id="path4174"
-       d="m 13,1047.3622 4,0 -1.978022,-6 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+       d="m 17.316226,1047.3622 5.367549,0 -2.654282,-6 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/QuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 25,1047.3622 4,0 -1.978022,-6 z"
+       d="m 33.418873,1047.3622 5.367549,0 -2.654283,-6 z"
        id="path4176"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/QuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        inkscape:connector-curvature="0"
        id="path4721"
-       d="m 7,1047.3622 4,0 -1.9780219,-6 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+       d="m 9.2649029,1047.3622 5.3675491,0 -2.654283,-6 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/QuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 19,1047.3622 4,0 -1.978022,-6 z"
+       d="m 25.367549,1047.3622 5.367549,0 -2.654282,-6 z"
        id="path4723"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/QuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
   </g>
 </svg>
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/UltraQuickButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/UltraQuickButton.svg	(revision 26086)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/UltraQuickButton.svg	(revision 26087)
@@ -11,11 +11,11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
+   width="40"
    height="16"
    id="svg2"
    version="1.1"
    inkscape:version="0.48.1 r9760"
-   sodipodi:docname="VeryQuickButton.svg"
-   inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/VeryQuickButton.png"
+   sodipodi:docname="UltraQuickButton.svg"
+   inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/UltraQuickButton.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
@@ -2903,6 +2903,6 @@
      inkscape:showpageshadow="false"
      inkscape:snap-grids="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="786"
+     inkscape:window-width="1920"
+     inkscape:window-height="1088"
      inkscape:window-x="0"
      inkscape:window-y="0"
@@ -2935,7 +2935,7 @@
      style="display:inline">
     <rect
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="rect9640"
-       width="29.249414"
+       width="39.249416"
        height="15.249415"
        x="0.37529233"
@@ -2943,52 +2943,79 @@
        rx="5"
        ry="5"
-       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/OffButton.png"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/UltraQuickButton.png"
        inkscape:export-xdpi="90"
        inkscape:export-ydpi="90" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 1,1047.3622 2,0 -0.9890109,-6 z"
+       d="m 1.2135796,1047.3622 2.6837744,0 -1.3271411,-6 z"
        id="path3404"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/UltraQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        inkscape:connector-curvature="0"
        id="path4174"
-       d="m 7.5,1047.3622 2,0 -0.989011,-6 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+       d="m 9.9358465,1047.3622 2.6837745,0 -1.327141,-6 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/UltraQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 14,1047.3622 2,0 -0.989011,-6 z"
+       d="m 18.658113,1047.3622 2.683775,0 -1.327141,-6 z"
        id="path4176"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/UltraQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        inkscape:connector-curvature="0"
        id="path4721"
-       d="m 4.25,1047.3622 2,0 -0.9890109,-6 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+       d="m 5.574713,1047.3622 2.6837745,0 -1.3271411,-6 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/UltraQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 10.75,1047.3622 2,0 -0.989011,-6 z"
+       d="m 14.29698,1047.3622 2.683774,0 -1.327141,-6 z"
        id="path4723"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/UltraQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        inkscape:connector-curvature="0"
        id="path4744"
-       d="m 17.25,1047.3622 2,0 -0.989011,-6 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+       d="m 23.019247,1047.3622 2.683774,0 -1.327141,-6 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/UltraQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 20.5,1047.3622 2,0 -0.989011,-6 z"
+       d="m 27.38038,1047.3622 2.683775,0 -1.327141,-6 z"
        id="path4746"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/UltraQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        inkscape:connector-curvature="0"
        id="path4767"
-       d="m 23.75,1047.3622 2,0 -0.989011,-6 z"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
+       d="m 31.741514,1047.3622 2.683774,0 -1.327141,-6 z"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/UltraQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 27,1047.3622 2,0 -0.989011,-6 z"
+       d="m 36.102647,1047.3622 2.683775,0 -1.327142,-6 z"
        id="path4769"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/UltraQuickButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
   </g>
 </svg>
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/VeryQuickButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/VeryQuickButton.svg	(revision 26086)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/VeryQuickButton.svg	(revision 26087)
@@ -11,11 +11,11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="30"
+   width="40"
    height="16"
    id="svg2"
    version="1.1"
    inkscape:version="0.48.1 r9760"
-   sodipodi:docname="QuickButton.svg"
-   inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/QuickButton.png"
+   sodipodi:docname="VeryQuickButton.svg"
+   inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/VeryQuickButton.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90"
@@ -2903,6 +2903,6 @@
      inkscape:showpageshadow="false"
      inkscape:snap-grids="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="786"
+     inkscape:window-width="1920"
+     inkscape:window-height="1088"
      inkscape:window-x="0"
      inkscape:window-y="0"
@@ -2935,7 +2935,7 @@
      style="display:inline">
     <rect
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466000000001;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.75058466;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="rect9640"
-       width="29.249414"
+       width="39.249416"
        height="15.249415"
        x="0.37529233"
@@ -2948,5 +2948,5 @@
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 1,1047.3622 3,0 -1.4835164,-6 z"
+       d="m 1.2135796,1047.3622 4.0256616,0 -1.9907117,-6 z"
        id="path3404"
        inkscape:connector-curvature="0" />
@@ -2954,9 +2954,9 @@
        inkscape:connector-curvature="0"
        id="path4174"
-       d="m 9.333,1047.3622 3,0 -1.483516,-6 z"
+       d="m 12.395526,1047.3622 4.025661,0 -1.990711,-6 z"
        style="fill:#ffffff;fill-opacity:1;stroke:none" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 17.667,1047.4064 3,0 -1.483517,-6 z"
+       d="m 23.578814,1047.4064 4.025661,0 -1.990712,-6 z"
        id="path4176"
        inkscape:connector-curvature="0" />
@@ -2964,9 +2964,9 @@
        inkscape:connector-curvature="0"
        id="path4721"
-       d="m 5.167,1047.3622 3,0 -1.4835164,-6 z"
+       d="m 6.8052236,1047.3622 4.0256614,0 -1.9907114,-6 z"
        style="fill:#ffffff;fill-opacity:1;stroke:none" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 13.5,1047.3622 3,0 -1.483517,-6 z"
+       d="m 17.98717,1047.3622 4.025661,0 -1.990712,-6 z"
        id="path4723"
        inkscape:connector-curvature="0" />
@@ -2974,9 +2974,9 @@
        inkscape:connector-curvature="0"
        id="path4744"
-       d="m 21.835,1047.3622 3,0 -1.483517,-6 z"
+       d="m 29.1718,1047.3622 4.025661,0 -1.990712,-6 z"
        style="fill:#ffffff;fill-opacity:1;stroke:none" />
     <path
        style="fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 26,1047.3622 3,0 -1.483517,-6 z"
+       d="m 34.76076,1047.3622 4.025662,0 -1.990713,-6 z"
        id="path4746"
        inkscape:connector-curvature="0" />
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChr.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChr.java	(revision 26086)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChr.java	(revision 26087)
@@ -11,14 +11,23 @@
 import javax.swing.ImageIcon;
 import javax.swing.JToggleButton;
+import javax.swing.JLabel;
+import javax.swing.JTextField;
+import javax.swing.SwingConstants;
 
 import java.util.EnumMap;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
 
 import oseam.dialogs.OSeaMAction;
 import oseam.seamarks.SeaMark.Chr;
-import oseam.seamarks.SeaMark.Ent;
+import oseam.seamarks.SeaMark;
 
 public class PanelChr	 extends JPanel {
+//System.out.println(map);
 
 	private OSeaMAction dlg;
+	public JLabel charLabel = new JLabel();
+	public JTextField charBox = new JTextField();
 	public JToggleButton noneButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/NoCharButton.png")));
 	public JToggleButton fixedButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/FixedButton.png")));
@@ -35,13 +44,59 @@
 	public JToggleButton morseButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/MorseButton.png")));
 	public JToggleButton alternatingButton = new JToggleButton(new ImageIcon(getClass().getResource("/images/AlternatingButton.png")));
-	private EnumMap<Chr, JToggleButton> characters = new EnumMap<Chr, JToggleButton>(Chr.class);
-	private ActionListener alCharacter = new ActionListener() {
+	private EnumMap<Chr, JToggleButton> buttons = new EnumMap<Chr, JToggleButton>(Chr.class);
+	private ActionListener alCharButton = new ActionListener() {
 		public void actionPerformed(java.awt.event.ActionEvent e) {
-			for (Chr chr : characters.keySet()) {
-				JToggleButton button = characters.get(chr);
+			JToggleButton source = (JToggleButton)e.getSource();
+			EnumSet<Chr> combo = EnumSet.noneOf(Chr.class);
+			for (Chr chr : buttons.keySet()) {
+				JToggleButton button = buttons.get(chr);
 				if (button.isSelected()) {
+					combo.add(chr);
 					button.setBorderPainted(true);
-				} else
+				} else {
+					combo.remove(chr);
 					button.setBorderPainted(false);
+				}
+			}
+			charBox.setText("");
+			for (EnumSet<Chr> map : SeaMark.ChrMAP.keySet()) {
+				if (map.equals(combo)) {
+					charBox.setText(SeaMark.ChrMAP.get(map));
+				}
+			}
+			if (charBox.getText().isEmpty()) {
+				for (Chr chr : buttons.keySet()) {
+					JToggleButton button = buttons.get(chr);
+					if (button == source) {
+						charBox.setText(SeaMark.ChrMAP.get(EnumSet.of(chr)));
+						button.setSelected(true);
+						button.setBorderPainted(true);
+					} else {
+						button.setSelected(false);
+						button.setBorderPainted(false);
+					}
+				}
+			}
+		}
+	};
+	private ActionListener alCharBox = new ActionListener() {
+		public void actionPerformed(java.awt.event.ActionEvent e) {
+			String str = charBox.getText();
+			EnumSet<Chr> set = EnumSet.noneOf(Chr.class);
+			for (EnumSet<Chr> map : SeaMark.ChrMAP.keySet()) {
+				if (str.equals(SeaMark.ChrMAP.get(map))) {
+					set = map;
+					break;
+				}
+			}
+			for (Chr chr : buttons.keySet()) {
+				JToggleButton button = buttons.get(chr);
+				if (set.contains(chr)) {
+					button.setSelected(true);
+					button.setBorderPainted(true);
+				} else {
+					button.setSelected(false);
+					button.setBorderPainted(false);
+				}
 			}
 		}
@@ -51,23 +106,31 @@
 		dlg = dia;
 		this.setLayout(null);
-		this.add(getChrButton(noneButton, 0, 0, 34, 16, "No character", Chr.UNKNOWN), null);
-		this.add(getChrButton(fixedButton, 0, 16, 34, 16, "F. Fixed", Chr.FIXED), null);
-		this.add(getChrButton(flashButton, 0, 32, 34, 16, "Fl. Flashing", Chr.FLASH), null);
-		this.add(getChrButton(longFlashButton, 0, 48, 34, 16, "LFl. Long flash", Chr.LONGFLASH), null);
-		this.add(getChrButton(quickButton, 0, 64, 34, 16, "Q. Quick flashing", Chr.QUICK), null);
-		this.add(getChrButton(veryQuickButton, 0, 80, 34, 16, "VQ. Very quick flashing", Chr.VERYQUICK), null);
-		this.add(getChrButton(ultraQuickButton, 0, 96, 34, 16, "UQ. Ultra quick flashing", Chr.ULTRAQUICK), null);
-		this.add(getChrButton(alternatingButton, 34, 0, 34, 16, "Al. Alternating", Chr.ALTERNATING), null);
-		this.add(getChrButton(isophasedButton, 34, 16, 34, 16, "Iso. Isophased flashing", Chr.ISOPHASED), null);
-		this.add(getChrButton(occultingButton, 34, 32, 34, 16, "Oc. Occulting flash", Chr.OCCULTING), null);
-		this.add(getChrButton(morseButton, 34, 48, 34, 16, "Mo. Morse", Chr.MORSE), null);
-		this.add(getChrButton(interruptedQuickButton, 34, 64, 34, 16, "IQ. Interrupted quick flashing", Chr.INTERRUPTEDQUICK), null);
-		this.add(getChrButton(interruptedVeryQuickButton, 34, 80, 34, 16, "IVQ. Interrupted very quick flashing", Chr.INTERRUPTEDVERYQUICK), null);
-		this.add(getChrButton(interruptedUltraQuickButton, 34, 96, 34, 16, "IUQ. Interrupted ultra quick flashing", Chr.INTERRUPTEDULTRAQUICK), null);
+		this.add(getChrButton(noneButton, 0, 0, 44, 16, "No character", Chr.UNKNOWN), null);
+		this.add(getChrButton(fixedButton, 0, 16, 44, 16, "F: Fixed", Chr.FIXED), null);
+		this.add(getChrButton(flashButton, 0, 32, 44, 16, "Fl: Flashing", Chr.FLASH), null);
+		this.add(getChrButton(longFlashButton, 0, 48, 44, 16, "LFl: Long flash", Chr.LONGFLASH), null);
+		this.add(getChrButton(quickButton, 0, 64, 44, 16, "Q: Quick flashing", Chr.QUICK), null);
+		this.add(getChrButton(veryQuickButton, 0, 80, 44, 16, "VQ: Very quick flashing", Chr.VERYQUICK), null);
+		this.add(getChrButton(ultraQuickButton, 0, 96, 44, 16, "UQ: Ultra quick flashing", Chr.ULTRAQUICK), null);
+		this.add(getChrButton(alternatingButton, 44, 0, 44, 16, "Al: Alternating", Chr.ALTERNATING), null);
+		this.add(getChrButton(isophasedButton, 44, 16, 44, 16, "Iso: Isophased flashing", Chr.ISOPHASED), null);
+		this.add(getChrButton(occultingButton, 44, 32, 44, 16, "Oc: Occulting flash", Chr.OCCULTING), null);
+		this.add(getChrButton(morseButton, 44, 48, 44, 16, "Mo: Morse", Chr.MORSE), null);
+		this.add(getChrButton(interruptedQuickButton, 44, 64, 44, 16, "IQ: Interrupted quick flashing", Chr.INTERRUPTEDQUICK), null);
+		this.add(getChrButton(interruptedVeryQuickButton, 44, 80, 44, 16, "IVQ: Interrupted very quick flashing", Chr.INTERRUPTEDVERYQUICK), null);
+		this.add(getChrButton(interruptedUltraQuickButton, 44, 96, 44, 16, "IUQ: Interrupted ultra quick flashing", Chr.INTERRUPTEDULTRAQUICK), null);
+		charLabel.setBounds(new Rectangle(0, 113, 88, 20));
+		charLabel.setHorizontalAlignment(SwingConstants.CENTER);
+		charLabel.setText("Character");
+		this.add(charLabel, null);
+		charBox.setBounds(new Rectangle(20, 135, 50, 20));
+		charBox.setHorizontalAlignment(SwingConstants.CENTER);
+		this.add(charBox, null);
+		charBox.addActionListener(alCharBox);
 	}
 
 	public void clearSelections() {
-		for (Chr chr : characters.keySet()) {
-			JToggleButton button = characters.get(chr);
+		for (Chr chr : buttons.keySet()) {
+			JToggleButton button = buttons.get(chr);
 			button.setSelected(false);
 		}
@@ -76,5 +139,5 @@
 
 	public void enableAll(boolean state) {
-		for (JToggleButton button : characters.values()) {
+		for (JToggleButton button : buttons.values()) {
 			button.setEnabled(state);
 		}
@@ -84,7 +147,8 @@
 		button.setBounds(new Rectangle(x, y, w, h));
 		button.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
+		button.setBorderPainted(false);
 		button.setToolTipText(tr(tip));
-		button.addActionListener(alCharacter);
-		characters.put(chr, button);
+		button.addActionListener(alCharButton);
+		buttons.put(chr, button);
 		return button;
 	}
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java	(revision 26086)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLit.java	(revision 26087)
@@ -16,12 +16,12 @@
 	public PanelLit(OSeaMAction dia) {
 		dlg = dia;
+		panelChr = new PanelChr(dlg);
+		panelChr.setBounds(new Rectangle(0, 0, 88, 160));
 		panelCol = new PanelCol(dlg, Ent.LIGHT);
-		panelCol.setBounds(new Rectangle(0, 0, 34, 160));
+		panelCol.setBounds(new Rectangle(88, 0, 34, 160));
 		panelCol.blackButton.setVisible(false);
-		panelChr = new PanelChr(dlg);
-		panelChr.setBounds(new Rectangle(36, 0, 68, 160));
 		this.setLayout(null);
+		this.add(panelChr, null);
 		this.add(panelCol, null);
-		this.add(panelChr, 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 26086)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java	(revision 26087)
@@ -4,5 +4,7 @@
 
 import java.util.EnumMap;
+import java.util.EnumSet;
 import java.util.Map;
+import java.util.HashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -51,25 +53,25 @@
 	}
 
-	public static final EnumMap<Obj, String> objects = new EnumMap<Obj, String>(Obj.class);
+	public static final EnumMap<Obj, String> ObjMAP = new EnumMap<Obj, String>(Obj.class);
 	static {
-		objects.put(Obj.UNKNOWN, "");
-		objects.put(Obj.BCNCAR, "beacon_cardinal");
-		objects.put(Obj.BCNISD, "beacon_isolated_danger");
-		objects.put(Obj.BCNLAT, "beacon_lateral");
-		objects.put(Obj.BCNSAW, "beacon_safe_water");
-		objects.put(Obj.BCNSPP, "beacon_special_purpose");
-		objects.put(Obj.BOYCAR, "buoy_cardinal");
-		objects.put(Obj.BOYISD, "buoy_isolated_danger");
-		objects.put(Obj.BOYLAT, "buoy_lateral");
-		objects.put(Obj.BOYSAW, "buoy_safe_water");
-		objects.put(Obj.BOYSPP, "buoy_special_purpose");
-		objects.put(Obj.LITMAJ, "light_major");
-		objects.put(Obj.LITMIN, "light_minor");
-		objects.put(Obj.LITFLT, "light_float");
-		objects.put(Obj.LITVES, "light_vessel");
-		objects.put(Obj.LNDMRK, "landmark");
-		objects.put(Obj.MORFAC, "mooring");
-		objects.put(Obj.SIGSTA, "signal_station_warning");
-		objects.put(Obj.SIGSTA, "signal_station_traffic");
+		ObjMAP.put(Obj.UNKNOWN, "");
+		ObjMAP.put(Obj.BCNCAR, "beacon_cardinal");
+		ObjMAP.put(Obj.BCNISD, "beacon_isolated_danger");
+		ObjMAP.put(Obj.BCNLAT, "beacon_lateral");
+		ObjMAP.put(Obj.BCNSAW, "beacon_safe_water");
+		ObjMAP.put(Obj.BCNSPP, "beacon_special_purpose");
+		ObjMAP.put(Obj.BOYCAR, "buoy_cardinal");
+		ObjMAP.put(Obj.BOYISD, "buoy_isolated_danger");
+		ObjMAP.put(Obj.BOYLAT, "buoy_lateral");
+		ObjMAP.put(Obj.BOYSAW, "buoy_safe_water");
+		ObjMAP.put(Obj.BOYSPP, "buoy_special_purpose");
+		ObjMAP.put(Obj.LITMAJ, "light_major");
+		ObjMAP.put(Obj.LITMIN, "light_minor");
+		ObjMAP.put(Obj.LITFLT, "light_float");
+		ObjMAP.put(Obj.LITVES, "light_vessel");
+		ObjMAP.put(Obj.LNDMRK, "landmark");
+		ObjMAP.put(Obj.MORFAC, "mooring");
+		ObjMAP.put(Obj.SIGSTA, "signal_station_warning");
+		ObjMAP.put(Obj.SIGSTA, "signal_station_traffic");
 	}
 
@@ -88,23 +90,23 @@
 	}
 
-	public static final EnumMap<Obj, Ent> entities = new EnumMap<Obj, Ent>(Obj.class);
+	public static final EnumMap<Obj, Ent> EntMAP = new EnumMap<Obj, Ent>(Obj.class);
 	static {
-		entities.put(Obj.BCNCAR, Ent.BEACON);
-		entities.put(Obj.BCNISD, Ent.BEACON);
-		entities.put(Obj.BCNLAT, Ent.BEACON);
-		entities.put(Obj.BCNSAW, Ent.BEACON);
-		entities.put(Obj.BCNSPP, Ent.BEACON);
-		entities.put(Obj.BOYCAR, Ent.BUOY);
-		entities.put(Obj.BOYISD, Ent.BUOY);
-		entities.put(Obj.BOYLAT, Ent.BUOY);
-		entities.put(Obj.BOYSAW, Ent.BUOY);
-		entities.put(Obj.BOYSPP, Ent.BUOY);
-		entities.put(Obj.LITMAJ, Ent.LIGHT);
-		entities.put(Obj.LITMIN, Ent.LIGHT);
-		entities.put(Obj.LITFLT, Ent.FLOAT);
-		entities.put(Obj.LITVES, Ent.LIGHT);
-		entities.put(Obj.LNDMRK, Ent.LIGHT);
-		entities.put(Obj.MORFAC, Ent.MOORING);
-		entities.put(Obj.SIGSTA, Ent.STATION);
+		EntMAP.put(Obj.BCNCAR, Ent.BEACON);
+		EntMAP.put(Obj.BCNISD, Ent.BEACON);
+		EntMAP.put(Obj.BCNLAT, Ent.BEACON);
+		EntMAP.put(Obj.BCNSAW, Ent.BEACON);
+		EntMAP.put(Obj.BCNSPP, Ent.BEACON);
+		EntMAP.put(Obj.BOYCAR, Ent.BUOY);
+		EntMAP.put(Obj.BOYISD, Ent.BUOY);
+		EntMAP.put(Obj.BOYLAT, Ent.BUOY);
+		EntMAP.put(Obj.BOYSAW, Ent.BUOY);
+		EntMAP.put(Obj.BOYSPP, Ent.BUOY);
+		EntMAP.put(Obj.LITMAJ, Ent.LIGHT);
+		EntMAP.put(Obj.LITMIN, Ent.LIGHT);
+		EntMAP.put(Obj.LITFLT, Ent.FLOAT);
+		EntMAP.put(Obj.LITVES, Ent.LIGHT);
+		EntMAP.put(Obj.LNDMRK, Ent.LIGHT);
+		EntMAP.put(Obj.MORFAC, Ent.MOORING);
+		EntMAP.put(Obj.SIGSTA, Ent.STATION);
 	}
 
@@ -113,23 +115,23 @@
 	}
 
-	public static final EnumMap<Obj, Grp> groups = new EnumMap<Obj, Grp>(Obj.class);
+	public static final EnumMap<Obj, Grp> GrpMAP = new EnumMap<Obj, Grp>(Obj.class);
 	static {
-		groups.put(Obj.BCNCAR, Grp.CAR);
-		groups.put(Obj.BCNISD, Grp.ISD);
-		groups.put(Obj.BCNLAT, Grp.LAT);
-		groups.put(Obj.BCNSAW, Grp.SAW);
-		groups.put(Obj.BCNSPP, Grp.SPP);
-		groups.put(Obj.BOYCAR, Grp.CAR);
-		groups.put(Obj.BOYISD, Grp.ISD);
-		groups.put(Obj.BOYLAT, Grp.LAT);
-		groups.put(Obj.BOYSAW, Grp.SAW);
-		groups.put(Obj.BOYSPP, Grp.SPP);
-		groups.put(Obj.LITMAJ, Grp.LIT);
-		groups.put(Obj.LITMIN, Grp.LIT);
-		groups.put(Obj.LITFLT, Grp.FLT);
-		groups.put(Obj.LITVES, Grp.LIT);
-		groups.put(Obj.LNDMRK, Grp.LIT);
-		groups.put(Obj.MORFAC, Grp.SPP);
-		groups.put(Obj.SIGSTA, Grp.SIS);
+		GrpMAP.put(Obj.BCNCAR, Grp.CAR);
+		GrpMAP.put(Obj.BCNISD, Grp.ISD);
+		GrpMAP.put(Obj.BCNLAT, Grp.LAT);
+		GrpMAP.put(Obj.BCNSAW, Grp.SAW);
+		GrpMAP.put(Obj.BCNSPP, Grp.SPP);
+		GrpMAP.put(Obj.BOYCAR, Grp.CAR);
+		GrpMAP.put(Obj.BOYISD, Grp.ISD);
+		GrpMAP.put(Obj.BOYLAT, Grp.LAT);
+		GrpMAP.put(Obj.BOYSAW, Grp.SAW);
+		GrpMAP.put(Obj.BOYSPP, Grp.SPP);
+		GrpMAP.put(Obj.LITMAJ, Grp.LIT);
+		GrpMAP.put(Obj.LITMIN, Grp.LIT);
+		GrpMAP.put(Obj.LITFLT, Grp.FLT);
+		GrpMAP.put(Obj.LITVES, Grp.LIT);
+		GrpMAP.put(Obj.LNDMRK, Grp.LIT);
+		GrpMAP.put(Obj.MORFAC, Grp.SPP);
+		GrpMAP.put(Obj.SIGSTA, Grp.SIS);
 	}
 
@@ -138,16 +140,16 @@
 	}
 
-	public static final EnumMap<Cat, String> categories = new EnumMap<Cat, String>(Cat.class);
+	public static final EnumMap<Cat, String> CatMAP = new EnumMap<Cat, String>(Cat.class);
 	static {
-		categories.put(Cat.UNKNOWN, "");
-		categories.put(Cat.LAT_PORT, "port");
-		categories.put(Cat.LAT_STBD, "starboard");
-		categories.put(Cat.LAT_PREF_PORT, "preferred_channel_port");
-		categories.put(Cat.LAT_PREF_STBD, "preferred_channel_starboard");
-		categories.put(Cat.CARD_NORTH, "north");
-		categories.put(Cat.CARD_EAST, "east");
-		categories.put(Cat.CARD_SOUTH, "south");
-		categories.put(Cat.CARD_WEST, "west");
-		categories.put(Cat.MOORING_BUOY, "mooring_buoy");
+		CatMAP.put(Cat.UNKNOWN, "");
+		CatMAP.put(Cat.LAT_PORT, "port");
+		CatMAP.put(Cat.LAT_STBD, "starboard");
+		CatMAP.put(Cat.LAT_PREF_PORT, "preferred_channel_port");
+		CatMAP.put(Cat.LAT_PREF_STBD, "preferred_channel_starboard");
+		CatMAP.put(Cat.CARD_NORTH, "north");
+		CatMAP.put(Cat.CARD_EAST, "east");
+		CatMAP.put(Cat.CARD_SOUTH, "south");
+		CatMAP.put(Cat.CARD_WEST, "west");
+		CatMAP.put(Cat.MOORING_BUOY, "mooring_buoy");
 	}
 
@@ -166,19 +168,19 @@
 	}
 
-	public static final EnumMap<Shp, String> shapes = new EnumMap<Shp, String>(Shp.class);
+	public static final EnumMap<Shp, String> ShpMAP = new EnumMap<Shp, String>(Shp.class);
 	static {
-		shapes.put(Shp.UNKNOWN, "");
-		shapes.put(Shp.PILLAR, "pillar");
-		shapes.put(Shp.SPAR, "spar");
-		shapes.put(Shp.CAN, "can");
-		shapes.put(Shp.CONE, "conical");
-		shapes.put(Shp.SPHERE, "sphere");
-		shapes.put(Shp.BARREL, "barrel");
-		shapes.put(Shp.FLOAT, "float");
-		shapes.put(Shp.SUPER, "super-buoy");
-		shapes.put(Shp.BEACON, "beacon");
-		shapes.put(Shp.TOWER, "tower");
-		shapes.put(Shp.STAKE, "stake");
-		shapes.put(Shp.PERCH, "perch");
+		ShpMAP.put(Shp.UNKNOWN, "");
+		ShpMAP.put(Shp.PILLAR, "pillar");
+		ShpMAP.put(Shp.SPAR, "spar");
+		ShpMAP.put(Shp.CAN, "can");
+		ShpMAP.put(Shp.CONE, "conical");
+		ShpMAP.put(Shp.SPHERE, "sphere");
+		ShpMAP.put(Shp.BARREL, "barrel");
+		ShpMAP.put(Shp.FLOAT, "float");
+		ShpMAP.put(Shp.SUPER, "super-buoy");
+		ShpMAP.put(Shp.BEACON, "beacon");
+		ShpMAP.put(Shp.TOWER, "tower");
+		ShpMAP.put(Shp.STAKE, "stake");
+		ShpMAP.put(Shp.PERCH, "perch");
 	}
 
@@ -197,24 +199,24 @@
 	}
 
-	public static final EnumMap<Col, String> colours = new EnumMap<Col, String>(Col.class);
+	public static final EnumMap<Col, String> ColMAP = new EnumMap<Col, String>(Col.class);
 	static {
-		colours.put(Col.UNKNOWN, "");
-		colours.put(Col.WHITE, "white");
-		colours.put(Col.RED, "red");
-		colours.put(Col.ORANGE, "orange");
-		colours.put(Col.AMBER, "amber");
-		colours.put(Col.YELLOW, "yellow");
-		colours.put(Col.GREEN, "green");
-		colours.put(Col.BLUE, "blue");
-		colours.put(Col.VIOLET, "violet");
-		colours.put(Col.BLACK, "black");
-		colours.put(Col.RED_GREEN_RED, "red;green;red");
-		colours.put(Col.GREEN_RED_GREEN, "green;red;green");
-		colours.put(Col.RED_WHITE, "red;white");
-		colours.put(Col.BLACK_YELLOW, "black;yellow");
-		colours.put(Col.BLACK_YELLOW_BLACK, "black;yellow;black");
-		colours.put(Col.YELLOW_BLACK, "yellow;black");
-		colours.put(Col.YELLOW_BLACK_YELLOW, "yellow;black;yellow");
-		colours.put(Col.BLACK_RED_BLACK, "black;red;black");
+		ColMAP.put(Col.UNKNOWN, "");
+		ColMAP.put(Col.WHITE, "white");
+		ColMAP.put(Col.RED, "red");
+		ColMAP.put(Col.ORANGE, "orange");
+		ColMAP.put(Col.AMBER, "amber");
+		ColMAP.put(Col.YELLOW, "yellow");
+		ColMAP.put(Col.GREEN, "green");
+		ColMAP.put(Col.BLUE, "blue");
+		ColMAP.put(Col.VIOLET, "violet");
+		ColMAP.put(Col.BLACK, "black");
+		ColMAP.put(Col.RED_GREEN_RED, "red;green;red");
+		ColMAP.put(Col.GREEN_RED_GREEN, "green;red;green");
+		ColMAP.put(Col.RED_WHITE, "red;white");
+		ColMAP.put(Col.BLACK_YELLOW, "black;yellow");
+		ColMAP.put(Col.BLACK_YELLOW_BLACK, "black;yellow;black");
+		ColMAP.put(Col.YELLOW_BLACK, "yellow;black");
+		ColMAP.put(Col.YELLOW_BLACK_YELLOW, "yellow;black;yellow");
+		ColMAP.put(Col.BLACK_RED_BLACK, "black;red;black");
 	}
 
@@ -262,16 +264,16 @@
 	}
 
-	public static final EnumMap<Top, String> tops = new EnumMap<Top, String>(Top.class);
+	public static final EnumMap<Top, String> TopMAP = new EnumMap<Top, String>(Top.class);
 	static {
-		tops.put(Top.NONE, "");
-		tops.put(Top.CAN, "cylinder");
-		tops.put(Top.CONE, "cylinder");
-		tops.put(Top.SPHERE, "SPHERE");
-		tops.put(Top.X_SHAPE, "X-SHAPE");
-		tops.put(Top.NORTH, "2 cones up");
-		tops.put(Top.SOUTH, "2 cones down");
-		tops.put(Top.EAST, "2 cones base together");
-		tops.put(Top.WEST, "2 cones points together");
-		tops.put(Top.SPHERES2, "2 spheres");
+		TopMAP.put(Top.NONE, "");
+		TopMAP.put(Top.CAN, "cylinder");
+		TopMAP.put(Top.CONE, "cylinder");
+		TopMAP.put(Top.SPHERE, "SPHERE");
+		TopMAP.put(Top.X_SHAPE, "X-SHAPE");
+		TopMAP.put(Top.NORTH, "2 cones up");
+		TopMAP.put(Top.SOUTH, "2 cones down");
+		TopMAP.put(Top.EAST, "2 cones base together");
+		TopMAP.put(Top.WEST, "2 cones points together");
+		TopMAP.put(Top.SPHERES2, "2 spheres");
 	}
 
@@ -295,13 +297,13 @@
 	}
 
-	public static final EnumMap<Day, String> days = new EnumMap<Day, String>(Day.class);
+	public static final EnumMap<Day, String> DayMAP = new EnumMap<Day, String>(Day.class);
 	static {
-		days.put(Day.NONE, "");
-		days.put(Day.BOARD, "board");
-		days.put(Day.DIAMOND, "diamond");
-		days.put(Day.CIRCLE, "circle");
-		days.put(Day.TRIANGLE, "triangle, point up");
-		days.put(Day.TRIANGLE_INV, "triangle, point down");
-		days.put(Day.SQUARE, "square");
+		DayMAP.put(Day.NONE, "");
+		DayMAP.put(Day.BOARD, "board");
+		DayMAP.put(Day.DIAMOND, "diamond");
+		DayMAP.put(Day.CIRCLE, "circle");
+		DayMAP.put(Day.TRIANGLE, "triangle, point up");
+		DayMAP.put(Day.TRIANGLE_INV, "triangle, point down");
+		DayMAP.put(Day.SQUARE, "square");
 	}
 
@@ -457,22 +459,29 @@
 	}
 
-	public static final EnumMap<Chr, String> characters = new EnumMap<Chr, String>(Chr.class);
+	public static final Map<EnumSet<Chr>, String> ChrMAP = new HashMap<EnumSet<Chr>, String>();
 	static {
-		characters.put(Chr.UNKNOWN, "");
-		characters.put(Chr.FIXED, "F");
-		characters.put(Chr.FLASH, "Fl");
-		characters.put(Chr.LONGFLASH, "LFl");
-		characters.put(Chr.QUICK, "Q");
-		characters.put(Chr.VERYQUICK, "VQ");
-		characters.put(Chr.ULTRAQUICK, "UQ");
-		characters.put(Chr.ISOPHASED, "Iso");
-		characters.put(Chr.OCCULTING, "Oc");
-		characters.put(Chr.MORSE, "Mo");
-		characters.put(Chr.ALTERNATING, "Al");
-		characters.put(Chr.INTERRUPTEDQUICK, "IQ");
-		characters.put(Chr.INTERRUPTEDVERYQUICK, "IVQ");
-		characters.put(Chr.INTERRUPTEDULTRAQUICK, "IUQ");
-	}
-
+		ChrMAP.put(EnumSet.of(Chr.UNKNOWN), "");
+		ChrMAP.put(EnumSet.of(Chr.FIXED), "F");
+		ChrMAP.put(EnumSet.of(Chr.FLASH), "Fl");
+		ChrMAP.put(EnumSet.of(Chr.FIXED, Chr.FLASH), "FFl");
+		ChrMAP.put(EnumSet.of(Chr.LONGFLASH), "LFl");
+		ChrMAP.put(EnumSet.of(Chr.QUICK), "Q");
+		ChrMAP.put(EnumSet.of(Chr.QUICK, Chr.LONGFLASH), "Q+LFl");
+		ChrMAP.put(EnumSet.of(Chr.VERYQUICK), "VQ");
+		ChrMAP.put(EnumSet.of(Chr.VERYQUICK, Chr.LONGFLASH), "VQ+LFl");
+		ChrMAP.put(EnumSet.of(Chr.ULTRAQUICK), "UQ");
+		ChrMAP.put(EnumSet.of(Chr.INTERRUPTEDQUICK), "IQ");
+		ChrMAP.put(EnumSet.of(Chr.INTERRUPTEDVERYQUICK), "IVQ");
+		ChrMAP.put(EnumSet.of(Chr.INTERRUPTEDULTRAQUICK), "IUQ");
+		ChrMAP.put(EnumSet.of(Chr.ISOPHASED), "Iso");
+		ChrMAP.put(EnumSet.of(Chr.OCCULTING), "Oc");
+		ChrMAP.put(EnumSet.of(Chr.MORSE), "Mo");
+		ChrMAP.put(EnumSet.of(Chr.ALTERNATING), "Al");
+		ChrMAP.put(EnumSet.of(Chr.ALTERNATING, Chr.FIXED), "Al.F");
+		ChrMAP.put(EnumSet.of(Chr.ALTERNATING, Chr.FLASH), "Al.Fl");
+		ChrMAP.put(EnumSet.of(Chr.ALTERNATING, Chr.ISOPHASED), "Al.Iso");
+		ChrMAP.put(EnumSet.of(Chr.ALTERNATING, Chr.OCCULTING), "Al.Oc");
+	}
+	
 	private String[] LightChar = new String[10];
 
@@ -640,6 +649,6 @@
 			typeStr = keys.get("seamark:type");
 
-		for (Obj obj : objects.keySet())
-			if (objects.get(obj).equals(typeStr))
+		for (Obj obj : ObjMAP.keySet())
+			if (ObjMAP.get(obj).equals(typeStr))
 				setObject(obj);
 
@@ -721,6 +730,6 @@
 		if (keys.containsKey("seamark:" + typeStr + ":colour"))
 			colStr = keys.get("seamark:" + typeStr + ":colour");
-		for (Col col : colours.keySet())
-			if (colours.get(col).equals(colStr)) setColour(Ent.BODY, col);
+		for (Col col : ColMAP.keySet())
+			if (ColMAP.get(col).equals(colStr)) setColour(Ent.BODY, col);
 
 		if (keys.containsKey("seamark:" + typeStr + ":name")) {
@@ -736,5 +745,5 @@
 			dlg.panelMain.nameBox.setText("");
 
-		switch (groups.get(getObject())) {
+		switch (GrpMAP.get(getObject())) {
 		case LAT:
 			dlg.panelMain.chanButton.doClick();
@@ -845,10 +854,10 @@
 			str = "float";
 		else str = "";
-		if ((str.isEmpty() && (entities.get(getObject()) == Ent.BEACON)) || str.equals("stake"))
+		if ((str.isEmpty() && (EntMAP.get(getObject()) == Ent.BEACON)) || str.equals("stake"))
 			str = "beacon";
 		if (!str.isEmpty()) {
-			for (Shp shp : shapes.keySet()) {
-				if (shapes.get(shp).equals(str)) {
-					switch (groups.get(getObject())) {
+			for (Shp shp : ShpMAP.keySet()) {
+				if (ShpMAP.get(shp).equals(str)) {
+					switch (GrpMAP.get(getObject())) {
 					case LAT:
 						switch (getCategory()) {
@@ -995,5 +1004,5 @@
 
 		String imgStr = "/images/";
-		String shpStr = shapes.get(shape);
+		String shpStr = ShpMAP.get(shape);
 		if (shpStr == null)
 			dlg.panelMain.shapeIcon.setIcon(null);
@@ -1003,5 +1012,5 @@
 				imgStr += (getCategory() == Cat.LAT_PORT ? "_port" : "_stbd");
 			} else {
-				String colStr = colours.get(bodyColour);
+				String colStr = ColMAP.get(bodyColour);
 				if (colStr != null)
 					imgStr += ("_" + colStr);
@@ -1043,6 +1052,6 @@
 			}
 			if (imgStr != null) {
-				imgStr += (tops.get(topShape) + "_");
-				String colStr = colours.get(topColour);
+				imgStr += (TopMAP.get(topShape) + "_");
+				String colStr = ColMAP.get(topColour);
 				if (colStr != null)
 					imgStr += colStr;
@@ -1106,15 +1115,15 @@
 			Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:name", name));
 
-		String objStr = objects.get(object);
+		String objStr = ObjMAP.get(object);
 		if (objStr != null) {
 			Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:type", objStr));
 
-			String str = categories.get(category);
+			String str = CatMAP.get(category);
 			if (str != null)
 				Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" + objStr + ":category", str));
 
-			Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" + objStr + ":shape", shapes.get(shape)));
-
-			str = colours.get(bodyColour);
+			Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" + objStr + ":shape", ShpMAP.get(shape)));
+
+			str = ColMAP.get(bodyColour);
 			if (str != null)
 				Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:" + objStr + ":colour", str));
@@ -1136,18 +1145,18 @@
 		}
 
-		String str = tops.get(topShape);
+		String str = TopMAP.get(topShape);
 		if (str != null) {
 			Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:topmark:shape", str));
 
-			str = colours.get(topColour);
+			str = ColMAP.get(topColour);
 			if (str != null)
 				Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:topmark:colour", str));
 		}
 
-		str = days.get(dayShape);
+		str = DayMAP.get(dayShape);
 		if (str != null) {
 			Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:daymark:shape", str));
 
-			str = colours.get(dayColour);
+			str = ColMAP.get(dayColour);
 			if (str != null)
 				Main.main.undoRedo.add(new ChangePropertyCommand(node, "seamark:daymark:colour", str));