diff --git a/diylc/diylc-core/src/org/diylc/components/AbstractComponent.java b/diylc/diylc-core/src/org/diylc/components/AbstractComponent.java
index 5126a647..843ba7e3 100644
--- a/diylc/diylc-core/src/org/diylc/components/AbstractComponent.java
+++ b/diylc/diylc-core/src/org/diylc/components/AbstractComponent.java
@@ -41,7 +41,7 @@ public abstract class AbstractComponent<T> implements IDIYComponent<T> {
   public static Color LABEL_COLOR = Color.black;
   public static Color LABEL_COLOR_SELECTED = Color.red;
   public static Font LABEL_FONT = new Font("Tahoma", Font.PLAIN, 14);
-  public static Color METAL_COLOR = Color.decode("#236B8E");
+  public static Color METAL_COLOR = Color.decode("#759DAF");
   public static Color COPPER_COLOR = Color.decode("#DA8A67");
 
   @EditableProperty(defaultable = false)
diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
index 306eeb52..579f2162 100644
Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ
diff --git a/diylc/diylc-library/src/org/diylc/components/guitar/LPSwitch.java b/diylc/diylc-library/src/org/diylc/components/guitar/LPSwitch.java
index cd6cb49a..5181ae7b 100644
--- a/diylc/diylc-library/src/org/diylc/components/guitar/LPSwitch.java
+++ b/diylc/diylc-library/src/org/diylc/components/guitar/LPSwitch.java
@@ -155,19 +155,19 @@ public class LPSwitch extends AbstractTransparentComponent<String> {
       int terminalSpacing = (int) TERMINAL_SPACING.convertToPixels();
 
       GeneralPath terminalPath = new GeneralPath(GeneralPath.WIND_EVEN_ODD);
-      terminalPath.moveTo(x - waferThickness * 3 / 2, bodyY);
+      terminalPath.moveTo(x - waferThickness * 3 / 2, bodyY + 1);
       terminalPath.lineTo(x - waferThickness * 3 / 2, bodyY + baseLength);
       terminalPath.lineTo(x, y + length);
 
-      terminalPath.moveTo(x + waferThickness * 3 / 2, bodyY);
+      terminalPath.moveTo(x + waferThickness * 3 / 2, bodyY + 1);
       terminalPath.lineTo(x + waferThickness * 3 / 2, bodyY + baseLength);
       terminalPath.lineTo(x, y + length);
 
-      terminalPath.moveTo(x - waferThickness * 5 / 2, bodyY);
+      terminalPath.moveTo(x - waferThickness * 5 / 2, bodyY + 1);
       terminalPath.lineTo(x - waferThickness * 5 / 2, bodyY + baseLength);
       terminalPath.lineTo(x - terminalSpacing, y + length);
 
-      terminalPath.moveTo(x + waferThickness * 5 / 2, bodyY);
+      terminalPath.moveTo(x + waferThickness * 5 / 2, bodyY + 1);
       terminalPath.lineTo(x + waferThickness * 5 / 2, bodyY + baseLength);
       terminalPath.lineTo(x + terminalSpacing, y + length);
       body[2] = terminalPath;
@@ -246,8 +246,10 @@ public class LPSwitch extends AbstractTransparentComponent<String> {
     g2d.drawLine(width / 2 + 2, baseLength + (width - baseLength) / 2, width / 2 + 2 - dx, baseLength
         + (width - baseLength) / 2 + dy);
 
-    g2d.drawLine(width / 2 - 5, baseLength + (width - baseLength) / 2, width / 2 - 5 - dx, baseLength + (width - baseLength) / 2 + dy);
-    g2d.drawLine(width / 2 + 5, baseLength + (width - baseLength) / 2, width / 2 + 5 + dx, baseLength + (width - baseLength) / 2 + dy);
+    g2d.drawLine(width / 2 - 5, baseLength + (width - baseLength) / 2, width / 2 - 5 - dx, baseLength
+        + (width - baseLength) / 2 + dy);
+    g2d.drawLine(width / 2 + 5, baseLength + (width - baseLength) / 2, width / 2 + 5 + dx, baseLength
+        + (width - baseLength) / 2 + dy);
   }
 
   @Override
diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index 306eeb52..579f2162 100644
Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ
diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar
index 52efaba8..59d4358d 100644
Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