Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/ChanButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/ChanButton.svg	(revision 24591)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/ChanButton.svg	(revision 24592)
@@ -8,4 +8,5 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
@@ -16,9 +17,45 @@
    inkscape:version="0.47 r22583"
    sodipodi:docname="ChanButton.svg"
-   inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/ChanButton.png"
+   inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/ChanSelected_de.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
      id="defs4">
+    <linearGradient
+       id="linearGradient3638"
+       inkscape:collect="always">
+      <stop
+         id="stop3640"
+         offset="0"
+         style="stop-color:#80a4c4;stop-opacity:1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.1803427"
+         id="stop3642" />
+      <stop
+         id="stop3646"
+         offset="0.49928904"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop3644"
+         offset="1"
+         style="stop-color:#80a4c4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3606">
+      <stop
+         style="stop-color:#80a4c4;stop-opacity:1"
+         offset="0"
+         id="stop3608" />
+      <stop
+         id="stop3614"
+         offset="0.31745982"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#80a4c4;stop-opacity:1"
+         offset="1"
+         id="stop3610" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
@@ -28,4 +65,22 @@
        inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
        id="perspective10" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3606"
+       id="linearGradient3612"
+       x1="50.002548"
+       y1="1012.4216"
+       x2="50.002548"
+       y2="1052.3596"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3638"
+       id="linearGradient3636"
+       gradientUnits="userSpaceOnUse"
+       x1="50.002548"
+       y1="1012.4216"
+       x2="50.002548"
+       y2="1052.3596" />
   </defs>
   <sodipodi:namedview
@@ -36,9 +91,9 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.879394"
-     inkscape:cx="47.703965"
-     inkscape:cy="24.637413"
+     inkscape:zoom="8.4000001"
+     inkscape:cx="38.780951"
+     inkscape:cy="9.8235431"
      inkscape:document-units="px"
-     inkscape:current-layer="g2900"
+     inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:showpageshadow="false"
@@ -76,4 +131,11 @@
      style="display:inline">
     <rect
+       y="1012.67"
+       x="0.2509402"
+       height="39.441231"
+       width="99.50322"
+       id="rect3618"
+       style="fill:url(#linearGradient3612);fill-opacity:1;stroke:#000000;stroke-width:0.49680412;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+    <rect
        style="fill:#d40000;fill-opacity:1;stroke:#000000;stroke-width:0.78358072;stroke-opacity:1"
        id="rect2818"
@@ -101,5 +163,5 @@
        sodipodi:rx="10.684524"
        sodipodi:ry="9.6428576"
-       d="m 36.190476,11.369047 c 0,5.325603 -4.783624,9.642858 -10.684523,9.642858 -5.9009,0 -10.684524,-4.317255 -10.684524,-9.642858 0,-5.325603 4.783624,-9.6428574 10.684524,-9.6428574 5.900899,0 10.684523,4.3172544 10.684523,9.6428574 z"
+       d="m 36.190476,11.369047 a 10.684524,9.6428576 0 1 1 -21.369047,0 10.684524,9.6428576 0 1 1 21.369047,0 z"
        transform="matrix(0.7128465,0,0,0.78804359,6.7216642,1013.3063)"
        inkscape:export-filename="/Users/mherring/boatsw/oseam/openseamap/josm/icons/Chan.png"
@@ -112,5 +174,5 @@
      inkscape:groupmode="layer"
      inkscape:label="Text EN"
-     style="display:inline">
+     style="display:none">
     <text
        inkscape:export-ydpi="90"
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/HazButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/HazButton.svg	(revision 24591)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/HazButton.svg	(revision 24592)
@@ -8,4 +8,5 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
@@ -22,4 +23,20 @@
   <defs
      id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5445">
+      <stop
+         style="stop-color:#80a4c4;stop-opacity:1"
+         offset="0"
+         id="stop5447" />
+      <stop
+         id="stop5453"
+         offset="0.31249949"
+         style="stop-color:#ffffff;stop-opacity:0.68627451;" />
+      <stop
+         style="stop-color:#80a4c4;stop-opacity:1"
+         offset="1"
+         id="stop5449" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
@@ -29,4 +46,13 @@
        inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
        id="perspective10" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5445"
+       id="linearGradient5451"
+       x1="50.000004"
+       y1="1012.3622"
+       x2="50.000004"
+       y2="1052.3623"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -37,9 +63,9 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.879394"
-     inkscape:cx="51.249711"
+     inkscape:zoom="8.4000001"
+     inkscape:cx="35.592347"
      inkscape:cy="26.914183"
      inkscape:document-units="px"
-     inkscape:current-layer="g3612"
+     inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:showpageshadow="false"
@@ -76,4 +102,11 @@
      transform="translate(0,-1012.3622)"
      style="display:inline">
+    <rect
+       style="fill:url(#linearGradient5451);fill-opacity:1;stroke:#000000;stroke-width:0.50033444000000005;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4923"
+       width="99.499672"
+       height="39.499664"
+       x="0.25016722"
+       y="1012.6124" />
     <path
        style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.89626366px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightsButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightsButton.svg	(revision 24591)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/LightsButton.svg	(revision 24592)
