Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java	(revision 24723)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelChan.java	(revision 24724)
@@ -77,36 +77,36 @@
 			public void actionPerformed(java.awt.event.ActionEvent e) {
 				if (portButton.isSelected()) {
-					portButton.setEnabled(false);
+					portButton.setBorderPainted(true);
 					panelPort.setVisible(true);
 				} else {
-					portButton.setEnabled(true);
+					portButton.setBorderPainted(false);
 					panelPort.setVisible(false);
 				}
 				if (stbdButton.isSelected()) {
-					stbdButton.setEnabled(false);
+					stbdButton.setBorderPainted(true);
 					panelStbd.setVisible(true);
 				} else {
-					stbdButton.setEnabled(true);
+					stbdButton.setBorderPainted(false);
 					panelStbd.setVisible(false);
 				}
 				if (prefPortButton.isSelected()) {
-					prefPortButton.setEnabled(false);
+					prefPortButton.setBorderPainted(true);
 					panelPrefPort.setVisible(true);
 				} else {
-					prefPortButton.setEnabled(true);
+					prefPortButton.setBorderPainted(false);
 					panelPrefPort.setVisible(false);
 				}
 				if (prefStbdButton.isSelected()) {
-					prefStbdButton.setEnabled(false);
+					prefStbdButton.setBorderPainted(true);
 					panelPrefStbd.setVisible(true);
 				} else {
-					prefStbdButton.setEnabled(true);
+					prefStbdButton.setBorderPainted(false);
 					panelPrefStbd.setVisible(false);
 				}
 				if (safeWaterButton.isSelected()) {
-					safeWaterButton.setEnabled(false);
+					safeWaterButton.setBorderPainted(true);
 					panelSafeWater.setVisible(true);
 				} else {
-					safeWaterButton.setEnabled(true);
+					safeWaterButton.setBorderPainted(false);
 					panelSafeWater.setVisible(false);
 				}
@@ -124,5 +124,6 @@
 			portButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/PortButton.png")));
-			portButton.setBounds(new Rectangle(0, 0, 55, 32));
+			portButton.setBounds(new Rectangle(0, 0, 52, 32));
+			portButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			portButton.setToolTipText(Messages.getString("PortTip"));
 		}
@@ -134,5 +135,6 @@
 			stbdButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/StbdButton.png")));
-			stbdButton.setBounds(new Rectangle(0, 32, 55, 32));
+			stbdButton.setBounds(new Rectangle(0, 32, 52, 32));
+			stbdButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			stbdButton.setToolTipText(Messages.getString("StbdTip"));
 		}
@@ -144,5 +146,6 @@
 			prefPortButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/PrefPortButton.png")));
-			prefPortButton.setBounds(new Rectangle(0, 64, 55, 32));
+			prefPortButton.setBounds(new Rectangle(0, 64, 52, 32));
+			prefPortButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			prefPortButton.setToolTipText(Messages.getString("PrefPortTip"));
 		}
@@ -154,5 +157,6 @@
 			prefStbdButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/PrefStbdButton.png")));
-			prefStbdButton.setBounds(new Rectangle(0, 96, 55, 32));
+			prefStbdButton.setBounds(new Rectangle(0, 96, 52, 32));
+			prefStbdButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			prefStbdButton.setToolTipText(Messages.getString("PrefStbdTip"));
 		}
@@ -164,5 +168,6 @@
 			safeWaterButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/SafeWaterButton.png")));
-			safeWaterButton.setBounds(new Rectangle(0, 128, 55, 32));
+			safeWaterButton.setBounds(new Rectangle(0, 128, 52, 32));
+	        safeWaterButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			safeWaterButton.setToolTipText(Messages.getString("SafeWaterTip"));
 		}
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java	(revision 24723)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelHaz.java	(revision 24724)
@@ -58,9 +58,9 @@
 		ActionListener alCat = new ActionListener() {
 			public void actionPerformed(java.awt.event.ActionEvent e) {
-				northButton.setEnabled(!northButton.isSelected());
-				southButton.setEnabled(!southButton.isSelected());
-				eastButton.setEnabled(!eastButton.isSelected());
-				westButton.setEnabled(!westButton.isSelected());
-				isolButton.setEnabled(!isolButton.isSelected());
+				northButton.setBorderPainted(northButton.isSelected());
+				southButton.setBorderPainted(southButton.isSelected());
+				eastButton.setBorderPainted(eastButton.isSelected());
+				westButton.setBorderPainted(westButton.isSelected());
+				isolButton.setBorderPainted(isolButton.isSelected());
 			}
 		};
@@ -84,9 +84,9 @@
 		ActionListener alShape = new ActionListener() {
 			public void actionPerformed(java.awt.event.ActionEvent e) {
-				pillarButton.setEnabled(!pillarButton.isSelected());
-				sparButton.setEnabled(!sparButton.isSelected());
-				floatButton.setEnabled(!floatButton.isSelected());
-				beaconButton.setEnabled(!beaconButton.isSelected());
-				towerButton.setEnabled(!towerButton.isSelected());
+				pillarButton.setBorderPainted(pillarButton.isSelected());
+				sparButton.setBorderPainted(sparButton.isSelected());
+				floatButton.setBorderPainted(floatButton.isSelected());
+				beaconButton.setBorderPainted(beaconButton.isSelected());
+				towerButton.setBorderPainted(towerButton.isSelected());
 			}
 		};
