diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar b/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar
index 78d41e60..7e394049 100644
Binary files a/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar and b/ diy-layout-creator --username bancika@gmail.com/DIYLC/library/main.jar differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/IDIYComponent.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/IDIYComponent.java
index 916429db..7419f262 100644
--- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/IDIYComponent.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/IDIYComponent.java	
@@ -1,5 +1,6 @@
 package org.diylc.core;
 
+import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.Point;
 import java.io.Serializable;
@@ -38,6 +39,8 @@ public interface IDIYComponent<T> extends Serializable {
 	public static final int ABOVE_BOARD = 6;
 	public static final int COMPONENT = 7;
 	public static final int ABOVE_COMPONENT = 8;
+	
+	public static Color SELECTION_COLOR = Color.red;
 
 	/**
 	 * @return component instance name.
diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/lib/diylc.jar b/ diy-layout-creator --username bancika@gmail.com/Library/lib/diylc.jar
index c4d83374..5133853b 100644
Binary files a/ diy-layout-creator --username bancika@gmail.com/Library/lib/diylc.jar and b/ diy-layout-creator --username bancika@gmail.com/Library/lib/diylc.jar differ
diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/boards/AbstractBoard.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/boards/AbstractBoard.java
index 9133195a..5ebd76f8 100644
--- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/boards/AbstractBoard.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/boards/AbstractBoard.java	
@@ -43,7 +43,8 @@ public abstract class AbstractBoard extends AbstractTransparentComponent<String>
 					- controlPoints[0].x, controlPoints[1].y - controlPoints[0].y);
 			g2d.setComposite(oldComposite);
 		}
-		g2d.setColor(borderColor);
+		g2d.setColor(componentState == ComponentState.SELECTED
+				|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : borderColor);
 		g2d.drawRect(controlPoints[0].x, controlPoints[0].y, controlPoints[1].x
 				- controlPoints[0].x, controlPoints[1].y - controlPoints[0].y);
 	}
diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java
index dfecbf01..678d160b 100644
--- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java	
@@ -168,7 +168,8 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
 				g2d.setComposite(oldComposite);
 			}
 			g2d.setStroke(new BasicStroke());
-			g2d.setColor(BORDER_COLOR);
+			g2d.setColor(componentState == ComponentState.SELECTED
+					|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : BORDER_COLOR);
 			g2d.draw(body);
 		}
 		// Draw lugs.
diff --git a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/semiconductors/DIL_IC.java b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/semiconductors/DIL_IC.java
index db947917..191dbd46 100644
--- a/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/semiconductors/DIL_IC.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/Library/src/org/diylc/components/semiconductors/DIL_IC.java	
@@ -34,7 +34,6 @@ public class DIL_IC extends AbstractTransparentComponent<String> {
 	public static Color PIN_BORDER_COLOR = PIN_COLOR.darker();
 	public static Color INDENT_COLOR = Color.lightGray;
 	public static Color LABEL_COLOR = Color.white;
-	public static Color LABEL_COLOR_SELECTED = Color.red;
 	public static int EDGE_RADIUS = 6;
 	public static Size PIN_SIZE = new Size(0.04d, SizeUnit.in);
 	public static Size INDENT_SIZE = new Size(0.15d, SizeUnit.in);
@@ -229,19 +228,15 @@ public class DIL_IC extends AbstractTransparentComponent<String> {
 			g2d.fill(getBody());
 			g2d.setComposite(oldComposite);
 		}
-		g2d.setColor(BORDER_COLOR);
+		g2d.setColor(componentState == ComponentState.SELECTED
+				|| componentState == ComponentState.DRAGGING ? SELECTION_COLOR : BORDER_COLOR);
 		g2d.setStroke(new BasicStroke());
 		g2d.draw(getBody());
 		// Draw label.
 		g2d.setFont(Constants.LABEL_FONT);
-		switch (componentState) {
-		case DRAGGING:
+		if (componentState == ComponentState.DRAGGING) {
 			g2d.setColor(BORDER_COLOR);
-			break;
-		case SELECTED:
-			g2d.setColor(LABEL_COLOR_SELECTED);
-			break;
-		default:
+		} else {
 			g2d.setColor(LABEL_COLOR);
 		}
 		FontMetrics fontMetrics = g2d.getFontMetrics(g2d.getFont());