diff --git a/diylc/diylc-library/src/org/diylc/components/passive/MultiSectionCapacitor.java b/diylc/diylc-library/src/org/diylc/components/passive/MultiSectionCapacitor.java
index be966176..59946327 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/MultiSectionCapacitor.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/MultiSectionCapacitor.java
@@ -112,7 +112,7 @@ public class MultiSectionCapacitor extends AbstractTransparentComponent<Capacita
   }
   
   private String getStringValue() {
-    if (value == null)
+    if (value == null || value.length == 0)
       return "";
     StringBuilder sb = new StringBuilder();
     boolean isFirst = true;    
@@ -121,10 +121,10 @@ public class MultiSectionCapacitor extends AbstractTransparentComponent<Capacita
         isFirst = false;
       else
         sb.append("/");
-      sb.append(c == null ? "" : format.format(c.getValue()));
+      sb.append(c == null || c.getValue() == null ? "" : format.format(c.getValue()));
     }
     if (value[0] != null)
-      sb.append(" " + value[0].getUnit());
+      sb.append(" " + value[0].getUnit() == null ? "" : value[0].getUnit());
     return sb.toString();
   }
 
@@ -143,7 +143,10 @@ public class MultiSectionCapacitor extends AbstractTransparentComponent<Capacita
   }
   
   public void setDiameter(Size diameter) {
-    this.diameter = diameter;
+    this.diameter = diameter;
+    // Reset body shape;    
+    updateControlPoints();
+    body = null;
   }
 
   @EditableProperty
diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index 3a8e9c39..23306dd3 100644
Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ
diff --git a/diylc/diylc-swing/lib/swing-framework.jar b/diylc/diylc-swing/lib/swing-framework.jar
index 8e9d33b0..c5138e0e 100644
Binary files a/diylc/diylc-swing/lib/swing-framework.jar and b/diylc/diylc-swing/lib/swing-framework.jar differ
diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar
index cc1d78ba..2b0488a4 100644
Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ
diff --git a/diylc/diylc-swing/variants.xml b/diylc/diylc-swing/variants.xml
index 559c85a3..74f494e2 100644
--- a/diylc/diylc-swing/variants.xml
+++ b/diylc/diylc-swing/variants.xml
@@ -758,6 +758,373 @@
       </org.diylc.core.Template>
     </list>
   </entry>