@@ -102,5 +102,6 @@
 			northButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/CardNButton.png")));
-			northButton.setBounds(new Rectangle(0, 0, 55, 32));
+			northButton.setBounds(new Rectangle(0, 0, 52, 32));
+	        northButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			northButton.setToolTipText(Messages.getString("NorthTip"));
 		}
@@ -112,5 +113,6 @@
 			southButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/CardSButton.png")));
-			southButton.setBounds(new Rectangle(0, 32, 55, 32));
+			southButton.setBounds(new Rectangle(0, 32, 52, 32));
+	        southButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			southButton.setToolTipText(Messages.getString("SouthTip"));
 		}
@@ -122,5 +124,6 @@
 			eastButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/CardEButton.png")));
-			eastButton.setBounds(new Rectangle(0, 64, 55, 32));
+			eastButton.setBounds(new Rectangle(0, 64, 52, 32));
+	        eastButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			eastButton.setToolTipText(Messages.getString("EastTip"));
 		}
@@ -132,5 +135,6 @@
 			westButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/CardWButton.png")));
-			westButton.setBounds(new Rectangle(0, 96, 55, 32));
+			westButton.setBounds(new Rectangle(0, 96, 52, 32));
+	        westButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			westButton.setToolTipText(Messages.getString("WestTip"));
 		}
@@ -142,5 +146,6 @@
 			isolButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/IsolButton.png")));
-			isolButton.setBounds(new Rectangle(0, 128, 55, 32));
+			isolButton.setBounds(new Rectangle(0, 128, 52, 32));
+	        isolButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			isolButton.setToolTipText(Messages.getString("IsolTip"));
 		}
@@ -152,5 +157,6 @@
 			pillarButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/PillarButton.png")));
-			pillarButton.setBounds(new Rectangle(55, 0, 90, 32));
+			pillarButton.setBounds(new Rectangle(55, 0, 34, 32));
+	        pillarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			pillarButton.setToolTipText(Messages.getString("PillarTip"));
 		}
@@ -162,5 +168,6 @@
 			sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/SparButton.png")));
-			sparButton.setBounds(new Rectangle(55, 32, 90, 32));
+			sparButton.setBounds(new Rectangle(55, 32, 34, 32));
+	        sparButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			sparButton.setToolTipText(Messages.getString("SparTip"));
 		}
@@ -172,5 +179,6 @@
 			floatButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/FloatButton.png")));
-			floatButton.setBounds(new Rectangle(55, 64, 90, 32));
+			floatButton.setBounds(new Rectangle(55, 64, 34, 32));
+	        floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			floatButton.setToolTipText(Messages.getString("FloatTip"));
 		}
@@ -182,5 +190,6 @@
 			beaconButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/BeaconButton.png")));
-			beaconButton.setBounds(new Rectangle(55, 96, 90, 32));
+			beaconButton.setBounds(new Rectangle(55, 96, 34, 32));
+	        beaconButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			beaconButton.setToolTipText(Messages.getString("BeaconTip"));
 		}
@@ -192,5 +201,6 @@
 			towerButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/TowerButton.png")));
-			towerButton.setBounds(new Rectangle(55, 128, 90, 32));
+			towerButton.setBounds(new Rectangle(55, 128, 34, 32));
+	        towerButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			towerButton.setToolTipText(Messages.getString("TowerTip"));
 		}
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java	(revision 24723)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelLights.java	(revision 24724)
@@ -51,9 +51,9 @@
 		ActionListener alCat = new ActionListener() {
 			public void actionPerformed(java.awt.event.ActionEvent e) {
-				houseButton.setEnabled(!houseButton.isSelected());
-				majorButton.setEnabled(!majorButton.isSelected());
-				minorButton.setEnabled(!minorButton.isSelected());
-				vesselButton.setEnabled(!vesselButton.isSelected());
-				floatButton.setEnabled(!floatButton.isSelected());
+				houseButton.setBorderPainted(houseButton.isSelected());
+				majorButton.setBorderPainted(majorButton.isSelected());
+				minorButton.setBorderPainted(minorButton.isSelected());
+				vesselButton.setBorderPainted(vesselButton.isSelected());
+				floatButton.setBorderPainted(floatButton.isSelected());
 			}
 		};
@@ -69,5 +69,6 @@
 			houseButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/LighthouseButton.png")));
-			houseButton.setBounds(new Rectangle(0, 0, 35, 32));
+			houseButton.setBounds(new Rectangle(0, 0, 34, 32));
+	        houseButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			houseButton.setToolTipText(Messages.getString("LighthouseTip"));
 		}
@@ -79,5 +80,6 @@
 			majorButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/LightMajorButton.png")));
-			majorButton.setBounds(new Rectangle(0, 32, 35, 32));
+			majorButton.setBounds(new Rectangle(0, 32, 34, 32));
+	        majorButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			majorButton.setToolTipText(Messages.getString("MajorLightTip"));
 		}
@@ -89,5 +91,6 @@
 			minorButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/LightMinorButton.png")));
