diff --git a/diylc/diylc-swing/variants.xml b/diylc/diylc-swing/variants.xml
index e7eb79c9..559c85a3 100644
--- a/diylc/diylc-swing/variants.xml
+++ b/diylc/diylc-swing/variants.xml
@@ -18,6 +18,14 @@
             <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>
@@ -27,14 +35,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>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>Pole Color</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
+            <string>Model</string>
+            <string></string>
           </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
           </entry>
           <entry>
-            <string>Model</string>
-            <string></string>
+            <string>Pole Color</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[5]/awt-color"/>
           </entry>
           <entry>
             <string>Type</string>
@@ -117,16 +117,16 @@
             <byte>127</byte>
           </entry>
           <entry>
-            <string>Pole Color</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
+            <string>Model</string>
+            <string></string>
           </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
           </entry>
           <entry>
-            <string>Model</string>
-            <string></string>
+            <string>Pole Color</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[5]/awt-color"/>
           </entry>
           <entry>
             <string>Type</string>
@@ -161,16 +161,16 @@
             <byte>127</byte>
           </entry>
           <entry>
-            <string>Pole Color</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
+            <string>Model</string>
+            <string></string>
           </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
           </entry>
           <entry>
-            <string>Model</string>
-            <string></string>
+            <string>Pole Color</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[5]/awt-color"/>
           </entry>
           <entry>
             <string>Type</string>
@@ -205,16 +205,16 @@
             <byte>127</byte>
           </entry>
           <entry>
-            <string>Pole Color</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
+            <string>Model</string>
+            <string></string>
           </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
           </entry>
           <entry>
-            <string>Model</string>
-            <string></string>
+            <string>Pole Color</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[5]/awt-color"/>
           </entry>
           <entry>
             <string>Type</string>
@@ -249,16 +249,16 @@
             <byte>127</byte>
           </entry>
           <entry>
-            <string>Pole Color</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[3]/awt-color"/>
+            <string>Model</string>
+            <string></string>
           </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
           </entry>
           <entry>
-            <string>Model</string>
-            <string></string>
+            <string>Pole Color</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[5]/awt-color"/>
           </entry>
           <entry>
             <string>Type</string>
@@ -289,10 +289,6 @@
       <org.diylc.core.Template>
         <name>DPDT</name>
         <values>
-          <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
-          </entry>
           <entry>
             <string>Body</string>
             <awt-color>
@@ -302,10 +298,18 @@
               <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>
@@ -315,10 +319,6 @@
               <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>
@@ -359,25 +359,25 @@
         <name>SPDT</name>
         <values>
           <entry>
-            <string>Alpha</string>
-            <byte>127</byte>
+            <string>Body</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry/awt-color"/>
           </entry>
           <entry>
-            <string>Body</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[2]/awt-color"/>
+            <string>Alpha</string>
+            <byte>127</byte>
           </entry>
           <entry>
             <string>Orientation</string>
             <org.diylc.common.OrientationHV>VERTICAL</org.diylc.common.OrientationHV>
           </entry>
-          <entry>
-            <string>Border</string>
-            <awt-color reference="../../../../org.diylc.core.Template/values/entry[4]/awt-color"/>
-          </entry>
           <entry>
             <string>Type</string>
             <org.diylc.components.electromechanical.ToggleSwitchType>SPDT</org.diylc.components.electromechanical.ToggleSwitchType>
           </entry>
+          <entry>
+            <string>Border</string>
+            <awt-color reference="../../../../org.diylc.core.Template/values/entry[5]/awt-color"/>
+          </entry>
           <entry>
             <string>Spacing</string>
             <org.diylc.core.measures.Size reference="../../../../org.diylc.core.Template/values/entry[6]/org.diylc.core.measures.Size"/>
@@ -758,241 +758,6 @@
       </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>
@@ -1479,6 +1244,100 @@
           </java.awt.Point>
         </points>
         <defaultFlag>false</defaultFlag>
+      </org.diylc.core.Template>
+	  <org.diylc.core.Template>
+        <name>2W Metal Oxide</name>
+        <values>
+          <entry>
+            <string>Value</string>
+            <null/>
+          </entry>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </entry>
+          <entry>
+            <string>Power rating</string>
+            <null/>
+          </entry>
+          <entry>
+            <string>Border</string>
+            <awt-color>
+              <red>178</red>
+              <green>183</green>
+              <blue>187</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Display</string>
+            <org.diylc.common.Display>NAME</org.diylc.common.Display>
+          </entry>
+          <entry>
+            <string>Label color</string>
+            <awt-color>
+              <red>0</red>
+              <green>0</green>
+              <blue>0</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Color</string>
+            <awt-color>
+              <red>210</red>
+              <green>215</green>
+              <blue>219</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Shape</string>
+            <org.diylc.components.passive.Resistor_-ResistorShape>Standard</org.diylc.components.passive.Resistor_-ResistorShape>
+          </entry>
+          <entry>
+            <string>Length</string>
+            <org.diylc.core.measures.Size>
+              <value>16.0</value>
+              <unit class="org.diylc.core.measures.SizeUnit">mm</unit>
+            </org.diylc.core.measures.Size>
+          </entry>
+          <entry>
+            <string>Reverse (standing)</string>
+            <boolean>false</boolean>
+          </entry>
+          <entry>
+            <string>Color code</string>
+            <org.diylc.common.ResistorColorCode>_5_BAND</org.diylc.common.ResistorColorCode>
+          </entry>
+          <entry>
+            <string>Width</string>
+            <org.diylc.core.measures.Size>
+              <value>6.0</value>
+              <unit class="org.diylc.core.measures.SizeUnit">mm</unit>
+            </org.diylc.core.measures.Size>
+          </entry>
+          <entry>
+            <string>Lead color</string>
+            <awt-color>
+              <red>204</red>
+              <green>204</green>
+              <blue>204</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+        </values>
+        <points>
+          <java.awt.Point>
+            <x>0</x>
+            <y>0</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>180</x>
+            <y>0</y>
+          </java.awt.Point>
+        </points>
+        <defaultFlag>false</defaultFlag>
       </org.diylc.core.Template>
       <org.diylc.core.Template>
         <name>5W Ceramic</name>
@@ -1644,6 +1503,241 @@
           </java.awt.Point>
         </points>
         <defaultFlag>false</defaultFlag>
+      </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>
@@ -1653,14 +1747,14 @@
       <org.diylc.core.Template>
         <name>Noval</name>
         <values>
-          <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>Base</string>
+            <org.diylc.components.tube.TubeSocket_-Base>B9A</org.diylc.components.tube.TubeSocket_-Base>
+          </entry>
           <entry>
             <string>Alpha</string>
             <byte>127</byte>
@@ -1726,14 +1820,14 @@
       <org.diylc.core.Template>
         <name>Octal</name>
         <values>
-          <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>Base</string>
+            <org.diylc.components.tube.TubeSocket_-Base>OCTAL</org.diylc.components.tube.TubeSocket_-Base>
+          </entry>
           <entry>
             <string>Alpha</string>
             <byte>127</byte>
@@ -1795,6 +1889,10 @@
       <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>
@@ -1804,18 +1902,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>
@@ -1825,6 +1911,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>
@@ -1871,10 +1965,6 @@
       <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>
@@ -1884,6 +1974,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>
@@ -1893,14 +1995,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>