+  <entry>
+    <string>Passive.Multi-Section Capacitor</string>
+    <list>
+      <org.diylc.core.Template>
+        <name>1-section</name>
+        <values>
+          <entry>
+            <string>Diameter</string>
+            <org.diylc.core.measures.Size>
+              <value>0.875</value>
+              <unit class="org.diylc.core.measures.SizeUnit">in</unit>
+            </org.diylc.core.measures.Size>
+          </entry>
+          <entry>
+            <string>Base</string>
+            <awt-color>
+              <red>51</red>
+              <green>51</green>
+              <blue>51</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </entry>
+          <entry>
+            <string>Body</string>
+            <awt-color>
+              <red>107</red>
+              <green>109</green>
+              <blue>206</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Value</string>
+            <org.diylc.core.measures.Capacitance-array>
+              <null/>
+            </org.diylc.core.measures.Capacitance-array>
+          </entry>
+          <entry>
+            <string>Orientation</string>
+            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
+          </entry>
+          <entry>
+            <string>Border</string>
+            <awt-color>
+              <red>74</red>
+              <green>76</green>
+              <blue>144</blue>
+              <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>Label</string>
+            <awt-color>
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Pin Color</string>
+            <awt-color>
+              <red>117</red>
+              <green>157</green>
+              <blue>175</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>0</x>
+            <y>70</y>
+          </java.awt.Point>
+        </points>
+        <defaultFlag>false</defaultFlag>
+      </org.diylc.core.Template>
+      <org.diylc.core.Template>
+        <name>3-section</name>
+        <values>
+          <entry>
+            <string>Diameter</string>
+            <org.diylc.core.measures.Size>
+              <value>1.375</value>
+              <unit class="org.diylc.core.measures.SizeUnit">in</unit>
+            </org.diylc.core.measures.Size>
+          </entry>
+          <entry>
+            <string>Base</string>
+            <awt-color>
+              <red>51</red>
+              <green>51</green>
+              <blue>51</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Value</string>
+            <org.diylc.core.measures.Capacitance-array>
+              <null/>
+              <null/>
+              <null/>
+            </org.diylc.core.measures.Capacitance-array>
+          </entry>
+          <entry>
+            <string>Body</string>
+            <awt-color>
+              <red>107</red>
+              <green>109</green>
+              <blue>206</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>74</red>
+              <green>76</green>
+              <blue>144</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>Pin Color</string>
+            <awt-color>
+              <red>117</red>
+              <green>157</green>
+              <blue>175</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>83</x>
+            <y>82</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>0</x>
+            <y>165</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>-82</x>
+            <y>82</y>
+          </java.awt.Point>
+        </points>
+        <defaultFlag>false</defaultFlag>
+      </org.diylc.core.Template>
+      <org.diylc.core.Template>
+        <name>4-section</name>
+        <values>
+          <entry>
+            <string>Diameter</string>
+            <org.diylc.core.measures.Size>
+              <value>1.375</value>
+              <unit class="org.diylc.core.measures.SizeUnit">in</unit>
+            </org.diylc.core.measures.Size>
+          </entry>
+          <entry>
+            <string>Base</string>
+            <awt-color>
+              <red>51</red>
+              <green>51</green>
+              <blue>51</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </entry>
+          <entry>
+            <string>Body</string>
+            <awt-color>
+              <red>107</red>
+              <green>109</green>
+              <blue>206</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Value</string>
+            <org.diylc.core.measures.Capacitance-array>
+              <null/>
+              <null/>
+              <null/>
+              <null/>
+            </org.diylc.core.measures.Capacitance-array>
+          </entry>
+          <entry>
+            <string>Orientation</string>
+            <org.diylc.common.Orientation>DEFAULT</org.diylc.common.Orientation>
+          </entry>
+          <entry>
+            <string>Border</string>
+            <awt-color>
+              <red>74</red>
+              <green>76</green>
+              <blue>144</blue>
+              <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>Label</string>
+            <awt-color>
+              <red>255</red>
+              <green>255</green>
+              <blue>255</blue>
+              <alpha>255</alpha>
+            </awt-color>
+          </entry>
+          <entry>
+            <string>Pin Color</string>
+            <awt-color>
+              <red>117</red>
+              <green>157</green>
+              <blue>175</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>78</x>
+            <y>57</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>48</x>
+            <y>149</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>-48</x>
+            <y>149</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>-78</x>
+            <y>57</y>
+          </java.awt.Point>
+        </points>
+        <defaultFlag>false</defaultFlag>
+      </org.diylc.core.Template>
+      <org.diylc.core.Template>
+        <name>2-section</name>
+        <values>
+          <entry>
+            <string>Diameter</string>
+            <org.diylc.core.measures.Size reference="../../../../org.diylc.core.Template[3]/values/entry/org.diylc.core.measures.Size"/>
+          </entry>
+          <entry>
+            <string>Base</string>
+            <awt-color reference="../../../../org.diylc.core.Template[3]/values/entry[2]/awt-color"/>
+          </entry>
+          <entry>
+            <string>Alpha</string>
+            <byte>127</byte>
+          </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>
+          </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[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>Label</string>
+            <awt-color reference="../../../../org.diylc.core.Template[3]/values/entry[10]/awt-color"/>
+          </entry>
+          <entry>
+            <string>Pin Color</string>
+            <awt-color reference="../../../../org.diylc.core.Template[3]/values/entry[11]/awt-color"/>
+          </entry>
+        </values>
+        <points>
+          <java.awt.Point>
+            <x>0</x>
+            <y>0</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>82</x>
+            <y>82</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>-82</x>
+            <y>82</y>
+          </java.awt.Point>
+        </points>
+        <defaultFlag>false</defaultFlag>
+      </org.diylc.core.Template>
+    </list>
+  </entry>
   <entry>
     <string>Passive.Resistor</string>
     <list>
@@ -1245,7 +1612,7 @@
         </points>
         <defaultFlag>false</defaultFlag>
       </org.diylc.core.Template>
-	  <org.diylc.core.Template>
+      <org.diylc.core.Template>
         <name>2W Metal Oxide</name>
         <values>
           <entry>
@@ -1298,7 +1665,7 @@
           <entry>
             <string>Length</string>
             <org.diylc.core.measures.Size>
-              <value>16.0</value>
+              <value>12.0</value>
               <unit class="org.diylc.core.measures.SizeUnit">mm</unit>
             </org.diylc.core.measures.Size>
           </entry>
@@ -1313,7 +1680,7 @@
           <entry>
             <string>Width</string>
             <org.diylc.core.measures.Size>
-              <value>6.0</value>
+              <value>4.0</value>
               <unit class="org.diylc.core.measures.SizeUnit">mm</unit>
             </org.diylc.core.measures.Size>
           </entry>
@@ -1503,7 +1870,155 @@
           </java.awt.Point>
         </points>
         <defaultFlag>false</defaultFlag>
-      </org.diylc.core.Template>      
+      </org.diylc.core.Template>
+      <org.diylc.core.Template>
+        <name>1W 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 reference="../../../../org.diylc.core.Template[7]/values/entry[4]/awt-color"/>
+          </entry>
+          <entry>
+            <string>Display</string>
+            <org.diylc.common.Display>NAME</org.diylc.common.Display>
+          </entry>
+          <entry>
+            <string>Label color</string>
+            <awt-color reference="../../../../org.diylc.core.Template[7]/values/entry[6]/awt-color"/>
+          </entry>
+          <entry>
+            <string>Color</string>
+            <awt-color reference="../../../../org.diylc.core.Template[7]/values/entry[7]/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>9.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>3.0</value>
+              <unit class="org.diylc.core.measures.SizeUnit">mm</unit>
+            </org.diylc.core.measures.Size>
+          </entry>
+          <entry>
+            <string>Lead color</string>
+            <awt-color reference="../../../../org.diylc.core.Template[7]/values/entry[13]/awt-color"/>
+          </entry>
+        </values>
+        <points>
+          <java.awt.Point>
+            <x>0</x>
+            <y>0</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>240</x>
+            <y>0</y>
+          </java.awt.Point>
+        </points>
+        <defaultFlag>false</defaultFlag>
+      </org.diylc.core.Template>
+      <org.diylc.core.Template>
+        <name>3W 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 reference="../../../../org.diylc.core.Template[7]/values/entry[4]/awt-color"/>
+          </entry>
+          <entry>
+            <string>Display</string>
+            <org.diylc.common.Display>NAME</org.diylc.common.Display>
+          </entry>
+          <entry>
+            <string>Label color</string>
+            <awt-color reference="../../../../org.diylc.core.Template[7]/values/entry[6]/awt-color"/>
+          </entry>
+          <entry>
+            <string>Color</string>
+            <awt-color reference="../../../../org.diylc.core.Template[7]/values/entry[7]/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 reference="../../../../org.diylc.core.Template[7]/values/entry[13]/awt-color"/>
+          </entry>
+        </values>
+        <points>
+          <java.awt.Point>
+            <x>0</x>
+            <y>0</y>
+          </java.awt.Point>
+          <java.awt.Point>
+            <x>240</x>
+            <y>0</y>
+          </java.awt.Point>
+        </points>
+        <defaultFlag>false</defaultFlag>
+      </org.diylc.core.Template>
     </list>
   </entry>
   <entry>