-			minorButton.setBounds(new Rectangle(0, 64, 35, 32));
+			minorButton.setBounds(new Rectangle(0, 64, 34, 32));
+	        minorButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			minorButton.setToolTipText(Messages.getString("MinorLightTip"));
 		}
@@ -99,5 +102,6 @@
 			vesselButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/LightVesselButton.png")));
-			vesselButton.setBounds(new Rectangle(0, 96, 35, 32));
+			vesselButton.setBounds(new Rectangle(0, 96, 34, 32));
+	        vesselButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			vesselButton.setToolTipText(Messages.getString("LightVesselTip"));
 		}
@@ -109,5 +113,6 @@
 			floatButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/LightFloatButton.png")));
-			floatButton.setBounds(new Rectangle(0, 128, 35, 32));
+			floatButton.setBounds(new Rectangle(0, 128, 34, 32));
+	        floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			floatButton.setToolTipText(Messages.getString("LightFloatTip"));
 		}
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java	(revision 24723)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPort.java	(revision 24724)
@@ -58,14 +58,6 @@
 		ActionListener alRegion = new ActionListener() {
 			public void actionPerformed(java.awt.event.ActionEvent e) {
-				if (regionAButton.isSelected()) {
-					regionAButton.setEnabled(false);
-				} else {
-					regionAButton.setEnabled(true);
-				}
-				if (regionBButton.isSelected()) {
-					regionBButton.setEnabled(false);
-				} else {
-					regionBButton.setEnabled(true);
-				}
+				regionAButton.setBorderPainted(regionAButton.isSelected());
+				regionBButton.setBorderPainted(regionBButton.isSelected());
 			}
 		};
@@ -83,11 +75,11 @@
 		ActionListener alShape = new ActionListener() {
 			public void actionPerformed(java.awt.event.ActionEvent e) {
-				pillarButton.setEnabled(!pillarButton.isSelected());
-				sparButton.setEnabled(!sparButton.isSelected());
-				canButton.setEnabled(!canButton.isSelected());
-				floatButton.setEnabled(!floatButton.isSelected());
-				beaconButton.setEnabled(!beaconButton.isSelected());
-				towerButton.setEnabled(!towerButton.isSelected());
-				perchButton.setEnabled(!perchButton.isSelected());
+				pillarButton.setBorderPainted(pillarButton.isSelected());
+				sparButton.setBorderPainted(sparButton.isSelected());
+				canButton.setBorderPainted(canButton.isSelected());
+				floatButton.setBorderPainted(floatButton.isSelected());
+				beaconButton.setBorderPainted(beaconButton.isSelected());
+				towerButton.setBorderPainted(towerButton.isSelected());
+				perchButton.setBorderPainted(perchButton.isSelected());
 			}
 		};
@@ -105,5 +97,6 @@
 			regionAButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/RegionAButton.png")));
-			regionAButton.setBounds(new Rectangle(0, 2, 35, 30));
+			regionAButton.setBounds(new Rectangle(0, 2, 34, 30));
+	        regionAButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			regionAButton.setToolTipText(Messages.getString("RegionATip"));
 		}
@@ -115,5 +108,6 @@
 			regionBButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/RegionBButton.png")));
-			regionBButton.setBounds(new Rectangle(0, 32, 35, 30));
+			regionBButton.setBounds(new Rectangle(0, 32, 34, 30));
+	        regionBButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			regionBButton.setToolTipText(Messages.getString("RegionBTip"));
 		}
@@ -125,5 +119,6 @@
 			pillarButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/PillarButton.png")));
-			pillarButton.setBounds(new Rectangle(0, 64, 35, 32));
+			pillarButton.setBounds(new Rectangle(0, 64, 34, 32));
+	        pillarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			pillarButton.setToolTipText(Messages.getString("PillarTip"));
 		}
@@ -135,5 +130,6 @@
 			sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/SparButton.png")));
-			sparButton.setBounds(new Rectangle(0, 96, 35, 32));
+			sparButton.setBounds(new Rectangle(0, 96, 34, 32));
+	        sparButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			sparButton.setToolTipText(Messages.getString("SparTip"));
 		}
@@ -145,5 +141,6 @@
 			canButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/CanButton.png")));
-			canButton.setBounds(new Rectangle(0, 128, 35, 32));
+			canButton.setBounds(new Rectangle(0, 128, 34, 32));
+	        canButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			canButton.setToolTipText(Messages.getString("CanTip"));
 		}
@@ -155,5 +152,6 @@
 			floatButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/FloatButton.png")));
-			floatButton.setBounds(new Rectangle(35, 0, 35, 32));
+			floatButton.setBounds(new Rectangle(35, 0, 34, 32));
+	        floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			floatButton.setToolTipText(Messages.getString("FloatTip"));
 		}
@@ -165,5 +163,6 @@
 			beaconButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/BeaconButton.png")));
-			beaconButton.setBounds(new Rectangle(35, 32, 35, 32));
+			beaconButton.setBounds(new Rectangle(35, 32, 34, 32));
+	        beaconButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			beaconButton.setToolTipText(Messages.getString("BeaconTip"));
 		}
@@ -175,5 +174,6 @@
 			towerButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/TowerButton.png")));
-			towerButton.setBounds(new Rectangle(35, 64, 35, 32));
+			towerButton.setBounds(new Rectangle(35, 64, 34, 32));
+	        towerButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			towerButton.setToolTipText(Messages.getString("TowerTip"));
 		}
