diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
index 0f294c9c..1c978f44 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/semiconductors/BridgeRectifier.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/BridgeRectifier.java
new file mode 100644
index 00000000..17bc21ca
--- /dev/null
+++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/BridgeRectifier.java
@@ -0,0 +1,616 @@
+/*
+
+    DIY Layout Creator (DIYLC).
+    Copyright (c) 2009-2018 held jointly by the individual authors.
+
+    This file is part of DIYLC.
+
+    DIYLC is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    DIYLC is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DIYLC.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+package org.diylc.components.semiconductors;
+
+import java.awt.AlphaComposite;
+import java.awt.Color;
+import java.awt.Composite;
+import java.awt.FontMetrics;
+import java.awt.Graphics2D;
+import java.awt.Point;
+import java.awt.Rectangle;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Area;
+import java.awt.geom.Ellipse2D;
+import java.awt.geom.Rectangle2D;
+import java.awt.geom.RoundRectangle2D;
+
+import org.diylc.appframework.miscutils.ConfigurationManager;
+import org.diylc.common.Display;
+import org.diylc.common.HorizontalAlignment;
+import org.diylc.common.IPlugInPort;
+import org.diylc.common.ObjectCache;
+import org.diylc.common.Orientation;
+import org.diylc.common.VerticalAlignment;
+import org.diylc.components.AbstractTransparentComponent;
+import org.diylc.components.AbstractLeadedComponent.LabelOriantation;
+import org.diylc.components.transform.DIL_ICTransformer;
+import org.diylc.core.ComponentState;
+import org.diylc.core.IDIYComponent;
+import org.diylc.core.IDrawingObserver;
+import org.diylc.core.Project;
+import org.diylc.core.Theme;
+import org.diylc.core.VisibilityPolicy;
+import org.diylc.core.annotations.ComponentDescriptor;
+import org.diylc.core.annotations.EditableProperty;
+import org.diylc.core.annotations.KeywordPolicy;
+import org.diylc.core.measures.Current;
+import org.diylc.core.measures.Size;
+import org.diylc.core.measures.SizeUnit;
+import org.diylc.core.measures.Voltage;
+import org.diylc.utils.Constants;
+
+@ComponentDescriptor(name = "Bridge Rectifier", author = "Branislav Stojkovic", category = "Semiconductors",
+    instanceNamePrefix = "BR", description = "Few variations of bridge rectifier chips", stretchable = false,
+    zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_VALUE, transformer = DIL_ICTransformer.class)
+public class BridgeRectifier extends AbstractTransparentComponent<String> {
+
+  private static final long serialVersionUID = 1L;
+  
+  private static Size MINI_LENGTH = new Size(6.35d, SizeUnit.mm);
+  private static Size MINI_WIDTH = new Size(8.3d, SizeUnit.mm);
+  private static Size MINI_HORIZONTAL_SPACING = new Size(0.3d, SizeUnit.in);
+  private static Size MINI_VERTICAL_SPACING = new Size(0.2d, SizeUnit.in);
+  
+  private static int[] MINI1_LABEL_SPACING_X = new int[] { 1, -1, -1, 1 };  
+  private static int[] MINI2_LABEL_SPACING_X = new int[] { 1, -1, 1, -1 };
+  
+  private static Size MINI_ROUND_DIAMETER = new Size(9.1d, SizeUnit.mm);
+  private static Size MINI_ROUND_SPACING = new Size(0.2d, SizeUnit.in);
+  
+  private static int[] MINI_ROUND_LABEL_SPACING_Y = new int[] { 1, 1, -1, -1 };
+  
+  private static Size INLINE_LENGTH = new Size(23.2d, SizeUnit.mm);
+  private static Size INLINE_WIDTH = new Size(2.7d, SizeUnit.mm);
+  private static Size INLINE_SPACING = new Size(0.2d, SizeUnit.in);
+  private static int[] INLINE_LABEL_SPACING_Y = new int[] { -1, -1, 1, 1 };
+
+  public static Color BODY_COLOR = Color.gray;
+  public static Color BORDER_COLOR = Color.gray.darker();
+  public static Color PIN_COLOR = Color.decode("#00B2EE");
+  public static Color PIN_BORDER_COLOR = PIN_COLOR.darker();
+  public static Color LABEL_COLOR = Color.white;
+  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.07d, SizeUnit.in);
+
+  private String value = "";
+  private Orientation orientation = Orientation.DEFAULT;
+  private Point[] controlPoints = new Point[] { new Point(0, 0), new Point(0, 0), new Point(0, 0), new Point(0, 0) };
+  private String[] pointLabels = new String[] { "+", "~", "~", "-" };
+  protected Display display = Display.BOTH;
+  private Color bodyColor = BODY_COLOR;
+  private Color borderColor = BORDER_COLOR;
+  private Color labelColor = LABEL_COLOR;
+  private RectifierType rectifierType = RectifierType.MiniDIP1;
+  private Voltage voltage;
+  private Current current;
+  transient private Area[] body;
+  private LabelOriantation labelOriantation = LabelOriantation.Directional;
+
+  public BridgeRectifier() {
+    super();
+    updateControlPoints();
+    alpha = 100;
+  }
+
+  @EditableProperty
+  public String getValue() {
+    return value;
+  }
+
+  public void setValue(String value) {
+    this.value = value;
+  }
+
+  @EditableProperty
+  public Orientation getOrientation() {
+    return orientation;
+  }
+
+  public void setOrientation(Orientation orientation) {
+    this.orientation = orientation;
+    updateControlPoints();
+    // Reset body shape.
+    body = null;
+  }
+
+  @EditableProperty
+  public Display getDisplay() {
+    if (display == null) {
+      display = Display.VALUE;
+    }
+    return display;
+  }
+
+  public void setDisplay(Display display) {
+    this.display = display;
+  }
+
+  @Override
+  public int getControlPointCount() {
+    return controlPoints.length;
+  }
+
+  @Override
+  public Point getControlPoint(int index) {
+    return controlPoints[index];
+  }
+
+  @Override
+  public boolean isControlPointSticky(int index) {
+    return true;
+  }
+
+  @Override
+  public VisibilityPolicy getControlPointVisibilityPolicy(int index) {
+    return VisibilityPolicy.NEVER;
+  }
+
+  @Override
+  public void setControlPoint(Point point, int index) {
+    controlPoints[index].setLocation(point);
+    body = null;
+  }
+
+  @SuppressWarnings("incomplete-switch")
+  private void updateControlPoints() {
+    Point firstPoint = controlPoints[0];
+    
+    int hSpacing;
+    int vSpacing;
+    
+    switch (rectifierType) {
+      case MiniDIP1:
+        hSpacing = (int) MINI_HORIZONTAL_SPACING.convertToPixels();
+        vSpacing = (int) MINI_VERTICAL_SPACING.convertToPixels();
+        controlPoints[1].setLocation(firstPoint.x + hSpacing, firstPoint.y);
+        controlPoints[2].setLocation(firstPoint.x + hSpacing, firstPoint.y + vSpacing);        
+        controlPoints[3].setLocation(firstPoint.x, firstPoint.y + vSpacing);
+        break;
+      case MiniDIP2:
+        hSpacing = (int) MINI_HORIZONTAL_SPACING.convertToPixels();
+        vSpacing = (int) MINI_VERTICAL_SPACING.convertToPixels();
+        controlPoints[1].setLocation(firstPoint.x + hSpacing, firstPoint.y);
+        controlPoints[2].setLocation(firstPoint.x, firstPoint.y + vSpacing);
+        controlPoints[3].setLocation(firstPoint.x + hSpacing, firstPoint.y + vSpacing);                
+        break;
+      case MiniRound1:
+        hSpacing = vSpacing = (int) MINI_ROUND_SPACING.convertToPixels();
+        controlPoints[1].setLocation(firstPoint.x + hSpacing, firstPoint.y);
+        controlPoints[2].setLocation(firstPoint.x + hSpacing, firstPoint.y + vSpacing);        
+        controlPoints[3].setLocation(firstPoint.x, firstPoint.y + vSpacing);
+        break;
+      case MiniRound2:
+        hSpacing = vSpacing = (int) MINI_ROUND_SPACING.convertToPixels();
+        controlPoints[1].setLocation(firstPoint.x + hSpacing, firstPoint.y);
+        controlPoints[2].setLocation(firstPoint.x, firstPoint.y + vSpacing);
+        controlPoints[3].setLocation(firstPoint.x + hSpacing, firstPoint.y + vSpacing); 
+        break;
+      case InLine:
+        vSpacing = (int) INLINE_SPACING.convertToPixels();
+        controlPoints[1].setLocation(firstPoint.x, firstPoint.y + vSpacing);
+        controlPoints[2].setLocation(firstPoint.x, firstPoint.y + 2 * vSpacing);
+        controlPoints[3].setLocation(firstPoint.x, firstPoint.y + 3 * vSpacing);
+        break;      
+    }
+
+    if (orientation != Orientation.DEFAULT) {
+      double theta = 0;
+      switch (orientation) {
+        case _90:
+          theta = Math.PI / 2;
+          break;
+        case _180:
+          theta = Math.PI;
+          break;
+        case _270:
+          theta = Math.PI * 3 / 2;
+          break;
+      }
+      AffineTransform rotation = AffineTransform.getRotateInstance(theta, firstPoint.x, firstPoint.y);
+
+      for (int i = 1; i < controlPoints.length; i++) {
+        rotation.transform(controlPoints[i], controlPoints[i]);
+      }      
+    }
+  }
+
+  public Area[] getBody() {
+    if (body == null) {
+      body = new Area[2];
+      
+      int centerX = (controlPoints[0].x + controlPoints[1].x + controlPoints[2].x + controlPoints[3].x) / 4;
+      int centerY = (controlPoints[0].y + controlPoints[1].y + controlPoints[2].y + controlPoints[3].y) / 4;
+      
+      int width = 0;
+      int length = 0;
+      
+      switch (rectifierType) {
+        case MiniDIP1:
+        case MiniDIP2:
+          length = (int) MINI_LENGTH.convertToPixels();
+          width = (int) MINI_WIDTH.convertToPixels();
+          break;
+        case MiniRound1:
+        case MiniRound2:
+          length = width = (int) MINI_ROUND_DIAMETER.convertToPixels();
+          break;
+        case InLine:
+          length = (int) INLINE_WIDTH.convertToPixels();
+          width = (int) INLINE_LENGTH.convertToPixels();
+          break;
+      }
+      
+      if (orientation == Orientation._90 || orientation == Orientation._270) {
+        int p = length;
+        length = width;
+        width = p;
+      }
+      
+      switch (rectifierType) {
+        case MiniDIP1:
+        case MiniDIP2:
+        case InLine:
+          body[0] = new Area(new RoundRectangle2D.Double(centerX - length / 2, centerY - width / 2, length, width, EDGE_RADIUS, EDGE_RADIUS));
+          break;
+        case MiniRound1:
+        case MiniRound2:
+          body[0] = new Area(new Ellipse2D.Double(centerX - length / 2, centerY - width / 2, length, width));
+          break;
+      }
+    }
+    return body;
+  }
+
+  @SuppressWarnings("incomplete-switch")
+  @Override
+  public void draw(Graphics2D g2d, ComponentState componentState, boolean outlineMode, Project project,
+      IDrawingObserver drawingObserver) {
+    if (checkPointsClipped(g2d.getClip())) {
+      return;
+    }
+    Area mainArea = getBody()[0];
+    
+    int pinSize = (int) PIN_SIZE.convertToPixels() / 2 * 2;
+    
+    // smaller pin for round
+    if (rectifierType == RectifierType.InLine || rectifierType == RectifierType.MiniRound1 || rectifierType == RectifierType.MiniRound2)
+      pinSize *= 0.8;
+    
+    if (!outlineMode) {      
+      for (Point point : controlPoints) {
+        g2d.setColor(PIN_COLOR);
+        if (rectifierType == RectifierType.InLine || rectifierType == RectifierType.MiniRound1 || rectifierType == RectifierType.MiniRound2)
+          g2d.fillOval(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize);
+        else
+          g2d.fillRect(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize);
+        g2d.setColor(PIN_BORDER_COLOR);
+        if (rectifierType == RectifierType.InLine || rectifierType == RectifierType.MiniRound1 || rectifierType == RectifierType.MiniRound2)
+          g2d.drawOval(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize);
+        else 
+          g2d.drawRect(point.x - pinSize / 2, point.y - pinSize / 2, pinSize, pinSize);
+      }
+    }
+    
+    Composite oldComposite = g2d.getComposite();
+    if (alpha < MAX_ALPHA) {
+      g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
+    }
+    g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : getBodyColor());
+    g2d.fill(mainArea);
+    g2d.setComposite(oldComposite);
+
+    Color finalBorderColor;
+    if (outlineMode) {
+      Theme theme =
+          (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
+      finalBorderColor =
+          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
+              : theme.getOutlineColor();
+    } else {
+      finalBorderColor =
+          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
+              : getBorderColor();
+    }
+    g2d.setColor(finalBorderColor);
+    g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
+    if (outlineMode) {
+      Area area = new Area(mainArea);
+      area.subtract(getBody()[1]);
+      g2d.draw(area);
+    } else {
+      g2d.draw(mainArea);
+//      if (getBody()[1] != null) {
+//        g2d.setColor(getIndentColor());
+//        g2d.fill(getBody()[1]);
+//      }
+    }
+
+    drawingObserver.stopTracking();
+
+    // Draw label.
+    g2d.setFont(project.getFont());
+    Color finalLabelColor;
+    if (outlineMode) {
+      Theme theme =
+          (Theme) ConfigurationManager.getInstance().readObject(IPlugInPort.THEME_KEY, Constants.DEFAULT_THEME);
+      finalLabelColor =
+          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED
+              : theme.getOutlineColor();
+    } else {
+      finalLabelColor =
+          componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? LABEL_COLOR_SELECTED
+              : getLabelColor();
+    }
+    g2d.setColor(finalLabelColor);
+    FontMetrics fontMetrics = g2d.getFontMetrics(g2d.getFont());
+    String[] label = null;
+
+    if (getDisplay() == Display.NAME) {
+      label = new String[] {getName()};
+    } else if (getDisplay() == Display.VALUE) {
+      label = new String[] {getValue().toString()};
+    } else if (getDisplay() == Display.BOTH) {
+      String value = getValue().toString();
+      label = value.isEmpty() ? new String[] {getName()} : new String[] {getName(), value};
+    }
+
+    if (label != null) {
+      for (int i = 0; i < label.length; i++) {
+        String l = label[i];
+        Rectangle2D rect = fontMetrics.getStringBounds(l, g2d);
+        int textHeight = (int) (rect.getHeight());
+        int textWidth = (int) (rect.getWidth());
+        // Center text horizontally and vertically
+        Rectangle bounds = mainArea.getBounds();
+        int x = bounds.x + (bounds.width - textWidth) / 2;
+        int y = bounds.y + (bounds.height - textHeight) / 2 + fontMetrics.getAscent();
+
+        AffineTransform oldTransform = g2d.getTransform();
+
+        if (getLabelOriantation() == LabelOriantation.Directional && (getOrientation() == Orientation.DEFAULT || getOrientation() == Orientation._180)) {
+          int centerX = bounds.x + bounds.width / 2;
+          int centerY = bounds.y + bounds.height / 2;
+          g2d.rotate(-Math.PI / 2, centerX, centerY);
+        }
+
+        if (label.length == 2) {
+          if (i == 0)
+            g2d.translate(0, -textHeight / 2);
+          else if (i == 1)
+            g2d.translate(0, textHeight / 2);
+        }
+
+        g2d.drawString(l, x, y);
+
+        g2d.setTransform(oldTransform);
+      }
+    }
+
+    // draw pin numbers    
+    g2d.setFont(project.getFont().deriveFont((float) (project.getFont().getSize2D() * 0.8)));
+    g2d.setColor(finalLabelColor);
+    for (int i = 0; i <controlPoints.length; i++) {
+      Point point = controlPoints[i];            
+      
+      int dx = 0;
+      int dy = 0;
+      
+      // determine label offset
+      switch (rectifierType) {
+        case MiniDIP1:
+          dx = pinSize * MINI1_LABEL_SPACING_X[i];
+          break;
+        case MiniDIP2:
+          dx = pinSize * MINI2_LABEL_SPACING_X[i];
+          break;  
+        case MiniRound1:
+        case MiniRound2:
+          dy = pinSize * MINI_ROUND_LABEL_SPACING_Y[i];
+          break;
+        case InLine:
+          dy = pinSize * INLINE_LABEL_SPACING_Y[i];
+          break;
+      }
+      
+      dx = (int) (1.5 * dx);
+      dy = (int) (1.5 * dy);
+      
+      // now apply the correct rotation
+      switch (rectifierType) {
+        case MiniDIP1:         
+        case MiniDIP2:
+          switch (orientation) {
+            case _90:        
+              int p1 = dx;
+              dx = dy;
+              dy = p1;
+              break;
+            case _180:
+              dx = - dx;
+              dy = - dy;
+              break;
+            case _270:
+              int p2 = dx;
+              dx = -dy;
+              dy = -p2;
+              break;
+          }
+          break;  
+        case MiniRound1:
+        case MiniRound2:
+          switch (orientation) {
+            case _90:        
+              int p1 = dx;
+              dx = -dy;
+              dy = -p1;
+              break;
+            case _180:
+              dx = - dx;
+              dy = - dy;
+              break;
+            case _270:
+              int p2 = dx;
+              dx = dy;
+              dy = p2;
+              break;
+          }
+          break;
+        case InLine:
+          switch (orientation) {
+            case _90:        
+              int p1 = dx;
+              dx = -dy;
+              dy = -p1;
+              break;
+            case _180:
+              dx = -dx;
+              dy = -dy;
+              break;
+            case _270:
+              int p2 = dx;
+              dx = dy;
+              dy = p2;
+              break;
+          }
+          break;
+      }         
+      
+      drawCenteredText(g2d, pointLabels[i], point.x + dx, point.y + dy, HorizontalAlignment.CENTER, VerticalAlignment.CENTER);
+    }
+  }
+
+  @Override
+  public void drawIcon(Graphics2D g2d, int width, int height) {
+    int margin = (int) (2f * width / 32);
+    Area area = new Area(new Ellipse2D.Double(margin / 2, margin, width - 2 * margin, width - 2 * margin));
+    g2d.setColor(BODY_COLOR);
+    g2d.fill(area);
+    g2d.setColor(BORDER_COLOR);
+    g2d.draw(area);
+    g2d.setColor(PIN_COLOR);
+    int pinSize = 2 * width / 32;    
+    g2d.fillOval(width * 2 / 8, height * 2 / 8, pinSize, pinSize);
+    g2d.fillOval(width * 6 / 8 - pinSize, height * 2 / 8, pinSize, pinSize);
+    g2d.fillOval(width * 6 / 8 - pinSize, height * 6 / 8 - pinSize, pinSize, pinSize);
+    g2d.fillOval(width * 2 / 8, height * 6 / 8 - pinSize, pinSize, pinSize);
+    g2d.setColor(LABEL_COLOR);
+    g2d.setFont(LABEL_FONT.deriveFont(8f * width / 32));
+    drawCenteredText(g2d, "+", width * 2 / 8 + 1, height * 2 / 8 + 4 * width / 32, HorizontalAlignment.CENTER, VerticalAlignment.CENTER);
+    drawCenteredText(g2d, "-", width * 2 / 8 + 1, height * 6 / 8 - 5 * width / 32, HorizontalAlignment.CENTER, VerticalAlignment.CENTER);
+    drawCenteredText(g2d, "~", width * 6 / 8 - 2 * width / 32, height * 2 / 8 + 5 * width / 32, HorizontalAlignment.CENTER, VerticalAlignment.CENTER);
+    drawCenteredText(g2d, "~", width * 6 / 8 - 2 * width / 32, height * 6 / 8 - 5 * width / 32, HorizontalAlignment.CENTER, VerticalAlignment.CENTER);
+  }
+
+  @EditableProperty(name = "Body")
+  public Color getBodyColor() {
+    if (bodyColor == null) {
+      bodyColor = BODY_COLOR;
+    }
+    return bodyColor;
+  }
+
+  public void setBodyColor(Color bodyColor) {
+    this.bodyColor = bodyColor;
+  }
+
+  @EditableProperty(name = "Border")
+  public Color getBorderColor() {
+    if (borderColor == null) {
+      borderColor = BORDER_COLOR;
+    }
+    return borderColor;
+  }
+
+  public void setBorderColor(Color borderColor) {
+    this.borderColor = borderColor;
+  }
+
+  @EditableProperty(name = "Label")
+  public Color getLabelColor() {
+    if (labelColor == null) {
+      labelColor = LABEL_COLOR;
+    }
+    return labelColor;
+  }
+
+  public void setLabelColor(Color labelColor) {
+    this.labelColor = labelColor;
+  }
+
+  @EditableProperty(name = "Type")
+  public RectifierType getRectifierType() {
+    return rectifierType;
+  }
+  
+  public void setRectifierType(RectifierType rectifierType) {
+    this.rectifierType = rectifierType;
+    updateControlPoints();
+    body = null;
+  }
+  
+  @EditableProperty
+  public Current getCurrent() {
+    return current;
+  }
+  
+  public void setCurrent(Current current) {
+    this.current = current;
+  }
+  
+  @EditableProperty
+  public Voltage getVoltage() {
+    return voltage;
+  }
+  
+  public void setVoltage(Voltage voltage) {
+    this.voltage = voltage;
+  }
+  
+  @EditableProperty(name = "Label Orientation")
+  public LabelOriantation getLabelOriantation() {
+    if (labelOriantation == null)
+      labelOriantation = LabelOriantation.Directional;
+    return labelOriantation;
+  }
+  
+  public void setLabelOriantation(LabelOriantation labelOriantation) {
+    this.labelOriantation = labelOriantation;
+  }
+
+  public static enum RectifierType {
+    
+    MiniDIP1("DFM 1"), MiniDIP2("DFM 2"), MiniRound1("Round WOG 1"), MiniRound2("Round WOG 2"), InLine("In-Line D-44");
+    
+    private String label;
+    private RectifierType(String label) {
+      this.label = label;
+    }
+    
+    @Override
+    public String toString() {
+      return label;
+    }
+
+  }
+}
diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO1.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO1.java
index 3d961de0..cd603479 100644
--- a/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO1.java
+++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/TransistorTO1.java
@@ -284,7 +284,7 @@ public class TransistorTO1 extends AbstractTransparentComponent<String> {
 
   @Override
   public void drawIcon(Graphics2D g2d, int width, int height) {
-    int margin = 2 * width / 32;
+    int margin = (int) (2f * width / 32);
     Area area = new Area(new Ellipse2D.Double(margin / 2, margin, width - 2 * margin, width - 2 * margin));
     g2d.setColor(BODY_COLOR);
     g2d.fill(area);
diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index ca39ce1e..1c978f44 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 33255609..e14544ff 100644
Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ
diff --git a/diylc/diylc-swing/update.xml b/diylc/diylc-swing/update.xml
index cacecde2..96cb16a4 100644
--- a/diylc/diylc-swing/update.xml
+++ b/diylc/diylc-swing/update.xml
@@ -2213,6 +2213,10 @@
 				<org.diylc.appframework.update.Change>
 					<changeType>NEW_FEATURE</changeType>
 					<description>"Fuse Holder" added</description>
+				</org.diylc.appframework.update.Change>	
+				<org.diylc.appframework.update.Change>
+					<changeType>NEW_FEATURE</changeType>
+					<description>"Bridge Rectifier" added</description>
 				</org.diylc.appframework.update.Change>				
 				<org.diylc.appframework.update.Change>
 					<changeType>NEW_FEATURE</changeType>
diff --git a/diylc/diylc-swing/variants.xml b/diylc/diylc-swing/variants.xml
index 1b65c3b1..f34d3a89 100644
--- a/diylc/diylc-swing/variants.xml
+++ b/diylc/diylc-swing/variants.xml
@@ -18,14 +18,6 @@
             <string>Alpha</string>
             <byte>127</byte>
           </entry>
-          <entry>
-            <string>Model</string>
-            <string></string>
-          </entry>
-          <entry>
-            <string>Orientation</string>
-            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
-          </entry>
           <entry>
             <string>Pole Color</string>
             <awt-color>
@@ -35,6 +27,14 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
+          <entry>
+            <string>Orientation</string>
+            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
+          </entry>
+          <entry>
+            <string>Model</string>
+            <string></string>
+          </entry>
           <entry>
             <string>Type</string>
             <org.diylc.components.guitar.SingleCoilPickup_-SingleCoilType>Stratocaster</org.diylc.components.guitar.SingleCoilPickup_-SingleCoilType>
@@ -73,16 +73,16 @@
             <byte>127</byte>
           </entry>
           <entry>
-            <string>Model</string>
-            <string></string>
+            <string>Pole Color</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
           </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
           </entry>
           <entry>
-            <string>Pole Color</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[5]/awt-color"/>
+            <string>Model</string>
+            <string></string>
           </entry>
           <entry>
             <string>Type</string>
@@ -117,16 +117,16 @@
             <byte>127</byte>
           </entry>
           <entry>
-            <string>Model</string>
-            <string></string>
+            <string>Pole Color</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
           </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
           </entry>
           <entry>
-            <string>Pole Color</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[5]/awt-color"/>
+            <string>Model</string>
+            <string></string>
           </entry>
           <entry>
             <string>Type</string>
@@ -161,16 +161,16 @@
             <byte>127</byte>
           </entry>
           <entry>
-            <string>Model</string>
-            <string></string>
+            <string>Pole Color</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
           </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
           </entry>
           <entry>
-            <string>Pole Color</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[5]/awt-color"/>
+            <string>Model</string>
+            <string></string>
           </entry>
           <entry>
             <string>Type</string>
@@ -205,16 +205,16 @@
             <byte>127</byte>
           </entry>
           <entry>
-            <string>Model</string>
-            <string></string>
+            <string>Pole Color</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
           </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
           </entry>
           <entry>
-            <string>Pole Color</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[5]/awt-color"/>
+            <string>Model</string>
+            <string></string>
           </entry>
           <entry>
             <string>Type</string>
@@ -249,16 +249,16 @@
             <byte>127</byte>
           </entry>
           <entry>
-            <string>Model</string>
-            <string></string>
+            <string>Pole Color</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
           </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
           </entry>
           <entry>
-            <string>Pole Color</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[5]/awt-color"/>
+            <string>Model</string>
+            <string></string>
           </entry>
           <entry>
             <string>Type</string>
@@ -289,6 +289,10 @@
       <org.diylc.core.Template>
         <name>DPDT</name>
         <values>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </entry>
           <entry>
             <string>Body</string>
             <awt-color>
@@ -298,18 +302,10 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
-          <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
-          </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.OrientationHV>VERTICAL</org.diylc.common.OrientationHV>
           </entry>
-          <entry>
-            <string>Type</string>
-            <org.diylc.components.electromechanical.ToggleSwitchType>DPDT</org.diylc.components.electromechanical.ToggleSwitchType>
-          </entry>
           <entry>
             <string>Border</string>
             <awt-color>
@@ -319,6 +315,10 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
+          <entry>
+            <string>Type</string>
+            <org.diylc.components.electromechanical.ToggleSwitchType>DPDT</org.diylc.components.electromechanical.ToggleSwitchType>
+          </entry>
           <entry>
             <string>Spacing</string>
             <org.diylc.core.measures.Size>
@@ -358,25 +358,25 @@
       <org.diylc.core.Template>
         <name>SPDT</name>
         <values>
-          <entry>
-            <string>Body</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry/awt-color"/>
-          </entry>
           <entry>
             <string>Alpha</string>
             <byte>127</byte>
           </entry>
+          <entry>
+            <string>Body</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[2]/awt-color"/>
+          </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.OrientationHV>VERTICAL</org.diylc.common.OrientationHV>
           </entry>
           <entry>
-            <string>Type</string>
-            <org.diylc.components.electromechanical.ToggleSwitchType>SPDT</org.diylc.components.electromechanical.ToggleSwitchType>
+            <string>Border</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[4]/awt-color"/>
           </entry>
           <entry>
-            <string>Border</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[5]/awt-color"/>
+            <string>Type</string>
+            <org.diylc.components.electromechanical.ToggleSwitchType>SPDT</org.diylc.components.electromechanical.ToggleSwitchType>
           </entry>
           <entry>
             <string>Spacing</string>
@@ -574,6 +574,230 @@
       </org.diylc.core.Template>
     </list>
   </entry>
+  <entry>
+    <string>Semiconductors.Bridge Rectifier</string>
+    <list>
+      <org.diylc.core.Template>
+        <name>Miniature Rectangular</name>
+        <values>
+          <entry>
+            <string>Label Orientation</string>
+            <org.diylc.components.AbstractLeadedComponent_-LabelOriantation>Directional</org.diylc.components.AbstractLeadedComponent_-LabelOriantation>
+          </entry>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </entry>
+          <entry>
+            <string>Body</string>
+            <awt-color>
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Value</string>
+            <string></string>
+          </entry>
+          <entry>
+            <string>Orientation</string>
+            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
+          </entry>
+          <entry>
+            <string>Type</string>
+            <org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>MiniDIP1</org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>
+          </entry>
+          <entry>
+            <string>Border</string>
+            <awt-color>
+              <red>89</red>
+              <green>89</green>
+              <blue>89</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Voltage</string>
+            <null/>
+          </entry>
+          <entry>
+            <string>Display</string>
+            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
+          </entry>
+          <entry>
+            <string>Label</string>
+            <awt-color>
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Current</string>
+            <null/>
+          </entry>
+        </values>
+        <points>
+          <java.awt.Point>
+            <x>0</x>
+            <y>0</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>60</x>
+            <y>0</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>60</x>
+            <y>40</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>0</x>
+            <y>40</y>
+          </java.awt.Point>
+        </points>
+        <defaultFlag>false</defaultFlag>
+      </org.diylc.core.Template>
+      <org.diylc.core.Template>
+        <name>Miniature Round</name>
+        <values>
+          <entry>
+            <string>Label Orientation</string>
+            <org.diylc.components.AbstractLeadedComponent_-LabelOriantation>Directional</org.diylc.components.AbstractLeadedComponent_-LabelOriantation>
+          </entry>
+          <entry>
+            <string>Alpha</string>
+            <byte>100</byte>
+          </entry>
+          <entry>
+            <string>Body</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
+          </entry>
+          <entry>
+            <string>Value</string>
+            <string></string>
+          </entry>
+          <entry>
+            <string>Orientation</string>
+            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
+          </entry>
+          <entry>
+            <string>Type</string>
+            <org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>MiniRound1</org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>
+          </entry>
+          <entry>
+            <string>Border</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[7]/awt-color"/>
+          </entry>
+          <entry>
+            <string>Voltage</string>
+            <null/>
+          </entry>
+          <entry>
+            <string>Display</string>
+            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
+          </entry>
+          <entry>
+            <string>Label</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[10]/awt-color"/>
+          </entry>
+          <entry>
+            <string>Current</string>
+            <null/>
+          </entry>
+        </values>
+        <points>
+          <java.awt.Point>
+            <x>0</x>
+            <y>0</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>40</x>
+            <y>0</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>40</x>
+            <y>40</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>0</x>
+            <y>40</y>
+          </java.awt.Point>
+        </points>
+        <defaultFlag>false</defaultFlag>
+      </org.diylc.core.Template>
+      <org.diylc.core.Template>
+        <name>In-line</name>
+        <values>
+          <entry>
+            <string>Label Orientation</string>
+            <org.diylc.components.AbstractLeadedComponent_-LabelOriantation>Directional</org.diylc.components.AbstractLeadedComponent_-LabelOriantation>
+          </entry>
+          <entry>
+            <string>Alpha</string>
+            <byte>100</byte>
+          </entry>
+          <entry>
+            <string>Body</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
+          </entry>
+          <entry>
+            <string>Value</string>
+            <string></string>
+          </entry>
+          <entry>
+            <string>Orientation</string>
+            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
+          </entry>
+          <entry>
+            <string>Type</string>
+            <org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>InLine</org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>
+          </entry>
+          <entry>
+            <string>Border</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[7]/awt-color"/>
+          </entry>
+          <entry>
+            <string>Voltage</string>
+            <null/>
+          </entry>
+          <entry>
+            <string>Display</string>
+            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
+          </entry>
+          <entry>
+            <string>Label</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[10]/awt-color"/>
+          </entry>
+          <entry>
+            <string>Current</string>
+            <null/>
+          </entry>
+        </values>
+        <points>
+          <java.awt.Point>
+            <x>0</x>
+            <y>0</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>0</x>
+            <y>40</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>0</x>
+            <y>80</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>0</x>
+            <y>120</y>
+          </java.awt.Point>
+        </points>
+        <defaultFlag>false</defaultFlag>
+      </org.diylc.core.Template>
+    </list>
+  </entry>
   <entry>
     <string>Passive.Potentiometer</string>
     <list>
@@ -781,8 +1005,10 @@
             </awt-color>
           </entry>
           <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
+            <string>Value</string>
+            <org.diylc.core.measures.Capacitance-array>
+              <null/>
+            </org.diylc.core.measures.Capacitance-array>
           </entry>
           <entry>
             <string>Body</string>
@@ -794,10 +1020,8 @@
             </awt-color>
           </entry>
           <entry>
-            <string>Value</string>
-            <org.diylc.core.measures.Capacitance-array>
-              <null/>
-            </org.diylc.core.measures.Capacitance-array>
+            <string>Alpha</string>
+            <byte>127</byte>
           </entry>
           <entry>
             <string>Orientation</string>
@@ -812,14 +1036,14 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
-          <entry>
-            <string>Display</string>
-            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
-          </entry>
           <entry>
             <string>Voltage</string>
             <null/>
           </entry>
+          <entry>
+            <string>Display</string>
+            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
+          </entry>
           <entry>
             <string>Label</string>
             <awt-color>
@@ -871,12 +1095,8 @@
             </awt-color>
           </entry>
           <entry>
-            <string>Value</string>
-            <org.diylc.core.measures.Capacitance-array>
-              <null/>
-              <null/>
-              <null/>
-            </org.diylc.core.measures.Capacitance-array>
+            <string>Alpha</string>
+            <byte>127</byte>
           </entry>
           <entry>
             <string>Body</string>
@@ -888,8 +1108,12 @@
             </awt-color>
           </entry>
           <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
+            <string>Value</string>
+            <org.diylc.core.measures.Capacitance-array>
+              <null/>
+              <null/>
+              <null/>
+            </org.diylc.core.measures.Capacitance-array>
           </entry>
           <entry>
             <string>Orientation</string>
@@ -904,14 +1128,14 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
-          <entry>
-            <string>Voltage</string>
-            <null/>
-          </entry>
           <entry>
             <string>Display</string>
             <org.diylc.common.Display>BOTH</org.diylc.common.Display>
           </entry>
+          <entry>
+            <string>Voltage</string>
+            <null/>
+          </entry>
           <entry>
             <string>Label</string>
             <awt-color>
@@ -971,8 +1195,13 @@
             </awt-color>
           </entry>
           <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
+            <string>Value</string>
+            <org.diylc.core.measures.Capacitance-array>
+              <null/>
+              <null/>
+              <null/>
+              <null/>
+            </org.diylc.core.measures.Capacitance-array>
           </entry>
           <entry>
             <string>Body</string>
@@ -984,13 +1213,8 @@
             </awt-color>
           </entry>
           <entry>
-            <string>Value</string>
-            <org.diylc.core.measures.Capacitance-array>
-              <null/>
-              <null/>
-              <null/>
-              <null/>
-            </org.diylc.core.measures.Capacitance-array>
+            <string>Alpha</string>
+            <byte>127</byte>
           </entry>
           <entry>
             <string>Orientation</string>
@@ -1005,14 +1229,14 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
-          <entry>
-            <string>Display</string>
-            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
-          </entry>
           <entry>
             <string>Voltage</string>
             <null/>
           </entry>
+          <entry>
+            <string>Display</string>
+            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
+          </entry>
           <entry>
             <string>Label</string>
             <awt-color>
@@ -1068,19 +1292,19 @@
             <awt-color reference="../../../../org.diylc.core.Template[3]/values/entry[2]/awt-color"/>
           </entry>
           <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
+            <string>Value</string>
+            <org.diylc.core.measures.Capacitance-array>
+              <null/>
+              <null/>
+            </org.diylc.core.measures.Capacitance-array>
           </entry>
           <entry>
             <string>Body</string>
             <awt-color reference="../../../../org.diylc.core.Template[3]/values/entry[4]/awt-color"/>
           </entry>
           <entry>
-            <string>Value</string>
-            <org.diylc.core.measures.Capacitance-array>
-              <null/>
-              <null/>
-            </org.diylc.core.measures.Capacitance-array>
+            <string>Alpha</string>
+            <byte>127</byte>
           </entry>
           <entry>
             <string>Orientation</string>
@@ -1090,14 +1314,14 @@
             <string>Border</string>
             <awt-color reference="../../../../org.diylc.core.Template[3]/values/entry[7]/awt-color"/>
           </entry>
-          <entry>
-            <string>Display</string>
-            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
-          </entry>
           <entry>
             <string>Voltage</string>
             <null/>
           </entry>
+          <entry>
+            <string>Display</string>
+            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
+          </entry>
           <entry>
             <string>Label</string>
             <awt-color reference="../../../../org.diylc.core.Template[3]/values/entry[10]/awt-color"/>
@@ -1125,6 +1349,241 @@
       </org.diylc.core.Template>
     </list>
   </entry>
+  <entry>
+    <string>Semiconductors.DIP IC</string>
+    <list>
+      <org.diylc.core.Template>
+        <name>DIP8</name>
+        <values>
+          <entry>
+            <string>Row Spacing</string>
+            <org.diylc.core.measures.Size>
+              <value>0.3</value>
+              <unit class="org.diylc.core.measures.SizeUnit">in</unit>
+            </org.diylc.core.measures.Size>
+          </entry>
+          <entry>
+            <string>Pins</string>
+            <org.diylc.components.semiconductors.DIL__IC_-PinCount>_8</org.diylc.components.semiconductors.DIL__IC_-PinCount>
+          </entry>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </entry>
+          <entry>
+            <string>Body</string>
+            <awt-color reference="../../../../../../entry/list/org.diylc.core.Template/values/entry/awt-color"/>
+          </entry>
+          <entry>
+            <string>Value</string>
+            <string></string>
+          </entry>
+          <entry>
+            <string>Orientation</string>
+            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
+          </entry>
+          <entry>
+            <string>Border</string>
+            <awt-color>
+              <red>89</red>
+              <green>89</green>
+              <blue>89</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Display</string>
+            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
+          </entry>
+          <entry>
+            <string>Label</string>
+            <awt-color reference="../../../../../../entry/list/org.diylc.core.Template/values/entry[8]/awt-color"/>
+          </entry>
+          <entry>
+            <string>Display Pin #s</string>
+            <org.diylc.components.semiconductors.DIL__IC_-DisplayNumbers>NO</org.diylc.components.semiconductors.DIL__IC_-DisplayNumbers>
+          </entry>
+          <entry>
+            <string>Indent</string>
+            <awt-color>
+              <red>89</red>
+              <green>89</green>
+              <blue>89</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Pin Spacing</string>
+            <org.diylc.core.measures.Size>
+              <value>0.1</value>
+              <unit class="org.diylc.core.measures.SizeUnit">in</unit>
+            </org.diylc.core.measures.Size>
+          </entry>
+        </values>
+        <points>
+          <java.awt.Point>
+            <x>0</x>
+            <y>0</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>0</x>
+            <y>20</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>0</x>
+            <y>40</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>0</x>
+            <y>60</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>60</x>
+            <y>0</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>60</x>
+            <y>20</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>60</x>
+            <y>40</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>60</x>
+            <y>60</y>
+          </java.awt.Point>
+        </points>
+        <defaultFlag>false</defaultFlag>
+      </org.diylc.core.Template>
+      <org.diylc.core.Template>
+        <name>DIP16</name>
+        <values>
+          <entry>
+            <string>Row Spacing</string>
+            <org.diylc.core.measures.Size>
+              <value>0.3</value>
+              <unit class="org.diylc.core.measures.SizeUnit">in</unit>
+            </org.diylc.core.measures.Size>
+          </entry>
+          <entry>
+            <string>Pins</string>
+            <org.diylc.components.semiconductors.DIL__IC_-PinCount>_16</org.diylc.components.semiconductors.DIL__IC_-PinCount>
+          </entry>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </entry>
+          <entry>
+            <string>Body</string>
+            <awt-color reference="../../../../../../entry/list/org.diylc.core.Template/values/entry/awt-color"/>
+          </entry>
+          <entry>
+            <string>Value</string>
+            <string></string>
+          </entry>
+          <entry>
+            <string>Orientation</string>
+            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
+          </entry>
+          <entry>
+            <string>Border</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[7]/awt-color"/>
+          </entry>
+          <entry>
+            <string>Display</string>
+            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
+          </entry>
+          <entry>
+            <string>Label</string>
+            <awt-color reference="../../../../../../entry/list/org.diylc.core.Template/values/entry[8]/awt-color"/>
+          </entry>
+          <entry>
+            <string>Display Pin #s</string>
+            <org.diylc.components.semiconductors.DIL__IC_-DisplayNumbers>NO</org.diylc.components.semiconductors.DIL__IC_-DisplayNumbers>
+          </entry>
+          <entry>
+            <string>Indent</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[11]/awt-color"/>
+          </entry>
+          <entry>
+            <string>Pin Spacing</string>
+            <org.diylc.core.measures.Size>
+              <value>0.1</value>
+              <unit class="org.diylc.core.measures.SizeUnit">in</unit>
+            </org.diylc.core.measures.Size>
+          </entry>
+        </values>
+        <points>
+          <java.awt.Point>
+            <x>0</x>
+            <y>0</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>0</x>
+            <y>20</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>0</x>
+            <y>40</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>0</x>
+            <y>60</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>0</x>
+            <y>80</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>0</x>
+            <y>100</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>0</x>
+            <y>120</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>0</x>
+            <y>140</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>60</x>
+            <y>0</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>60</x>
+            <y>20</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>60</x>
+            <y>40</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>60</x>
+            <y>60</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>60</x>
+            <y>80</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>60</x>
+            <y>100</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>60</x>
+            <y>120</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>60</x>
+            <y>140</y>
+          </java.awt.Point>
+        </points>
+        <defaultFlag>false</defaultFlag>
+      </org.diylc.core.Template>
+    </list>
+  </entry>
   <entry>
     <string>Passive.Resistor</string>
     <list>
@@ -2021,255 +2480,20 @@
       </org.diylc.core.Template>
     </list>
   </entry>
-  <entry>
-    <string>Semiconductors.DIP IC</string>
-    <list>
-      <org.diylc.core.Template>
-        <name>DIP8</name>
-        <values>
-          <entry>
-            <string>Pins</string>
-            <org.diylc.components.semiconductors.DIL__IC_-PinCount>_8</org.diylc.components.semiconductors.DIL__IC_-PinCount>
-          </entry>
-          <entry>
-            <string>Row Spacing</string>
-            <org.diylc.core.measures.Size>
-              <value>0.3</value>
-              <unit class="org.diylc.core.measures.SizeUnit">in</unit>
-            </org.diylc.core.measures.Size>
-          </entry>
-          <entry>
-            <string>Value</string>
-            <string></string>
-          </entry>
-          <entry>
-            <string>Body</string>
-            <awt-color reference="../../../../../../entry/list/org.diylc.core.Template/values/entry/awt-color"/>
-          </entry>
-          <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
-          </entry>
-          <entry>
-            <string>Orientation</string>
-            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
-          </entry>
-          <entry>
-            <string>Border</string>
-            <awt-color>
-              <red>89</red>
-              <green>89</green>
-              <blue>89</blue>
-              <alpha>255</alpha>
-            </awt-color>
-          </entry>
-          <entry>
-            <string>Display</string>
-            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
-          </entry>
-          <entry>
-            <string>Label</string>
-            <awt-color reference="../../../../../../entry/list/org.diylc.core.Template/values/entry[8]/awt-color"/>
-          </entry>
-          <entry>
-            <string>Display Pin #s</string>
-            <org.diylc.components.semiconductors.DIL__IC_-DisplayNumbers>NO</org.diylc.components.semiconductors.DIL__IC_-DisplayNumbers>
-          </entry>
-          <entry>
-            <string>Indent</string>
-            <awt-color>
-              <red>89</red>
-              <green>89</green>
-              <blue>89</blue>
-              <alpha>255</alpha>
-            </awt-color>
-          </entry>
-          <entry>
-            <string>Pin Spacing</string>
-            <org.diylc.core.measures.Size>
-              <value>0.1</value>
-              <unit class="org.diylc.core.measures.SizeUnit">in</unit>
-            </org.diylc.core.measures.Size>
-          </entry>
-        </values>
-        <points>
-          <java.awt.Point>
-            <x>0</x>
-            <y>0</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>0</x>
-            <y>20</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>0</x>
-            <y>40</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>0</x>
-            <y>60</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>60</x>
-            <y>0</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>60</x>
-            <y>20</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>60</x>
-            <y>40</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>60</x>
-            <y>60</y>
-          </java.awt.Point>
-        </points>
-        <defaultFlag>false</defaultFlag>
-      </org.diylc.core.Template>
-      <org.diylc.core.Template>
-        <name>DIP16</name>
-        <values>
-          <entry>
-            <string>Pins</string>
-            <org.diylc.components.semiconductors.DIL__IC_-PinCount>_16</org.diylc.components.semiconductors.DIL__IC_-PinCount>
-          </entry>
-          <entry>
-            <string>Row Spacing</string>
-            <org.diylc.core.measures.Size>
-              <value>0.3</value>
-              <unit class="org.diylc.core.measures.SizeUnit">in</unit>
-            </org.diylc.core.measures.Size>
-          </entry>
-          <entry>
-            <string>Value</string>
-            <string></string>
-          </entry>
-          <entry>
-            <string>Body</string>
-            <awt-color reference="../../../../../../entry/list/org.diylc.core.Template/values/entry/awt-color"/>
-          </entry>
-          <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
-          </entry>
-          <entry>
-            <string>Orientation</string>
-            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
-          </entry>
-          <entry>
-            <string>Border</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[7]/awt-color"/>
-          </entry>
-          <entry>
-            <string>Display</string>
-            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
-          </entry>
-          <entry>
-            <string>Label</string>
-            <awt-color reference="../../../../../../entry/list/org.diylc.core.Template/values/entry[8]/awt-color"/>
-          </entry>
-          <entry>
-            <string>Display Pin #s</string>
-            <org.diylc.components.semiconductors.DIL__IC_-DisplayNumbers>NO</org.diylc.components.semiconductors.DIL__IC_-DisplayNumbers>
-          </entry>
-          <entry>
-            <string>Indent</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[11]/awt-color"/>
-          </entry>
-          <entry>
-            <string>Pin Spacing</string>
-            <org.diylc.core.measures.Size>
-              <value>0.1</value>
-              <unit class="org.diylc.core.measures.SizeUnit">in</unit>
-            </org.diylc.core.measures.Size>
-          </entry>
-        </values>
-        <points>
-          <java.awt.Point>
-            <x>0</x>
-            <y>0</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>0</x>
-            <y>20</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>0</x>
-            <y>40</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>0</x>
-            <y>60</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>0</x>
-            <y>80</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>0</x>
-            <y>100</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>0</x>
-            <y>120</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>0</x>
-            <y>140</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>60</x>
-            <y>0</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>60</x>
-            <y>20</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>60</x>
-            <y>40</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>60</x>
-            <y>60</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>60</x>
-            <y>80</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>60</x>
-            <y>100</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>60</x>
-            <y>120</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>60</x>
-            <y>140</y>
-          </java.awt.Point>
-        </points>
-        <defaultFlag>false</defaultFlag>
-      </org.diylc.core.Template>
-    </list>
-  </entry>
   <entry>
     <string>Tubes.Tube Socket</string>
     <list>
       <org.diylc.core.Template>
         <name>Noval</name>
         <values>
-          <entry>
-            <string>Angle</string>
-            <int>0</int>
-          </entry>
           <entry>
             <string>Base</string>
             <org.diylc.components.tube.TubeSocket_-Base>B9A</org.diylc.components.tube.TubeSocket_-Base>
           </entry>
+          <entry>
+            <string>Angle</string>
+            <int>0</int>
+          </entry>
           <entry>
             <string>Alpha</string>
             <byte>127</byte>
@@ -2335,14 +2559,14 @@
       <org.diylc.core.Template>
         <name>Octal</name>
         <values>
-          <entry>
-            <string>Angle</string>
-            <int>0</int>
-          </entry>
           <entry>
             <string>Base</string>
             <org.diylc.components.tube.TubeSocket_-Base>OCTAL</org.diylc.components.tube.TubeSocket_-Base>
           </entry>
+          <entry>
+            <string>Angle</string>
+            <int>0</int>
+          </entry>
           <entry>
             <string>Alpha</string>
             <byte>127</byte>
@@ -2404,10 +2628,6 @@
       <org.diylc.core.Template>
         <name>Covered PAF-Style</name>
         <values>
-          <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
-          </entry>
           <entry>
             <string>Bobin 1</string>
             <awt-color>
@@ -2417,6 +2637,18 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </entry>
+          <entry>
+            <string>Model</string>
+            <string></string>
+          </entry>
+          <entry>
+            <string>Orientation</string>
+            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
+          </entry>
           <entry>
             <string>Pole Color</string>
             <awt-color>
@@ -2426,14 +2658,6 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
-          <entry>
-            <string>Orientation</string>
-            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
-          </entry>
-          <entry>
-            <string>Model</string>
-            <string></string>
-          </entry>
           <entry>
             <string>Bobin 2</string>
             <awt-color>
@@ -2480,6 +2704,10 @@
       <org.diylc.core.Template>
         <name>Uncovered PAF-Style</name>
         <values>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </entry>
           <entry>
             <string>Bobin 1</string>
             <awt-color>
@@ -2489,18 +2717,6 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
-          <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
-          </entry>
-          <entry>
-            <string>Model</string>
-            <string></string>
-          </entry>
-          <entry>
-            <string>Orientation</string>
-            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
-          </entry>
           <entry>
             <string>Pole Color</string>
             <awt-color>
@@ -2510,6 +2726,14 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
+          <entry>
+            <string>Orientation</string>
+            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
+          </entry>
+          <entry>
+            <string>Model</string>
+            <string></string>
+          </entry>
           <entry>
             <string>Bobin 2</string>
             <awt-color>
@@ -2556,6 +2780,10 @@
       <org.diylc.core.Template>
         <name>EMG-style</name>
         <values>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </entry>
           <entry>
             <string>Bobin 1</string>
             <awt-color>
@@ -2565,18 +2793,6 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
-          <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
-          </entry>
-          <entry>
-            <string>Model</string>
-            <string></string>
-          </entry>
-          <entry>
-            <string>Orientation</string>
-            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
-          </entry>
           <entry>
             <string>Pole Color</string>
             <awt-color>
@@ -2586,6 +2802,14 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
+          <entry>
+            <string>Orientation</string>
+            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
+          </entry>
+          <entry>
+            <string>Model</string>
+            <string></string>
+          </entry>
           <entry>
             <string>Bobin 2</string>
             <awt-color>
@@ -2632,10 +2856,6 @@
       <org.diylc.core.Template>
         <name>Filtertron-style</name>
         <values>
-          <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
-          </entry>
           <entry>
             <string>Bobin 1</string>
             <awt-color>
@@ -2645,6 +2865,18 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </entry>
+          <entry>
+            <string>Model</string>
+            <string></string>
+          </entry>
+          <entry>
+            <string>Orientation</string>
+            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
+          </entry>
           <entry>
             <string>Pole Color</string>
             <awt-color>
@@ -2654,14 +2886,6 @@
               <alpha>255</alpha>
             </awt-color>
           </entry>
-          <entry>
-            <string>Orientation</string>
-            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
-          </entry>
-          <entry>
-            <string>Model</string>
-            <string></string>
-          </entry>
           <entry>
             <string>Bobin 2</string>
             <awt-color>
@@ -2675,14 +2899,14 @@
             <string>Type</string>
             <org.diylc.components.guitar.HumbuckerPickup_-HumbuckerType>Filtertron</org.diylc.components.guitar.HumbuckerPickup_-HumbuckerType>
           </entry>
-          <entry>
-            <string>Legs</string>
-            <boolean>false</boolean>
-          </entry>
           <entry>
             <string>Cover</string>
             <boolean>true</boolean>
           </entry>
+          <entry>
+            <string>Legs</string>
+            <boolean>false</boolean>
+          </entry>
           <entry>
             <string>Pole Pieces 1</string>
             <org.diylc.components.guitar.HumbuckerPickup_-PolePieceType>Screws</org.diylc.components.guitar.HumbuckerPickup_-PolePieceType>