diff --git a/diylc/diylc-swing/update.xml b/diylc/diylc-swing/update.xml
index 95da5a37..26dfb8f0 100644
--- a/diylc/diylc-swing/update.xml
+++ b/diylc/diylc-swing/update.xml
@@ -2266,6 +2266,10 @@
 					<changeType>IMPROVEMENT</changeType>
 					<description>Better color band rendering on resistors and smarter label positioning</description>
 				</org.diylc.appframework.update.Change>
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>Added few pedal enclosure variants</description>
+				</org.diylc.appframework.update.Change>
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>
 		</org.diylc.appframework.update.Version>		
diff --git a/diylc/diylc-swing/variants.xml b/diylc/diylc-swing/variants.xml
index 4ce44d06..898a7fde 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,316 @@
       </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>
+      <org.diylc.core.Template>
+        <name>Square BR-3</name>
+        <values>
+          <entry>
+            <string>Label Orientation</string>
+            <org.diylc.components.AbstractLeadedComponent_-LabelOriantation>Horizontal</org.diylc.components.AbstractLeadedComponent_-LabelOriantation>
+          </entry>
+          <entry>
+            <string>Value</string>
+            <string></string>
+          </entry>
+          <entry>
+            <string>Body</string>
+            <awt-color>
+              <red>128</red>
+              <green>128</green>
+              <blue>128</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Alpha</string>
+            <byte>100</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>Type</string>
+            <org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>SquareBR3</org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>
+          </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>
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Current</string>
+            <org.diylc.core.measures.Current>
+              <value>3.0</value>
+              <unit class="org.diylc.core.measures.CurrentUnit">A</unit>
+            </org.diylc.core.measures.Current>
+          </entry>
+        </values>
+        <points>
+          <java.awt.Point>
+            <x>0</x>
+            <y>0</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>85</x>
+            <y>0</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>0</x>
+            <y>85</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>85</x>
+            <y>85</y>
+          </java.awt.Point>
+        </points>
+        <defaultFlag>false</defaultFlag>
+      </org.diylc.core.Template>
+    </list>
+  </entry>
   <entry>
     <string>Passive.Potentiometer</string>
     <list>
@@ -758,316 +1068,6 @@
       </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>Value</string>
-            <string></string>
-          </entry>
-          <entry>
-            <string>Body</string>
-            <awt-color>
-              <red>128</red>
-              <green>128</green>
-              <blue>128</blue>
-              <alpha>255</alpha>
-            </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>Type</string>
-            <org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>MiniDIP1</org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>
-          </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>
-              <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>Value</string>
-            <string></string>
-          </entry>
-          <entry>
-            <string>Body</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
-          </entry>
-          <entry>
-            <string>Alpha</string>
-            <byte>100</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[6]/awt-color"/>
-          </entry>
-          <entry>
-            <string>Type</string>
-            <org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>MiniRound1</org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>
-          </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 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>Value</string>
-            <string></string>
-          </entry>
-          <entry>
-            <string>Body</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
-          </entry>
-          <entry>
-            <string>Alpha</string>
-            <byte>100</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[6]/awt-color"/>
-          </entry>
-          <entry>
-            <string>Type</string>
-            <org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>InLine</org.diylc.components.semiconductors.BridgeRectifier_-RectifierType>
-          </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 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>
-      <org.diylc.core.Template>
-        <name>Square BR-3</name>
-        <values>
-          <entry>
-            <string>Label Orientation</string>
-            <org.diylc.components.AbstractLeadedComponent_-LabelOriantation>Horizontal</org.diylc.components.AbstractLeadedComponent_-LabelOriantation>
-          </entry>
-          <entry>
-            <string>Alpha</string>
-            <byte>100</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>SquareBR3</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>
-            <org.diylc.core.measures.Current>
-              <value>3.0</value>
-              <unit class="org.diylc.core.measures.CurrentUnit">A</unit>
-            </org.diylc.core.measures.Current>
-          </entry>
-        </values>
-        <points>
-          <java.awt.Point>
-            <x>0</x>
-            <y>0</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>85</x>
-            <y>0</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>0</x>
-            <y>85</y>
-          </java.awt.Point>
-          <java.awt.Point>
-            <x>85</x>
-            <y>85</y>
-          </java.awt.Point>
-        </points>
-        <defaultFlag>false</defaultFlag>
-      </org.diylc.core.Template>
-    </list>
-  </entry>
   <entry>
     <string>Passive.Multi-Section Capacitor</string>
     <list>
@@ -1091,8 +1091,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>
@@ -1104,10 +1106,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>
@@ -1122,14 +1122,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>
@@ -1181,12 +1181,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>
@@ -1198,8 +1194,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>
@@ -1214,14 +1214,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>
@@ -1281,8 +1281,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>
@@ -1294,13 +1299,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>
@@ -1315,14 +1315,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>
@@ -1378,19 +1378,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>
@@ -1400,14 +1400,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"/>
@@ -1435,6 +1435,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>
@@ -2332,75 +2567,47 @@
     </list>
   </entry>
   <entry>