@@ -185,5 +185,6 @@
 			perchButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/PerchPButton.png")));
-			perchButton.setBounds(new Rectangle(35, 96, 35, 32));
+			perchButton.setBounds(new Rectangle(35, 96, 34, 32));
+	        perchButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			perchButton.setToolTipText(Messages.getString("PerchTip"));
 		}
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefPort.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefPort.java	(revision 24723)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefPort.java	(revision 24724)
@@ -56,14 +56,6 @@
 		ActionListener alRegion = new ActionListener() {
 			public void actionPerformed(java.awt.event.ActionEvent e) {
-				if (regionAButton.isSelected()) {
-					regionAButton.setEnabled(false);
-				} else {
-					regionAButton.setEnabled(true);
-				}
-				if (regionBButton.isSelected()) {
-					regionBButton.setEnabled(false);
-				} else {
-					regionBButton.setEnabled(true);
-				}
+				regionAButton.setBorderPainted(regionAButton.isSelected());
+				regionBButton.setBorderPainted(regionBButton.isSelected());
 			}
 		};
@@ -80,10 +72,10 @@
 		ActionListener alShape = new ActionListener() {
 			public void actionPerformed(java.awt.event.ActionEvent e) {
-				pillarButton.setEnabled(!pillarButton.isSelected());
-				sparButton.setEnabled(!sparButton.isSelected());
-				canButton.setEnabled(!canButton.isSelected());
-				floatButton.setEnabled(!floatButton.isSelected());
-				beaconButton.setEnabled(!beaconButton.isSelected());
-				towerButton.setEnabled(!towerButton.isSelected());
+				pillarButton.setBorderPainted(pillarButton.isSelected());
+				sparButton.setBorderPainted(sparButton.isSelected());
+				canButton.setBorderPainted(canButton.isSelected());
+				floatButton.setBorderPainted(floatButton.isSelected());
+				beaconButton.setBorderPainted(beaconButton.isSelected());
+				towerButton.setBorderPainted(towerButton.isSelected());
 			}
 		};
@@ -100,5 +92,6 @@
 			regionAButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/RegionAButton.png")));
-			regionAButton.setBounds(new Rectangle(0, 2, 35, 30));
+			regionAButton.setBounds(new Rectangle(0, 2, 34, 30));
+	        regionAButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			regionAButton.setToolTipText(Messages.getString("RegionATip"));
 		}
@@ -110,5 +103,6 @@
 			regionBButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/RegionBButton.png")));
-			regionBButton.setBounds(new Rectangle(0, 32, 35, 30));
+			regionBButton.setBounds(new Rectangle(0, 32, 34, 30));
+	        regionBButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			regionBButton.setToolTipText(Messages.getString("RegionBTip"));
 		}
@@ -120,5 +114,6 @@
 			pillarButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/PillarButton.png")));
-			pillarButton.setBounds(new Rectangle(0, 64, 35, 32));
+			pillarButton.setBounds(new Rectangle(0, 64, 34, 32));
+	        pillarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			pillarButton.setToolTipText(Messages.getString("PillarTip"));
 		}
@@ -130,5 +125,6 @@
 			sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/SparButton.png")));
-			sparButton.setBounds(new Rectangle(0, 96, 35, 32));
+			sparButton.setBounds(new Rectangle(0, 96, 34, 32));
+	        sparButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			sparButton.setToolTipText(Messages.getString("SparTip"));
 		}
@@ -140,5 +136,6 @@
 			canButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/CanButton.png")));
-			canButton.setBounds(new Rectangle(0, 128, 35, 32));
+			canButton.setBounds(new Rectangle(0, 128, 34, 32));
+	        canButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			canButton.setToolTipText(Messages.getString("CanTip"));
 		}
@@ -150,5 +147,6 @@
 			floatButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/FloatButton.png")));
-			floatButton.setBounds(new Rectangle(35, 0, 35, 32));
+			floatButton.setBounds(new Rectangle(35, 0, 34, 32));
+	        floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			floatButton.setToolTipText(Messages.getString("FloatTip"));
 		}
@@ -160,5 +158,6 @@
 			beaconButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/BeaconButton.png")));
-			beaconButton.setBounds(new Rectangle(35, 32, 35, 32));
+			beaconButton.setBounds(new Rectangle(35, 32, 34, 32));
+	        beaconButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			beaconButton.setToolTipText(Messages.getString("BeaconTip"));
 		}
@@ -170,5 +169,6 @@
 			towerButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/TowerButton.png")));
-			towerButton.setBounds(new Rectangle(35, 64, 35, 32));
+			towerButton.setBounds(new Rectangle(35, 64, 34, 32));
+	        towerButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			towerButton.setToolTipText(Messages.getString("TowerTip"));
 		}
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefStbd.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefStbd.java	(revision 24723)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelPrefStbd.java	(revision 24724)
@@ -56,14 +56,6 @@
 		ActionListener alRegion = new ActionListener() {
 			public void actionPerformed(java.awt.event.ActionEvent e) {
-				if (regionAButton.isSelected()) {
-					regionAButton.setEnabled(false);
-				} else {
-					regionAButton.setEnabled(true);
-				}
-				if (regionBButton.isSelected()) {
-					regionBButton.setEnabled(false);
-				} else {
-					regionBButton.setEnabled(true);
-				}
+				regionAButton.setBorderPainted(regionAButton.isSelected());
+				regionBButton.setBorderPainted(regionBButton.isSelected());
 			}
 		};