@@ -8,4 +8,5 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
@@ -21,4 +22,20 @@
   <defs
      id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4892">
+      <stop
+         style="stop-color:#80a4c4;stop-opacity:1"
+         offset="0"
+         id="stop4894" />
+      <stop
+         id="stop4902"
+         offset="0.31183401"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         style="stop-color:#80a4c4;stop-opacity:1"
+         offset="1"
+         id="stop4896" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
@@ -1106,4 +1123,13 @@
        inkscape:vp_x="0 : 160 : 1"
        sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4892"
+       id="linearGradient4900"
+       x1="50.000011"
+       y1="1012.3622"
+       x2="50.000011"
+       y2="1052.3622"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -1115,8 +1141,8 @@
      inkscape:pageshadow="2"
      inkscape:zoom="11.879394"
-     inkscape:cx="58.263162"
+     inkscape:cx="42.605798"
      inkscape:cy="14.533528"
      inkscape:document-units="px"
-     inkscape:current-layer="g3309"
+     inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:showpageshadow="false"
@@ -1143,5 +1169,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
@@ -1153,4 +1179,14 @@
      transform="translate(0,-1012.3622)"
      style="display:inline">
+    <rect
+       style="fill:url(#linearGradient4900);fill-opacity:1;stroke:#000000;stroke-width:0.50065404000000002;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="rect4370"
+       width="99.499367"
+       height="39.499348"
+       x="0.25032702"
+       y="1012.6125"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/LightsButton.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <g
        transform="matrix(0.24,0,0,0.24,-10.987692,996.88709)"
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/images/SpecButton.svg
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/images/SpecButton.svg	(revision 24591)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/images/SpecButton.svg	(revision 24592)
@@ -8,4 +8,5 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
@@ -18,4 +19,20 @@
   <defs
      id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4179">
+      <stop
+         style="stop-color:#80a4c4;stop-opacity:1"
+         offset="0"
+         id="stop4181" />
+      <stop
+         id="stop4187"
+         offset="0.31250244"
+         style="stop-color:#ffffff;stop-opacity:0.68627451;" />
+      <stop
+         style="stop-color:#80a4c4;stop-opacity:1"
+         offset="1"
+         id="stop4183" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
@@ -25,4 +42,13 @@
        inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
        id="perspective10" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4179"
+       id="linearGradient4185"
+       x1="50.000004"
+       y1="1012.3621"
+       x2="50.000004"
+       y2="1052.3621"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
@@ -33,9 +59,9 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.879394"
-     inkscape:cx="52.768058"
-     inkscape:cy="27.488438"
+     inkscape:zoom="8.4000001"
+     inkscape:cx="50.678515"
+     inkscape:cy="7.2853872"
      inkscape:document-units="px"
-     inkscape:current-layer="g3709"
+     inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:showpageshadow="false"
@@ -62,5 +88,5 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
@@ -72,4 +98,14 @@
      transform="translate(0,-1012.3622)"
      style="display:inline">
+    <rect
+       style="fill:url(#linearGradient4185);fill-opacity:1;stroke:#000000;stroke-width:0.50330848;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+       id="rect3667"
+       width="99.496696"
+       height="39.496693"
+       x="0.25165424"
+       y="1012.6138"
+       inkscape:export-filename="/Users/mherring/boatsw/oseam/josm/plugins/smed/plugs/oseam/src/images/SpecButton_de.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
     <path
        style="fill:#ffd400;fill-opacity:1;stroke:#000000;stroke-width:0.80000001px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java	(revision 24591)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java	(revision 24592)
@@ -82,4 +82,8 @@
 			ActionListener alType = new ActionListener() {
 				public void actionPerformed(java.awt.event.ActionEvent e) {
+					chanButton.setEnabled(!chanButton.isSelected());
+					hazButton.setEnabled(!hazButton.isSelected());
+					specButton.setEnabled(!specButton.isSelected());
+					lightButton.setEnabled(!lightButton.isSelected());
 //System.out.println("pressed: " + chanButton.isSelected() + " " + hazButton.isSelected() + " " + specButton.isSelected() + " " + lightButton.isSelected());
 				}
@@ -98,5 +102,4 @@
 					Messages.getString("ChanButton"))));
 			chanButton.setBounds(new Rectangle(5, 0, 105, 40));
-			chanButton.setBorderPainted(true);
 			chanButton.setToolTipText(Messages.getString("ChanTip"));
 		}
@@ -109,5 +112,4 @@
 					Messages.getString("HazButton"))));
 			hazButton.setBounds(new Rectangle(5, 40, 105, 40));
-			hazButton.setBorderPainted(true);
 			hazButton.setToolTipText(Messages.getString("HazTip"));
 		}
@@ -120,5 +122,4 @@
 					Messages.getString("SpecButton"))));
 			specButton.setBounds(new Rectangle(5, 80, 105, 40));
-			specButton.setBorderPainted(true);
 			specButton.setToolTipText(Messages.getString("SpecTip"));
 		}
@@ -131,5 +132,4 @@
 					Messages.getString("LightsButton"))));
 			lightButton.setBounds(new Rectangle(5, 120, 105, 40));
-			lightButton.setBorderPainted(true);
 			lightButton.setToolTipText(Messages.getString("LightsTip"));
 		}