-    <string>Semiconductors.DIP IC</string>
+    <string>Electro-Mechanical.Chassis Panel</string>
     <list>
       <org.diylc.core.Template>
-        <name>DIP8</name>
+        <name>125B</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>
+            <string>Radius</string>
+            <org.diylc.core.measures.Size>
+              <value>0.0</value>
+              <unit class="org.diylc.core.measures.SizeUnit">mm</unit>
+            </org.diylc.core.measures.Size>
           </entry>
           <entry>
             <string>Border</string>
             <awt-color>
-              <red>89</red>
-              <green>89</green>
-              <blue>89</blue>
+              <red>166</red>
+              <green>166</green>
+              <blue>166</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>
+            <string>Border thickness</string>
             <org.diylc.core.measures.Size>
-              <value>0.1</value>
-              <unit class="org.diylc.core.measures.SizeUnit">in</unit>
+              <value>0.2</value>
+              <unit class="org.diylc.core.measures.SizeUnit">mm</unit>
             </org.diylc.core.measures.Size>
           </entry>
+          <entry>
+            <string>Color</string>
+            <awt-color>
+              <red>238</red>
+              <green>238</green>
+              <blue>238</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
         </values>
         <points>
           <java.awt.Point>
@@ -2408,92 +2615,34 @@
             <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>
+            <x>963</x>
+            <y>528</y>
           </java.awt.Point>
         </points>
         <defaultFlag>false</defaultFlag>
       </org.diylc.core.Template>
       <org.diylc.core.Template>
-        <name>DIP16</name>
+        <name>A</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>
+            <string>Radius</string>
+            <org.diylc.core.measures.Size reference="../../../../org.diylc.core.Template/values/entry[2]/org.diylc.core.measures.Size"/>
           </entry>
           <entry>
             <string>Border</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[7]/awt-color"/>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
           </entry>
           <entry>
-            <string>Display</string>
-            <org.diylc.common.Display>BOTH</org.diylc.common.Display>
+            <string>Border thickness</string>
+            <org.diylc.core.measures.Size reference="../../../../org.diylc.core.Template/values/entry[4]/org.diylc.core.measures.Size"/>
           </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>
+            <string>Color</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[5]/awt-color"/>
           </entry>
         </values>
         <points>
@@ -2502,64 +2651,80 @@
             <y>0</y>
           </java.awt.Point>
           <java.awt.Point>
-            <x>0</x>
-            <y>20</y>
+            <x>709</x>
+            <y>305</y>
           </java.awt.Point>
+        </points>
+        <defaultFlag>false</defaultFlag>
+      </org.diylc.core.Template>
+      <org.diylc.core.Template>
+        <name>B</name>
+        <values>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </entry>
+          <entry>
+            <string>Radius</string>
+            <org.diylc.core.measures.Size reference="../../../../org.diylc.core.Template/values/entry[2]/org.diylc.core.measures.Size"/>
+          </entry>
+          <entry>
+            <string>Border</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
+          </entry>
+          <entry>
+            <string>Border thickness</string>
+            <org.diylc.core.measures.Size reference="../../../../org.diylc.core.Template/values/entry[4]/org.diylc.core.measures.Size"/>
+          </entry>
+          <entry>
+            <string>Color</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[5]/awt-color"/>
+          </entry>
+        </values>
+        <points>
           <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>
+            <x>882</x>
+            <y>472</y>
+          </java.awt.Point>
+        </points>
+        <defaultFlag>false</defaultFlag>
+      </org.diylc.core.Template>
+      <org.diylc.core.Template>
+        <name>BB</name>
+        <values>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </entry>
+          <entry>
+            <string>Radius</string>
+            <org.diylc.core.measures.Size reference="../../../../org.diylc.core.Template/values/entry[2]/org.diylc.core.measures.Size"/>
+          </entry>
+          <entry>
+            <string>Border</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
+          </entry>
+          <entry>
+            <string>Border thickness</string>
+            <org.diylc.core.measures.Size reference="../../../../org.diylc.core.Template/values/entry[4]/org.diylc.core.measures.Size"/>
+          </entry>
+          <entry>
+            <string>Color</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[5]/awt-color"/>
+          </entry>
+        </values>
+        <points>
+          <java.awt.Point>
+            <x>0</x>
+            <y>0</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>
+            <x>939</x>
+            <y>738</y>
           </java.awt.Point>
         </points>
         <defaultFlag>false</defaultFlag>
@@ -2572,14 +2737,14 @@
       <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>
@@ -2645,14 +2810,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>
@@ -2714,10 +2879,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>
@@ -2727,6 +2888,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>
@@ -2736,14 +2909,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>
@@ -2790,6 +2955,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>
@@ -2799,18 +2968,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>
@@ -2820,6 +2977,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>
@@ -2866,6 +3031,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>
@@ -2875,18 +3044,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>
@@ -2896,6 +3053,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>
@@ -2942,10 +3107,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>
@@ -2955,6 +3116,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>
@@ -2964,14 +3137,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>
@@ -2985,14 +3150,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>