@@ -80,10 +72,10 @@
 		ActionListener alShape = new ActionListener() {
 			public void actionPerformed(java.awt.event.ActionEvent e) {
-				pillarButton.setEnabled(!pillarButton.isSelected());
-				sparButton.setEnabled(!sparButton.isSelected());
-				coneButton.setEnabled(!coneButton.isSelected());
-				floatButton.setEnabled(!floatButton.isSelected());
-				beaconButton.setEnabled(!beaconButton.isSelected());
-				towerButton.setEnabled(!towerButton.isSelected());
+				pillarButton.setBorderPainted(pillarButton.isSelected());
+				sparButton.setBorderPainted(sparButton.isSelected());
+				coneButton.setBorderPainted(coneButton.isSelected());
+				floatButton.setBorderPainted(floatButton.isSelected());
+				beaconButton.setBorderPainted(beaconButton.isSelected());
+				towerButton.setBorderPainted(towerButton.isSelected());
 			}
 		};
@@ -100,5 +92,6 @@
 			regionAButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/RegionAButton.png")));
-			regionAButton.setBounds(new Rectangle(0, 2, 35, 30));
+			regionAButton.setBounds(new Rectangle(0, 2, 34, 30));
+	        regionAButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			regionAButton.setToolTipText(Messages.getString("RegionATip"));
 		}
@@ -110,5 +103,6 @@
 			regionBButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/RegionBButton.png")));
-			regionBButton.setBounds(new Rectangle(0, 32, 35, 30));
+			regionBButton.setBounds(new Rectangle(0, 32, 34, 30));
+	        regionBButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			regionBButton.setToolTipText(Messages.getString("RegionBTip"));
 		}
@@ -120,5 +114,6 @@
 			pillarButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/PillarButton.png")));
-			pillarButton.setBounds(new Rectangle(0, 64, 35, 32));
+			pillarButton.setBounds(new Rectangle(0, 64, 34, 32));
+	        pillarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			pillarButton.setToolTipText(Messages.getString("PillarTip"));
 		}
@@ -130,5 +125,6 @@
 			sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/SparButton.png")));
-			sparButton.setBounds(new Rectangle(0, 96, 35, 32));
+			sparButton.setBounds(new Rectangle(0, 96, 34, 32));
+	        sparButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			sparButton.setToolTipText(Messages.getString("SparTip"));
 		}
@@ -140,5 +136,6 @@
 			coneButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/ConeButton.png")));
-			coneButton.setBounds(new Rectangle(0, 128, 35, 32));
+			coneButton.setBounds(new Rectangle(0, 128, 34, 32));
+	        coneButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			coneButton.setToolTipText(Messages.getString("ConeTip"));
 		}
@@ -150,5 +147,6 @@
 			floatButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/FloatButton.png")));
-			floatButton.setBounds(new Rectangle(35, 0, 35, 32));
+			floatButton.setBounds(new Rectangle(35, 0, 34, 32));
+	        floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			floatButton.setToolTipText(Messages.getString("FloatTip"));
 		}
@@ -160,5 +158,6 @@
 			beaconButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/BeaconButton.png")));
-			beaconButton.setBounds(new Rectangle(35, 32, 35, 32));
+			beaconButton.setBounds(new Rectangle(35, 32, 34, 32));
+	        beaconButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			beaconButton.setToolTipText(Messages.getString("BeaconTip"));
 		}
@@ -170,5 +169,6 @@
 			towerButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/TowerButton.png")));
-			towerButton.setBounds(new Rectangle(35, 64, 35, 32));
+			towerButton.setBounds(new Rectangle(35, 64, 34, 32));
+	        towerButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			towerButton.setToolTipText(Messages.getString("TowerTip"));
 		}
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSafeWater.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSafeWater.java	(revision 24723)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSafeWater.java	(revision 24724)
@@ -52,9 +52,9 @@
 		ActionListener alShape = new ActionListener() {
 			public void actionPerformed(java.awt.event.ActionEvent e) {
-				pillarButton.setEnabled(!pillarButton.isSelected());
-				sparButton.setEnabled(!sparButton.isSelected());
-				sphereButton.setEnabled(!sphereButton.isSelected());
-				barrelButton.setEnabled(!barrelButton.isSelected());
-				floatButton.setEnabled(!floatButton.isSelected());
+				pillarButton.setBorderPainted(pillarButton.isSelected());
+				sparButton.setBorderPainted(sparButton.isSelected());
+				sphereButton.setBorderPainted(sphereButton.isSelected());
+				barrelButton.setBorderPainted(barrelButton.isSelected());
+				floatButton.setBorderPainted(floatButton.isSelected());
 			}
 		};
@@ -70,5 +70,6 @@
 			pillarButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/PillarButton.png")));
-			pillarButton.setBounds(new Rectangle(0, 0, 35, 32));
+			pillarButton.setBounds(new Rectangle(0, 0, 34, 32));
+	        pillarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			pillarButton.setToolTipText(Messages.getString("PillarTip"));
 		}
