diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
index 8e1a4bd9..de1686d2 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/HumbuckerPickup.java b/diylc/diylc-library/src/org/diylc/components/guitar/HumbuckerPickup.java
index acdc8dc1..fe564905 100644
--- a/diylc/diylc-library/src/org/diylc/components/guitar/HumbuckerPickup.java
+++ b/diylc/diylc-library/src/org/diylc/components/guitar/HumbuckerPickup.java
@@ -225,7 +225,7 @@ public class HumbuckerPickup extends AbstractTransparentComponent<String> {
         poleArea.add(new Area(
             new RoundRectangle2D.Double(x + pointMargin - length + poleMargin - poleSize / 2, y - pointMargin
                 + coilMargin - poleSize / 2, poleSpacing * 5 + poleSize, poleSize, poleSize / 2, poleSize / 2)));
-      } else {
+      } else if (getCoilType1() == PolePieceType.Rods) {
         for (int i = 0; i < 6; i++) {
           if (getType() == HumbuckerType.PAF || !getCover()) {
             Ellipse2D pole =
@@ -240,7 +240,7 @@ public class HumbuckerPickup extends AbstractTransparentComponent<String> {
         poleArea.add(new Area(new RoundRectangle2D.Double(x + pointMargin - length + poleMargin - poleSize / 2, y
             - pointMargin + width - coilMargin - poleSize / 2, poleSpacing * 5 + poleSize, poleSize, poleSize / 2,
             poleSize / 2)));
-      } else {
+      } else if (getCoilType1() == PolePieceType.Rods) {
         for (int i = 0; i < 6; i++) {
           Ellipse2D pole =
               new Ellipse2D.Double(x + pointMargin - length + poleMargin + i * poleSpacing - poleSize / 2, y
@@ -482,6 +482,6 @@ public class HumbuckerPickup extends AbstractTransparentComponent<String> {
   }
 
   public enum PolePieceType {
-    Rods, Rail;
+    Rods, Rail, None;
   }
 }
diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index 8e1a4bd9..de1686d2 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 557ad214..933eb0b5 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 b00aa5b6..78d85c44 100644
--- a/diylc/diylc-swing/update.xml
+++ b/diylc/diylc-swing/update.xml
@@ -2148,7 +2148,7 @@
 				</org.diylc.appframework.update.Change>	
 				<org.diylc.appframework.update.Change>
 					<changeType>NEW_FEATURE</changeType>
-					<description>Ability to have "Single-coil Pickup" with no poles, similar to Lace Sensors</description>
+					<description>Ability to have "Single-coil Pickup" and "Humbucker Pickup" with no poles, similar to EMG, Lace Sensor...</description>
 				</org.diylc.appframework.update.Change>	
 				<org.diylc.appframework.update.Change>
 					<changeType>IMPROVEMENT</changeType>
diff --git a/diylc/diylc-swing/variants.xml b/diylc/diylc-swing/variants.xml
index 74f494e2..94497fd9 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>
@@ -781,8 +781,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 +796,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 +812,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 +871,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 +884,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 +904,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 +971,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 +989,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 +1005,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 +1068,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 +1090,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 +1125,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 +2256,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 +2335,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 +2404,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 +2413,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 +2434,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 +2480,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 +2493,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 +2502,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>
@@ -2553,6 +2553,82 @@
         </points>
         <defaultFlag>false</defaultFlag>
       </org.diylc.core.Template>
+      <org.diylc.core.Template>
+        <name>EMG-style</name>
+        <values>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </entry>
+          <entry>
+            <string>Bobin 1</string>
+            <awt-color>
+              <red>234</red>
+              <green>227</green>
+              <blue>198</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Pole Color</string>
+            <awt-color>
+              <red>117</red>
+              <green>157</green>
+              <blue>175</blue>
+              <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>
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Type</string>
+            <org.diylc.components.guitar.HumbuckerPickup_-HumbuckerType>PAF</org.diylc.components.guitar.HumbuckerPickup_-HumbuckerType>
+          </entry>
+          <entry>
+            <string>Cover</string>
+            <boolean>true</boolean>
+          </entry>
+          <entry>
+            <string>Pole Pieces 1</string>
+            <org.diylc.components.guitar.HumbuckerPickup_-PolePieceType>None</org.diylc.components.guitar.HumbuckerPickup_-PolePieceType>
+          </entry>
+          <entry>
+            <string>Pole Pieces 2</string>
+            <org.diylc.components.guitar.HumbuckerPickup_-PolePieceType>None</org.diylc.components.guitar.HumbuckerPickup_-PolePieceType>
+          </entry>
+          <entry>
+            <string>Color</string>
+            <awt-color>
+              <red>51</red>
+              <green>51</green>
+              <blue>51</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+        </values>
+        <points>
+          <java.awt.Point>
+            <x>0</x>
+            <y>0</y>
+          </java.awt.Point>
+        </points>
+        <defaultFlag>false</defaultFlag>
+      </org.diylc.core.Template>
     </list>
   </entry>
 </map>
\ No newline at end of file