@@ -80,5 +81,6 @@
 			sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/SparButton.png")));
-			sparButton.setBounds(new Rectangle(0, 32, 35, 32));
+			sparButton.setBounds(new Rectangle(0, 32, 34, 32));
+	        sparButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			sparButton.setToolTipText(Messages.getString("SparTip"));
 		}
@@ -90,5 +92,6 @@
 			sphereButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/SphereButton.png")));
-			sphereButton.setBounds(new Rectangle(0, 64, 35, 32));
+			sphereButton.setBounds(new Rectangle(0, 64, 34, 32));
+	        sphereButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			sphereButton.setToolTipText(Messages.getString("SphereTip"));
 		}
@@ -100,5 +103,6 @@
 			barrelButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/BarrelButton.png")));
-			barrelButton.setBounds(new Rectangle(0, 96, 35, 32));
+			barrelButton.setBounds(new Rectangle(0, 96, 34, 32));
+	        barrelButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			barrelButton.setToolTipText(Messages.getString("BarrelTip"));
 		}
@@ -110,5 +114,6 @@
 			floatButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/FloatButton.png")));
-			floatButton.setBounds(new Rectangle(0, 128, 35, 32));
+			floatButton.setBounds(new Rectangle(0, 128, 34, 32));
+	        floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			floatButton.setToolTipText(Messages.getString("FloatTip"));
 		}
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java	(revision 24723)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelSpec.java	(revision 24724)
@@ -80,14 +80,14 @@
 		ActionListener alShape = new ActionListener() {
 			public void actionPerformed(java.awt.event.ActionEvent e) {
-				pillarButton.setEnabled(!pillarButton.isSelected());
-				sparButton.setEnabled(!sparButton.isSelected());
-				canButton.setEnabled(!canButton.isSelected());
-				coneButton.setEnabled(!coneButton.isSelected());
-				sphereButton.setEnabled(!sphereButton.isSelected());
-				barrelButton.setEnabled(!barrelButton.isSelected());
-				superButton.setEnabled(!superButton.isSelected());
-				floatButton.setEnabled(!floatButton.isSelected());
-				beaconButton.setEnabled(!beaconButton.isSelected());
-				towerButton.setEnabled(!towerButton.isSelected());
+				pillarButton.setBorderPainted(pillarButton.isSelected());
+				sparButton.setBorderPainted(sparButton.isSelected());
+				canButton.setBorderPainted(canButton.isSelected());
+				coneButton.setBorderPainted(coneButton.isSelected());
+				sphereButton.setBorderPainted(sphereButton.isSelected());
+				barrelButton.setBorderPainted(barrelButton.isSelected());
+				superButton.setBorderPainted(superButton.isSelected());
+				floatButton.setBorderPainted(floatButton.isSelected());
+				beaconButton.setBorderPainted(beaconButton.isSelected());
+				towerButton.setBorderPainted(towerButton.isSelected());
 			}
 		};
@@ -128,13 +128,13 @@
 		ActionListener alColour = new ActionListener() {
 			public void actionPerformed(java.awt.event.ActionEvent e) {
-				whiteButton.setEnabled(!whiteButton.isSelected());
-				redButton.setEnabled(!redButton.isSelected());
-				orangeButton.setEnabled(!orangeButton.isSelected());
-				amberButton.setEnabled(!amberButton.isSelected());
-				yellowButton.setEnabled(!yellowButton.isSelected());
-				greenButton.setEnabled(!greenButton.isSelected());
-				blueButton.setEnabled(!blueButton.isSelected());
-				violetButton.setEnabled(!violetButton.isSelected());
-				blackButton.setEnabled(!blackButton.isSelected());
+				whiteButton.setBorderPainted(whiteButton.isSelected());
+				redButton.setBorderPainted(redButton.isSelected());
+				orangeButton.setBorderPainted(orangeButton.isSelected());
+				amberButton.setBorderPainted(amberButton.isSelected());
+				yellowButton.setBorderPainted(yellowButton.isSelected());
+				greenButton.setBorderPainted(greenButton.isSelected());
+				blueButton.setBorderPainted(blueButton.isSelected());
+				violetButton.setBorderPainted(violetButton.isSelected());
+				blackButton.setBorderPainted(blackButton.isSelected());
 			}
 		};
@@ -154,5 +154,6 @@
 			pillarButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/PillarButton.png")));
-			pillarButton.setBounds(new Rectangle(55, 0, 35, 32));
+			pillarButton.setBounds(new Rectangle(55, 0, 34, 32));
+	        pillarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			pillarButton.setToolTipText(Messages.getString("PillarTip"));
 		}
@@ -164,5 +165,6 @@
 			sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/SparButton.png")));
-			sparButton.setBounds(new Rectangle(55, 32, 35, 32));
+			sparButton.setBounds(new Rectangle(55, 32, 34, 32));
+	        sparButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			sparButton.setToolTipText(Messages.getString("SparTip"));
 		}
@@ -174,5 +176,6 @@
 			canButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/CanButton.png")));
-			canButton.setBounds(new Rectangle(55, 64, 35, 32));
+			canButton.setBounds(new Rectangle(55, 64, 34, 32));
+	        canButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			canButton.setToolTipText(Messages.getString("CanTip"));
 		}
@@ -184,5 +187,6 @@
 			coneButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/ConeButton.png")));
-			coneButton.setBounds(new Rectangle(55, 96, 35, 32));
+			coneButton.setBounds(new Rectangle(55, 96, 34, 32));
+	        coneButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			coneButton.setToolTipText(Messages.getString("ConeTip"));
 		}
@@ -194,5 +198,6 @@
 			sphereButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/SphereButton.png")));
-			sphereButton.setBounds(new Rectangle(55, 128, 35, 32));
+			sphereButton.setBounds(new Rectangle(55, 128, 34, 32));
+	        sphereButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			sphereButton.setToolTipText(Messages.getString("SphereTip"));
 		}
@@ -204,5 +209,6 @@
 			barrelButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/BarrelButton.png")));
-			barrelButton.setBounds(new Rectangle(90, 0, 35, 32));
+			barrelButton.setBounds(new Rectangle(90, 0, 34, 32));
+	        barrelButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			barrelButton.setToolTipText(Messages.getString("BarrelTip"));
 		}
@@ -214,5 +220,6 @@
 			superButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/SuperButton.png")));
-			superButton.setBounds(new Rectangle(90, 32, 35, 32));
+			superButton.setBounds(new Rectangle(90, 32, 34, 32));
+	        superButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			superButton.setToolTipText(Messages.getString("SuperTip"));
 		}
@@ -224,5 +231,6 @@
 			floatButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/FloatButton.png")));
-			floatButton.setBounds(new Rectangle(90, 64, 35, 32));
+			floatButton.setBounds(new Rectangle(90, 64, 34, 32));
+	        floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			floatButton.setToolTipText(Messages.getString("FloatTip"));
 		}
@@ -234,5 +242,6 @@
 			beaconButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/BeaconButton.png")));
-			beaconButton.setBounds(new Rectangle(90, 96, 35, 32));
+			beaconButton.setBounds(new Rectangle(90, 96, 34, 32));
+	        beaconButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			beaconButton.setToolTipText(Messages.getString("BeaconTip"));
 		}
@@ -244,5 +253,6 @@
 			towerButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/TowerButton.png")));
-			towerButton.setBounds(new Rectangle(90, 128, 35, 32));
+			towerButton.setBounds(new Rectangle(90, 128, 34, 32));
+	        towerButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			towerButton.setToolTipText(Messages.getString("TowerTip"));
 		}
@@ -254,5 +264,6 @@
 			whiteButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/WhiteButton.png")));
-			whiteButton.setBounds(new Rectangle(0, 16, 54, 16));
+			whiteButton.setBounds(new Rectangle(0, 16, 52, 16));
+	        whiteButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			whiteButton.setToolTipText(tr("White"));
 		}
@@ -264,5 +275,6 @@
 			redButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/RedButton.png")));
-			redButton.setBounds(new Rectangle(0, 32, 54, 16));
+			redButton.setBounds(new Rectangle(0, 32, 52, 16));
+	        redButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			redButton.setToolTipText(tr("Red"));
 		}
@@ -274,5 +286,6 @@
 			orangeButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/OrangeButton.png")));
-			orangeButton.setBounds(new Rectangle(0, 48, 54, 16));
+			orangeButton.setBounds(new Rectangle(0, 48, 52, 16));
+	        orangeButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			orangeButton.setToolTipText(tr("Orange"));
 		}
@@ -284,5 +297,6 @@
 			amberButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/AmberButton.png")));
-			amberButton.setBounds(new Rectangle(0, 64, 54, 16));
+			amberButton.setBounds(new Rectangle(0, 64, 52, 16));
+	        amberButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			amberButton.setToolTipText(tr("Amber"));
 		}
@@ -294,5 +308,6 @@
 			yellowButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/YellowButton.png")));
-			yellowButton.setBounds(new Rectangle(0, 80, 54, 16));
+			yellowButton.setBounds(new Rectangle(0, 80, 52, 16));
+	        yellowButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			yellowButton.setToolTipText(tr("Yellow"));
 		}
@@ -304,5 +319,6 @@
 			greenButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/GreenButton.png")));
-			greenButton.setBounds(new Rectangle(0, 96, 54, 16));
+			greenButton.setBounds(new Rectangle(0, 96, 52, 16));
+	        greenButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			greenButton.setToolTipText(tr("Green"));
 		}
@@ -314,5 +330,6 @@
 			blueButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/BlueButton.png")));
-			blueButton.setBounds(new Rectangle(0, 112, 54, 16));
+			blueButton.setBounds(new Rectangle(0, 112, 52, 16));
+	        blueButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			blueButton.setToolTipText(tr("Blue"));
 		}
@@ -324,5 +341,6 @@
 			violetButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/VioletButton.png")));
-			violetButton.setBounds(new Rectangle(0, 128, 54, 16));
+			violetButton.setBounds(new Rectangle(0, 128, 52, 16));
+	        violetButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			violetButton.setToolTipText(tr("Violet"));
 		}
@@ -334,5 +352,6 @@
 			blackButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/BlackButton.png")));
-			blackButton.setBounds(new Rectangle(0, 144, 54, 16));
+			blackButton.setBounds(new Rectangle(0, 144, 52, 16));
+	        blackButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			blackButton.setToolTipText(tr("Black"));
 		}
Index: /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java
===================================================================
--- /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java	(revision 24723)
+++ /applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/panels/PanelStbd.java	(revision 24724)
@@ -58,14 +58,6 @@
 		ActionListener alRegion = new ActionListener() {
 			public void actionPerformed(java.awt.event.ActionEvent e) {
-				if (regionAButton.isSelected()) {
-					regionAButton.setEnabled(false);
-				} else {
-					regionAButton.setEnabled(true);
-				}
-				if (regionBButton.isSelected()) {
-					regionBButton.setEnabled(false);
-				} else {
-					regionBButton.setEnabled(true);
-				}
+				regionAButton.setBorderPainted(regionAButton.isSelected());
+				regionBButton.setBorderPainted(regionBButton.isSelected());
 			}
 		};
@@ -83,11 +75,11 @@
 		ActionListener alShape = new ActionListener() {
 			public void actionPerformed(java.awt.event.ActionEvent e) {
-				pillarButton.setEnabled(!pillarButton.isSelected());
-				sparButton.setEnabled(!sparButton.isSelected());
-				coneButton.setEnabled(!coneButton.isSelected());
-				floatButton.setEnabled(!floatButton.isSelected());
-				beaconButton.setEnabled(!beaconButton.isSelected());
-				towerButton.setEnabled(!towerButton.isSelected());
-				perchButton.setEnabled(!perchButton.isSelected());
+				pillarButton.setBorderPainted(pillarButton.isSelected());
+				sparButton.setBorderPainted(sparButton.isSelected());
+				coneButton.setBorderPainted(coneButton.isSelected());
+				floatButton.setBorderPainted(floatButton.isSelected());
+				beaconButton.setBorderPainted(beaconButton.isSelected());
+				towerButton.setBorderPainted(towerButton.isSelected());
+				perchButton.setBorderPainted(perchButton.isSelected());
 			}
 		};
@@ -105,5 +97,6 @@
 			regionAButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/RegionAButton.png")));
-			regionAButton.setBounds(new Rectangle(0, 2, 35, 30));
+			regionAButton.setBounds(new Rectangle(0, 2, 34, 30));
+	        regionAButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			regionAButton.setToolTipText(Messages.getString("RegionATip"));
 		}
@@ -115,5 +108,6 @@
 			regionBButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/RegionBButton.png")));
-			regionBButton.setBounds(new Rectangle(0, 32, 35, 30));
+			regionBButton.setBounds(new Rectangle(0, 32, 34, 30));
+	        regionBButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			regionBButton.setToolTipText(Messages.getString("RegionBTip"));
 		}
@@ -125,5 +119,6 @@
 			pillarButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/PillarButton.png")));
-			pillarButton.setBounds(new Rectangle(0, 64, 35, 32));
+			pillarButton.setBounds(new Rectangle(0, 64, 34, 32));
+	        pillarButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			pillarButton.setToolTipText(Messages.getString("PillarTip"));
 		}
@@ -135,5 +130,6 @@
 			sparButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/SparButton.png")));
-			sparButton.setBounds(new Rectangle(0, 96, 35, 32));
+			sparButton.setBounds(new Rectangle(0, 96, 34, 32));
+	        sparButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			sparButton.setToolTipText(Messages.getString("SparTip"));
 		}
@@ -145,5 +141,6 @@
 			coneButton = new JRadioButton(new ImageIcon(getClass().getResource(
 					"/images/ConeButton.png")));
-			coneButton.setBounds(new Rectangle(0, 128, 35, 32));
+			coneButton.setBounds(new Rectangle(0, 128, 34, 32));
+	        coneButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			coneButton.setToolTipText(Messages.getString("ConeTip"));
 		}
@@ -155,5 +152,6 @@
 			floatButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/FloatButton.png")));
-			floatButton.setBounds(new Rectangle(35, 0, 35, 32));
+			floatButton.setBounds(new Rectangle(35, 0, 34, 32));
+	        floatButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			floatButton.setToolTipText(Messages.getString("FloatTip"));
 		}
@@ -165,5 +163,6 @@
 			beaconButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/BeaconButton.png")));
-			beaconButton.setBounds(new Rectangle(35, 32, 35, 32));
+			beaconButton.setBounds(new Rectangle(35, 32, 34, 32));
+	        beaconButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			beaconButton.setToolTipText(Messages.getString("BeaconTip"));
 		}
@@ -175,5 +174,6 @@
 			towerButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/TowerButton.png")));
-			towerButton.setBounds(new Rectangle(35, 64, 35, 32));
+			towerButton.setBounds(new Rectangle(35, 64, 34, 32));
+	        towerButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			towerButton.setToolTipText(Messages.getString("TowerTip"));
 		}
@@ -185,5 +185,6 @@
 			perchButton = new JRadioButton(new ImageIcon(getClass()
 					.getResource("/images/PerchSButton.png")));
-			perchButton.setBounds(new Rectangle(35, 96, 35, 32));
+			perchButton.setBounds(new Rectangle(35, 96, 34, 32));
+	        perchButton.setBorder(BorderFactory.createLineBorder(Color.magenta, 2));
 			perchButton.setToolTipText(Messages.getString("PerchTip"));
 		}
