diff --git a/Interpreter/XMLScriptInterpreter.NLD b/Interpreter/XMLScriptInterpreter.NLD
index b8f99a8..306c89d 100644
Binary files a/Interpreter/XMLScriptInterpreter.NLD and b/Interpreter/XMLScriptInterpreter.NLD differ
diff --git a/Interpreter/XMLScriptInterpreter.exe b/Interpreter/XMLScriptInterpreter.exe
index 5a2afea..ec2b1d8 100644
Binary files a/Interpreter/XMLScriptInterpreter.exe and b/Interpreter/XMLScriptInterpreter.exe differ
diff --git a/Resources.Project.ComponentMappings/Generic.xml b/Resources.Project.ComponentMappings/Generic.xml
index aae46d9..bc0e552 100644
--- a/Resources.Project.ComponentMappings/Generic.xml
+++ b/Resources.Project.ComponentMappings/Generic.xml
@@ -43,4 +43,7 @@
     <Part Part="2N7000" Component="NMOSFET"/>
     <Part Part="IRLZ44N" Component="NMOSFET"/>
   </Library>
+  <Library Name="LM335">
+    <Part Part="LM335" Component="IntegratedCircuit"/>
+  </Library>
 </Devices>
diff --git a/Script.Common.Electronics/BOM CapacitorClasses.xml b/Script.Common.Electronics/BOM CapacitorClasses.xml
index 738cfd1..2117701 100644
--- a/Script.Common.Electronics/BOM CapacitorClasses.xml	
+++ b/Script.Common.Electronics/BOM CapacitorClasses.xml	
@@ -452,19 +452,23 @@
 
         <Execute Statement="Result:= Result shl 1"/>
         <Case Expression="FootprintVT">
-          <On Select="TValueType.SpecifiedByTemplate, TValueType.Specified">
+          <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
             <Case Expression="ComponentSpec.FootprintVT">
-              <On Select="TValueType.SpecifiedByTemplate, TValueType.Specified">
-                <Exit Condition="Footprint &lt;&gt; ComponentSpec.Footprint" Result="0"/>
-                <Execute Statement="Result:= Result + 1"/>
+              <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
+                <Execute Statement="Result:= Result + 1" Condition="Footprint = ComponentSpec.Footprint"/>
               </On>
-              <On Select="TValueType.Error, TValueType.ErrorByTemplate">
-                <Exit Result="0"/>
+              <On Select="TFootPrintValueType.MaskSpecifiedByTemplate, TFootPrintValueType.MaskSpecified">
+                <Execute Statement="Result:= Result + 1" Condition="ComponentSpec.FootprintMask.Matches(Footprint)"/>
+              </On>
+              <On Select="TFootPrintValueType.Unspecified, TFootPrintValueType.Cleared, TFootPrintValueType.ClearedByTemplate">
               </On>
+              <Otherwise>
+                <Exit/>
+              </Otherwise>
             </Case>
           </On>
-          <On Select="TValueType.Error, TValueType.ErrorByTemplate">
-            <Exit Result="0"/>
+          <On Select="TFootPrintValueType.Error, TFootPrintValueType.ErrorByTemplate">
+            <Exit/>
           </On>
         </Case>
 
diff --git a/Script.Common.Electronics/BOM ConnectorClasses.xml b/Script.Common.Electronics/BOM ConnectorClasses.xml
index 94ed0ef..dc87244 100644
--- a/Script.Common.Electronics/BOM ConnectorClasses.xml	
+++ b/Script.Common.Electronics/BOM ConnectorClasses.xml	
@@ -569,17 +569,22 @@
         </Case>
         <Execute Statement="Result:= Result shl 1"/>
         <Case Expression="FootprintVT">
-          <On Select="TValueType.SpecifiedByTemplate, TValueType.Specified">
+          <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
             <Case Expression="ComponentSpec.FootprintVT">
-              <On Select="TValueType.SpecifiedByTemplate, TValueType.Specified">
+              <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
                 <Execute Statement="Result:= Result + 1" Condition="Footprint = ComponentSpec.Footprint"/>
               </On>
+              <On Select="TFootPrintValueType.MaskSpecifiedByTemplate, TFootPrintValueType.MaskSpecified">
+                <Execute Statement="Result:= Result + 1" Condition="ComponentSpec.FootprintMask.Matches(Footprint)"/>
+              </On>
+              <On Select="TFootPrintValueType.Unspecified, TFootPrintValueType.Cleared, TFootPrintValueType.ClearedByTemplate">
+              </On>
               <Otherwise>
                 <Exit/>
               </Otherwise>
             </Case>
           </On>
-          <On Select="TValueType.Error, TValueType.ErrorByTemplate">
+          <On Select="TFootPrintValueType.Error, TFootPrintValueType.ErrorByTemplate">
             <Exit/>
           </On>
         </Case>
@@ -784,7 +789,7 @@
                 <Execute Statement="Result:= ''"/>
               </When>
               <Otherwise>
-                <Execute Statement="Result:= Format('%-*s%*s%*s%-*s%-*s',
+                <Execute Statement="Result:= Format('%-*s%*s%-*s%-*s%-*s',
                          ColumnManager.GetColumnWidth(ColumnOffset + TConnectorSpecColumns.Value, 4), Value,
                          ColumnManager.GetColumnWidth(ColumnOffset + TConnectorSpecColumns.AmpRating, 2), AmpRating,
                          ColumnManager.GetColumnWidth(ColumnOffset + TConnectorSpecColumns.FootPrint, 1), FootPrint,
diff --git a/Script.Common.Electronics/BOM DiodeClasses.xml b/Script.Common.Electronics/BOM DiodeClasses.xml
index c2ad43b..60a7973 100644
--- a/Script.Common.Electronics/BOM DiodeClasses.xml	
+++ b/Script.Common.Electronics/BOM DiodeClasses.xml	
@@ -332,19 +332,23 @@
 
         <Execute Statement="Result:= Result shl 1"/>
         <Case Expression="FootprintVT">
-          <On Select="TValueType.SpecifiedByTemplate, TValueType.Specified">
+          <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
             <Case Expression="ComponentSpec.FootprintVT">
-              <On Select="TValueType.SpecifiedByTemplate, TValueType.Specified">
-                <Exit Condition="Footprint &lt;&gt; ComponentSpec.Footprint" Result="0"/>
-                <Execute Statement="Result:= Result + 1"/>
+              <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
+                <Execute Statement="Result:= Result + 1" Condition="Footprint = ComponentSpec.Footprint"/>
               </On>
-              <On Select="TValueType.Error, TValueType.ErrorByTemplate">
-                <Exit Result="0"/>
+              <On Select="TFootPrintValueType.MaskSpecifiedByTemplate, TFootPrintValueType.MaskSpecified">
+                <Execute Statement="Result:= Result + 1" Condition="ComponentSpec.FootprintMask.Matches(Footprint)"/>
+              </On>
+              <On Select="TFootPrintValueType.Unspecified, TFootPrintValueType.Cleared, TFootPrintValueType.ClearedByTemplate">
               </On>
+              <Otherwise>
+                <Exit/>
+              </Otherwise>
             </Case>
           </On>
-          <On Select="TValueType.Error, TValueType.ErrorByTemplate">
-            <Exit Result="0"/>
+          <On Select="TFootPrintValueType.Error, TFootPrintValueType.ErrorByTemplate">
+            <Exit/>
           </On>
         </Case>
 
diff --git a/Script.Common.Electronics/BOM FuseClasses.xml b/Script.Common.Electronics/BOM FuseClasses.xml
index 4243a6b..083b277 100644
--- a/Script.Common.Electronics/BOM FuseClasses.xml	
+++ b/Script.Common.Electronics/BOM FuseClasses.xml	
@@ -377,19 +377,23 @@
 
         <Execute Statement="Result:= Result shl 1"/>
         <Case Expression="FootprintVT">
-          <On Select="TValueType.SpecifiedByTemplate, TValueType.Specified">
+          <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
             <Case Expression="ComponentSpec.FootprintVT">
-              <On Select="TValueType.SpecifiedByTemplate, TValueType.Specified">
-                <Exit Condition="Footprint &lt;&gt; ComponentSpec.Footprint" Result="0"/>
-                <Execute Statement="Result:= Result + 1"/>
+              <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
+                <Execute Statement="Result:= Result + 1" Condition="Footprint = ComponentSpec.Footprint"/>
               </On>
-              <On Select="TValueType.Error, TValueType.ErrorByTemplate">
-                <Exit Result="0"/>
+              <On Select="TFootPrintValueType.MaskSpecifiedByTemplate, TFootPrintValueType.MaskSpecified">
+                <Execute Statement="Result:= Result + 1" Condition="ComponentSpec.FootprintMask.Matches(Footprint)"/>
+              </On>
+              <On Select="TFootPrintValueType.Unspecified, TFootPrintValueType.Cleared, TFootPrintValueType.ClearedByTemplate">
               </On>
+              <Otherwise>
+                <Exit/>
+              </Otherwise>
             </Case>
           </On>
-          <On Select="TValueType.Error, TValueType.ErrorByTemplate">
-            <Exit Result="0"/>
+          <On Select="TFootPrintValueType.Error, TFootPrintValueType.ErrorByTemplate">
+            <Exit/>
           </On>
         </Case>
 
diff --git a/Script.Common.Electronics/BOM InductorClasses.xml b/Script.Common.Electronics/BOM InductorClasses.xml
index b4911e1..f06cc78 100644
--- a/Script.Common.Electronics/BOM InductorClasses.xml	
+++ b/Script.Common.Electronics/BOM InductorClasses.xml	
@@ -336,19 +336,23 @@
 
         <Execute Statement="Result:= Result shl 1"/>
         <Case Expression="FootprintVT">
-          <On Select="TValueType.SpecifiedByTemplate, TValueType.Specified">
+          <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
             <Case Expression="ComponentSpec.FootprintVT">
-              <On Select="TValueType.SpecifiedByTemplate, TValueType.Specified">
-                <Exit Condition="Footprint &lt;&gt; ComponentSpec.Footprint" Result="0"/>
-                <Execute Statement="Result:= Result + 1"/>
+              <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
+                <Execute Statement="Result:= Result + 1" Condition="Footprint = ComponentSpec.Footprint"/>
               </On>
-              <On Select="TValueType.Error, TValueType.ErrorByTemplate">
-                <Exit Result="0"/>
+              <On Select="TFootPrintValueType.MaskSpecifiedByTemplate, TFootPrintValueType.MaskSpecified">
+                <Execute Statement="Result:= Result + 1" Condition="ComponentSpec.FootprintMask.Matches(Footprint)"/>
+              </On>
+              <On Select="TFootPrintValueType.Unspecified, TFootPrintValueType.Cleared, TFootPrintValueType.ClearedByTemplate">
               </On>
+              <Otherwise>
+                <Exit/>
+              </Otherwise>
             </Case>
           </On>
-          <On Select="TValueType.Error, TValueType.ErrorByTemplate">
-            <Exit Result="0"/>
+          <On Select="TFootPrintValueType.Error, TFootPrintValueType.ErrorByTemplate">
+            <Exit/>
           </On>
         </Case>
 
diff --git a/Script.Common.Electronics/BOM IntegratedCircuitClasses.xml b/Script.Common.Electronics/BOM IntegratedCircuitClasses.xml
index 057396e..9eaa44d 100644
--- a/Script.Common.Electronics/BOM IntegratedCircuitClasses.xml	
+++ b/Script.Common.Electronics/BOM IntegratedCircuitClasses.xml	
@@ -134,17 +134,22 @@
         </Case>
         <Execute Statement="Result:= Result shl 1"/>
         <Case Expression="FootprintVT">
-          <On Select="TValueType.SpecifiedByTemplate, TValueType.Specified">
+          <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
             <Case Expression="ComponentSpec.FootprintVT">
-              <On Select="TValueType.SpecifiedByTemplate, TValueType.Specified">
+              <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
                 <Execute Statement="Result:= Result + 1" Condition="Footprint = ComponentSpec.Footprint"/>
               </On>
+              <On Select="TFootPrintValueType.MaskSpecifiedByTemplate, TFootPrintValueType.MaskSpecified">
+                <Execute Statement="Result:= Result + 1" Condition="ComponentSpec.FootprintMask.Matches(Footprint)"/>
+              </On>
+              <On Select="TFootPrintValueType.Unspecified, TFootPrintValueType.Cleared, TFootPrintValueType.ClearedByTemplate">
+              </On>
               <Otherwise>
                 <Exit/>
               </Otherwise>
             </Case>
           </On>
-          <On Select="TValueType.Error, TValueType.ErrorByTemplate">
+          <On Select="TFootPrintValueType.Error, TFootPrintValueType.ErrorByTemplate">
             <Exit/>
           </On>
         </Case>
@@ -228,7 +233,7 @@
                 <Execute Statement="Result:= ''"/>
               </When>
               <Otherwise>
-                <Execute Statement="Result:= Format('%-*s%*s%*s%-*s%-*s',
+                <Execute Statement="Result:= Format('%-*s%*s%-*s%-*s%-*s',
                          ColumnManager.GetColumnWidth(ColumnOffset + TIntegratedCircuitSpecColumns.Value, 2), Name,
                          ColumnManager.GetColumnWidth(ColumnOffset + TIntegratedCircuitSpecColumns.Functions, 4), Functions,
                          ColumnManager.GetColumnWidth(ColumnOffset + TIntegratedCircuitSpecColumns.FootPrint, 1), FootPrint,
diff --git a/Script.Common.Electronics/BOM PartKeeprProjectExport.xml b/Script.Common.Electronics/BOM PartKeeprProjectExport.xml
index e52bf15..4abf8cf 100644
--- a/Script.Common.Electronics/BOM PartKeeprProjectExport.xml	
+++ b/Script.Common.Electronics/BOM PartKeeprProjectExport.xml	
@@ -42,7 +42,7 @@
       <!--Initialized in task-->
       <Field Identifier="Name" Type="string"/>
       <Field Identifier="StockCategory" Type="TStockCategory"/>
-      <Field Identifier="FootPrintInfo" Type="TFootprintInfo"/>
+      <!--<Field Identifier="FootPrintInfo" Type="TFootprintInfo"/>-->
       <Field Identifier="InternalPartNumber" Type="string"/>
       <Field Identifier="Error" Type="Boolean"/>
       <!--Initialized in create task-->
@@ -857,7 +857,7 @@
         <Variable Identifier="Footprint" Type="string" Init="''"/>
       </Variables>
       <Init>
-        <Execute Statement="Footprint:= PartKeeprPart.FootprintInfo.Name" Condition="Assigned(PartKeeprPart.FootprintInfo)"/>
+        <!--<Execute Statement="Footprint:= PartKeeprPart.FootprintInfo.Name" Condition="Assigned(PartKeeprPart.FootprintInfo)"/>-->
         <Task.Description Expression="Format(sCreatePart, ConcatExt(' - ', True, PartKeeprPart.Name, Footprint, PartKeeprPart.InternalPartNumber))"/>
         <Task.MarkFailed Condition="PartKeeprPart.Error"/>
       </Init>
@@ -866,7 +866,7 @@
           <ado:Recordset.AddNew/>
           <ado:Field.SetValue Name="category_id" Value="PartKeeprPart.StockCategory.ID"/>
           <ado:Field.SetValue Name="name" Value="PartKeeprPart.Name"/>
-          <ado:Field.SetValue Name="footprint_id" Value="PartKeeprPart.FootprintInfo.ID" Condition="Assigned(PartKeeprPart.FootprintInfo)"/>
+          <!--<ado:Field.SetValue Name="footprint_id" Value="PartKeeprPart.FootprintInfo.ID" Condition="Assigned(PartKeeprPart.FootprintInfo)"/>-->
           <ado:Field.SetValue Name="storageLocation_id" Value="UnmatchedComponentsStorageID"/>
           <Choose>
             <When Expression="IsNonEmptyString(PartKeeprPart.InternalPartNumber)" >
@@ -955,7 +955,7 @@
         <Variable Identifier="StockSpec" Type="TComponentSpec"/>
         <Variable Identifier="NumericPartParameter" Type="TNumericPartParameter"/>
         <Variable Identifier="StringPartParameter" Type="TStringPartParameter"/>
-        <Variable Identifier="FootprintInfo" Type="TFootprintInfo"/>
+        <!--<Variable Identifier="FootprintInfo" Type="TFootprintInfo"/>-->
         <Variable Identifier="Found" Type="Boolean"/>
       </Variables>
       <Init>
@@ -971,10 +971,36 @@
             <Execute Statement="Part.InternalPartNumber:= SchemaSpec.InternalPartNumber"/>
           </On>
         </Case>
-        <Block Condition="NumericParameterNeeded(SchemaSpec.FootPrint, SchemaSpec.FootPrintVT, StockSpec.FootPrint, StockSpec.FootPrintVT)">
+        <!--<Block Condition="NumericParameterNeeded(SchemaSpec.FootPrint, SchemaSpec.FootPrintVT, StockSpec.FootPrint, StockSpec.FootPrintVT)">
           <inx:Index.FindValue Index="FootPrintToFootPrintInfoMapping" Key="SchemaSpec.Footprint" Value="FootprintInfo" Found="Found" Flags="NoErrorOnNotFound"/>
           <Execute Statement="Part.FootprintInfo:= FootprintInfo" Condition="Found"/>
-        </Block>
+        </Block>-->
+        <Case Expression="SchemaSpec.FootprintVT">
+          <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
+            <Case Expression="StockSpec.FootprintVT">
+              <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
+                <Block Condition="StockSpec.Footprint = SchemaSpec.Footprint">
+                  <Execute Statement="StringPartParameter:= TStringPartParameter.Create(Part, TCustomField.Footprint, SchemaSpec.Footprint)"/>
+                  <Task.AddDependency Task="CreateStringParameterTask" InstanceObject="StringPartParameter"/>
+                </Block>
+              </On>
+              <On Select="TFootPrintValueType.MaskSpecifiedByTemplate, TFootPrintValueType.MaskSpecified">
+                <Block Condition="StockSpec.FootprintMask.Matches(SchemaSpec.Footprint)">
+                  <Execute Statement="StringPartParameter:= TStringPartParameter.Create(Part, TCustomField.Footprint, SchemaSpec.Footprint)"/>
+                  <Task.AddDependency Task="CreateStringParameterTask" InstanceObject="StringPartParameter"/>
+                </Block>
+              </On>
+              <On Select="TFootPrintValueType.Unspecified, TFootPrintValueType.Cleared, TFootPrintValueType.ClearedByTemplate">
+              </On>
+              <Otherwise>
+                <Exit/>
+              </Otherwise>
+            </Case>
+          </On>
+          <On Select="TFootPrintValueType.Error, TFootPrintValueType.ErrorByTemplate">
+            <Exit/>
+          </On>
+        </Case>
         <Block Condition="StringParameterNeeded(SchemaSpec.PartNumber, SchemaSpec.PartNumberVT, StockSpec.PartNumber, StockSpec.PartNumberVT)">
           <Execute Statement="StringPartParameter:= TStringPartParameter.Create(Part, TCustomField.PartNumber, SchemaSpec.PartNumber)"/>
           <Task.AddDependency Task="CreateStringParameterTask" InstanceObject="StringPartParameter"/>
diff --git a/Script.Common.Electronics/BOM ResistorClasses.xml b/Script.Common.Electronics/BOM ResistorClasses.xml
index 7332461..aeb80e4 100644
--- a/Script.Common.Electronics/BOM ResistorClasses.xml	
+++ b/Script.Common.Electronics/BOM ResistorClasses.xml	
@@ -77,8 +77,8 @@
       <VirtualMethod Identifier="vmLoadTemplatesFromIniFile" Override="true"/>
       <VirtualMethod Identifier="vmGetTemplate" Override="true"/>
       <VirtualMethod Identifier="vmCanExtractTemplateFromIniFile" Override="true"/>
-      <Field Identifier="TemplateTHT" Type="TResistorSpec"/>
-      <Field Identifier="TemplateVariableTHT" Type="TResistorSpec"/>
+      <Field Identifier="Template" Type="TResistorSpec"/>
+      <Field Identifier="TemplateVariable" Type="TResistorSpec"/>
       <Field Identifier="ResistanceSpecificationIndex" Type="TResistanceSpecificationIndex"/>
     </DataClass>
   </Type>
@@ -428,19 +428,23 @@
 
         <Execute Statement="Result:= Result shl 1"/>
         <Case Expression="FootprintVT">
-          <On Select="TValueType.SpecifiedByTemplate, TValueType.Specified">
+          <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
             <Case Expression="ComponentSpec.FootprintVT">
-              <On Select="TValueType.SpecifiedByTemplate, TValueType.Specified">
-                <Exit Condition="Footprint &lt;&gt; ComponentSpec.Footprint" Result="0"/>
-                <Execute Statement="Result:= Result + 1"/>
+              <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
+                <Execute Statement="Result:= Result + 1" Condition="Footprint = ComponentSpec.Footprint"/>
               </On>
-              <On Select="TValueType.Error, TValueType.ErrorByTemplate">
-                <Exit Result="0"/>
+              <On Select="TFootPrintValueType.MaskSpecifiedByTemplate, TFootPrintValueType.MaskSpecified">
+                <Execute Statement="Result:= Result + 1" Condition="ComponentSpec.FootprintMask.Matches(Footprint)"/>
+              </On>
+              <On Select="TFootPrintValueType.Unspecified, TFootPrintValueType.Cleared, TFootPrintValueType.ClearedByTemplate">
               </On>
+              <Otherwise>
+                <Exit/>
+              </Otherwise>
             </Case>
           </On>
-          <On Select="TValueType.Error, TValueType.ErrorByTemplate">
-            <Exit Result="0"/>
+          <On Select="TFootPrintValueType.Error, TFootPrintValueType.ErrorByTemplate">
+            <Exit/>
           </On>
         </Case>
 
@@ -1183,10 +1187,10 @@
         <Execute Statement="Result:= ObjNil"/>
         <Case Expression="Specification.ComponentKind">
           <On Select="TComponentKind.Resistor">
-            <Execute Statement="Result:= TemplateTHT"/>
+            <Execute Statement="Result:= Template"/>
           </On>
           <On Select="TComponentKind.VariableResistor">
-            <Execute Statement="Result:= TemplateVariableTHT"/>
+            <Execute Statement="Result:= TemplateVariable"/>
           </On>
         </Case>
       </Block>
@@ -1219,18 +1223,18 @@
         <Parameter Identifier="IniFile" Type="TCustomIniFile"/>
       </Parameters>
       <Constants>
-        <Constant Identifier="sSectionTHT" Type="string" Expression="'Template.Resistor.THT'"/>
-        <Constant Identifier="sSectionVariableTHT" Type="string" Expression="'Template.Resistor.Variable.THT'"/>
+        <Constant Identifier="sSection" Type="string" Expression="'Template.Resistor'"/>
+        <Constant Identifier="sSectionVariable" Type="string" Expression="'Template.Resistor.Variable'"/>
       </Constants>
 
       <Block>
-        <ConditionalBlock Expression="IniFile.SectionExists(sSectionTHT)">
-          <Execute Statement="TemplateTHT:= TResistorSpec.Create"/>
-          <Execute Statement="TemplateTHT.LoadFromIniFileSection(IniFile, sSectionTHT)"/>
+        <ConditionalBlock Expression="IniFile.SectionExists(sSection)">
+          <Execute Statement="Template:= TResistorSpec.Create"/>
+          <Execute Statement="Template.LoadFromIniFileSection(IniFile, sSection)"/>
         </ConditionalBlock>
-        <ConditionalBlock Expression="IniFile.SectionExists(sSectionVariableTHT)">
-          <Execute Statement="TemplateVariableTHT:= TResistorSpec.Create"/>
-          <Execute Statement="TemplateVariableTHT.LoadFromIniFileSection(IniFile, sSectionVariableTHT)"/>
+        <ConditionalBlock Expression="IniFile.SectionExists(sSectionVariable)">
+          <Execute Statement="TemplateVariable:= TResistorSpec.Create"/>
+          <Execute Statement="TemplateVariable.LoadFromIniFileSection(IniFile, sSectionVariable)"/>
         </ConditionalBlock>
       </Block>
     </Procedure>
diff --git a/Script.Common.Electronics/BOM StockManager.xml b/Script.Common.Electronics/BOM StockManager.xml
index d75b761..27bab4c 100644
--- a/Script.Common.Electronics/BOM StockManager.xml	
+++ b/Script.Common.Electronics/BOM StockManager.xml	
@@ -249,14 +249,14 @@
       </Block>
     </Procedure>
 
-    <Procedure Identifier="ReadKnownFootPrints">
+    <!--<Procedure Identifier="ReadKnownFootPrints">
       <Parameters>
         <Parameter Identifier="DBConnection" Type="Connection"/>
       </Parameters>
       <Variables>
         <Variable Identifier="Found" Type="Boolean"/>
-        <Variable Identifier="FootPrint" Type="TFootPrint"/>
-        <Variable Identifier="FootPrintInfo" Type="TFootprintInfo"/>
+        --><!--<Variable Identifier="FootPrint" Type="TFootPrint"/>--><!--
+        --><!--<Variable Identifier="FootPrintInfo" Type="TFootprintInfo"/>--><!--
         <Variable Identifier="ID" Type="Integer"/>
         <Variable Identifier="Name" Type="string"/>
       </Variables>
@@ -275,7 +275,7 @@
           </ado:Recordset.OpenBlock>
         </ado:Command.CreateBlock>
       </Block>
-    </Procedure>
+    </Procedure>-->
 
     <Procedure Identifier="TStockManager.LoadFromDB">
       <Parameters>
@@ -415,7 +415,7 @@
         <Variable Identifier="Comment"/>
         <Variable Identifier="ProductionRemarks"/>
         <Variable Identifier="UnitInfo" Type="TUnitInfo"/>
-        <Variable Identifier="FootprintInfo" Type="TFootprintInfo"/>
+        <!--<Variable Identifier="FootprintInfo" Type="TFootprintInfo"/>-->
         <Variable Identifier="ComponentSpec" Type="TComponentSpec"/>
         <Variable Identifier="StockComponent" Type="TStockComponent"/>
         <Variable Identifier="StockComponentDetached" Type="TStockComponent"/>
@@ -523,10 +523,10 @@
                         <Execute Statement="StockComponent.InternalPartNumber:= IfElse(IsNull(InternalPartNumber), '', InternalPartNumber)"/>
                         <inx:Index.FindValue Index="StorageLocationIndex" Key="LocationID" Value="Location" Flags=""/>
                         <Execute Statement="StockComponent.Location:= Location"/>
-                        <Block Condition="not IsNull(FootPrintID)">
+                        <!--<Block Condition="not IsNull(FootPrintID)">
                           <inx:Index.FindValue Index="FootPrintInfoIndex" Key="FootPrintID" Value="FootprintInfo" Flags=""/>
                           <Execute Statement="StockComponent.FootprintInfo:= FootprintInfo"/>
-                        </Block>
+                        </Block>-->
                         <Execute Statement="StockComponent.StockCategory:= Category"/>
                         <lil:LinkedList.LinkUp Head="StockComponentHead" Tail="StockComponentTail" Item="StockComponent" TailLinkStatement="StockComponentTail.Next:= Item"/>
                       </ado:Recordset.Iterate>
diff --git a/Script.Common.Electronics/BOM ZenerDiodeClasses.xml b/Script.Common.Electronics/BOM ZenerDiodeClasses.xml
index 07b393f..f63f8e6 100644
--- a/Script.Common.Electronics/BOM ZenerDiodeClasses.xml	
+++ b/Script.Common.Electronics/BOM ZenerDiodeClasses.xml	
@@ -336,19 +336,23 @@
 
         <Execute Statement="Result:= Result shl 1"/>
         <Case Expression="FootprintVT">
-          <On Select="TValueType.SpecifiedByTemplate, TValueType.Specified">
+          <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
             <Case Expression="ComponentSpec.FootprintVT">
-              <On Select="TValueType.SpecifiedByTemplate, TValueType.Specified">
-                <Exit Condition="Footprint &lt;&gt; ComponentSpec.Footprint" Result="0"/>
-                <Execute Statement="Result:= Result + 1"/>
+              <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
+                <Execute Statement="Result:= Result + 1" Condition="Footprint = ComponentSpec.Footprint"/>
               </On>
-              <On Select="TValueType.Error, TValueType.ErrorByTemplate">
-                <Exit Result="0"/>
+              <On Select="TFootPrintValueType.MaskSpecifiedByTemplate, TFootPrintValueType.MaskSpecified">
+                <Execute Statement="Result:= Result + 1" Condition="ComponentSpec.FootprintMask.Matches(Footprint)"/>
+              </On>
+              <On Select="TFootPrintValueType.Unspecified, TFootPrintValueType.Cleared, TFootPrintValueType.ClearedByTemplate">
               </On>
+              <Otherwise>
+                <Exit/>
+              </Otherwise>
             </Case>
           </On>
-          <On Select="TValueType.Error, TValueType.ErrorByTemplate">
-            <Exit Result="0"/>
+          <On Select="TFootPrintValueType.Error, TFootPrintValueType.ErrorByTemplate">
+            <Exit/>
           </On>
         </Case>
 
diff --git a/Script.Common.Electronics/BOM classes.xml b/Script.Common.Electronics/BOM classes.xml
index 05d6676..445bd4e 100644
--- a/Script.Common.Electronics/BOM classes.xml	
+++ b/Script.Common.Electronics/BOM classes.xml	
@@ -27,12 +27,14 @@
 
     <Enumeration Identifier="TComponentSpecConsolidateKind" Elements="Schema, Stock"/>
 
-    <Enumeration Identifier="TCustomField" Elements="Unknown, ComponentKind, Value, ValueMin, ValueMax, Footprint, InternalPartNumber, PartNumber, Manufacturer, PowerRating, PowerRatingMin, PowerRatingMax, 
+    <Enumeration Identifier="TCustomField" Elements="Unknown, ComponentKind, Value, ValueMin, ValueMax, Footprint, FootprintMask, InternalPartNumber, PartNumber, Manufacturer, PowerRating, PowerRatingMin, PowerRatingMax, 
                  VoltageRating, VoltageRatingMin, VoltageRatingMax, AmperageRating, AmperageRatingMin, AmperageRatingMax, Tolerance, ToleranceMin, ToleranceMax, Technology, Pins, 
                  ForwardVoltage, ForwardVoltageMin, ForwardVoltageMax, ReverseVoltageRating, ReverseVoltageRatingMin, ReverseVoltageRatingMax, BreakSpeed, Dimensions, Functions" LowAlias="Low" HighAlias="High"/>
 
     <Enumeration Identifier="TValueType" Elements="Unspecified, Cleared, ClearedByTemplate, Specified, SpecifiedByTemplate, Error, ErrorByTemplate"/>
 
+    <Enumeration Identifier="TFootPrintValueType" Elements="Unspecified, Cleared, ClearedByTemplate, Specified, MaskSpecified, SpecifiedByTemplate, MaskSpecifiedByTemplate, Error, ErrorByTemplate"/>
+
     <!--<-<Type.TComponentKind-->
     <Enumeration Identifier="TComponentKind" Elements="None, Resistor, VariableResistor, Capacitor, PolarisedCapacitor, VariableCapacitor, Inductor, BridgeRectifier, ZenerDiode, Diode, SchottkyDiode, Laserdiode, 
         Photodiode, SpecialDiode, DualDiode, NPNTransistor, PNPTransistor, NFET, PFET, NIGBT, NJFET, PJFET, NMOSFET, PMOSFET, PUJT, NUJT, OpAmp, Comparator, Diac, SCR, TRIAC, LED, Fuse, Polyfuse, Antenna, 
@@ -40,7 +42,7 @@
         RFShield, RotaryEncoder, Thermocouple, VoltageDivider, Jumper, Connector, SolarCell, Battery, Adapter, Transformer, Peltier, Speaker, Buzzer, Earphone, Lamp, Heater, ElectromagneticActor, MeasuringDevice, 
         Timer, SchmittTrigger, Optocoupler, ReferenceVoltageIC, Switch, Heatsink, Relay, IntegratedCircuit, Module, Component, NonComponent" LowAlias="Low" HighAlias="High"/>
     <!-->->-->
-    <Enumeration Identifier="TFootprint" Elements="Unspecified, THT, SMD" LowAlias="Low" HighAlias="High"/>
+    <!--<Enumeration Identifier="TFootprint" Elements="Unspecified, THT, SMD" LowAlias="Low" HighAlias="High"/>-->
 
     <Enumeration Identifier="TDeepSearchstate" Elements="None, Running, Done"/>
 
@@ -98,11 +100,11 @@
       <Field Identifier="Next" Type="TComponentValue"/>
     </DataClass>
 
-    <DataClass Identifier="TFootprintInfo">
+    <!--<DataClass Identifier="TFootprintInfo">
       <Field Identifier="ID" Type="Integer"/>
       <Field Identifier="Name" Type="string"/>
       <Field Identifier="Footprint" Type="TFootprint"/>
-    </DataClass>
+    </DataClass>-->
 
     <DataClass Identifier="TStockComponent" DefaultConstructor="createonly">
       <Field Identifier="ID" Type="Integer"/>
@@ -117,7 +119,7 @@
       <Field Identifier="PickedCount" Type="UInt32"/>
       <Field Identifier="Location" Type="TStorageLocation"/>
       <Field Identifier="InternalPartNumber" Type="string"/>
-      <Field Identifier="FootPrintInfo" Type="TFootprintInfo"/>
+      <!--<Field Identifier="FootPrintInfo" Type="TFootprintInfo"/>-->
       <Field Identifier="StockCategory" Type="TStockCategory"/>
       <Field Identifier="Next" Type="TStockComponent"/>
     </DataClass>
@@ -178,8 +180,9 @@
       <Field Identifier="ComponentKind" Type="TComponentKind"/>
       <Field Identifier="ComponentKindVT" Type="TValueType"/>
       <Field Identifier="ErrorComponentKind" Type="string"/>
-      <Field Identifier="Footprint" Type="TFootprint"/>
-      <Field Identifier="FootprintVT" Type="TValueType"/>
+      <Field Identifier="Footprint" Type="string"/>
+      <Field Identifier="FootprintMask" Type="TAnsiMaskObject"/>
+      <Field Identifier="FootprintVT" Type="TFootPrintValueType"/>
       <Field Identifier="ErrorFootprint" Type="string"/>
       <Field Identifier="ID" Type="Integer"/>
       <Field Identifier="SchemaComponentHead" Type="TSchemaComponent"/>
@@ -221,6 +224,7 @@
     <Constant Identifier="sUnitName" Type="string" Expression="'BOM classes.xml'"/>
   </Constants>
   <Variables>
+    <Variable Identifier="MaskManager" Type="TAnsiMaskManager"/>
     <Variable Identifier="SymbolComponentKindIndex" Type="TMappingCaseInSensitiveUnicodeStringToInt64" Init="TMappingCaseInSensitiveUnicodeStringToInt64.Create"/>
     <Variable Identifier="CustomFieldsIndex" Type="TMappingCaseInSensitiveUnicodeStringToInt64" Init="TMappingCaseInSensitiveUnicodeStringToInt64.Create"/>
     <Variable Identifier="ComponentKindIndex" Type="TMappingCaseInSensitiveUnicodeStringToInt64" Init="TMappingCaseInSensitiveUnicodeStringToInt64.Create"/>
@@ -230,6 +234,8 @@
     <Variable Identifier="HideESerieOfValue" Type="Boolean" Init="False"/>
     <Variable Identifier="HideResistorMaxAmpVolt" Type="Boolean" Init="False"/>
     <Variable Identifier="HideZenerDiodeMaxAmp" Type="Boolean" Init="False"/>
+    <Variable Identifier="HideFootPrint" Type="Boolean" Init="False"/>
+    <Variable Identifier="SkipFootprintMatching" Type="Boolean" Init="False"/>
     <Variable Identifier="MaxShowResistorVoltage" Type="Int64" Init="1000*cFactorToPico"/>
   </Variables>
 
@@ -280,7 +286,7 @@
       </Block>
     </Function>
 
-    <Function Identifier="FootprintAsString" Type="string" IsDeterministic="true">
+    <!--<Function Identifier="FootprintAsString" Type="string" IsDeterministic="true">
       <Parameters>
         <Parameter Identifier="Footprint" Type="TFootprint"/>
       </Parameters>
@@ -298,7 +304,7 @@
           </Otherwise>
         </Case>
       </Block>
-    </Function>
+    </Function>-->
 
     <Function Identifier="ESerieOfValue" Type="string" IsDeterministic="true">
       <Parameters>
@@ -1558,17 +1564,22 @@
         </Case>
         <Execute Statement="Result:= Result shl 1"/>
         <Case Expression="FootprintVT">
-          <On Select="TValueType.SpecifiedByTemplate, TValueType.Specified">
+          <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
             <Case Expression="ComponentSpec.FootprintVT">
-              <On Select="TValueType.SpecifiedByTemplate, TValueType.Specified">
+              <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
                 <Execute Statement="Result:= Result + 1" Condition="Footprint = ComponentSpec.Footprint"/>
               </On>
+              <On Select="TFootPrintValueType.MaskSpecifiedByTemplate, TFootPrintValueType.MaskSpecified">
+                <Execute Statement="Result:= Result + 1" Condition="ComponentSpec.FootprintMask.Matches(Footprint)"/>
+              </On>
+              <On Select="TFootPrintValueType.Unspecified, TFootPrintValueType.Cleared, TFootPrintValueType.ClearedByTemplate">
+              </On>
               <Otherwise>
                 <Exit/>
               </Otherwise>
             </Case>
           </On>
-          <On Select="TValueType.Error, TValueType.ErrorByTemplate">
+          <On Select="TFootPrintValueType.Error, TFootPrintValueType.ErrorByTemplate">
             <Exit/>
           </On>
         </Case>
@@ -1642,21 +1653,28 @@
             <Exit/>
           </On>
         </Case>
-        <Case Expression="FootprintVT">
-          <On Select="TValueType.SpecifiedByTemplate, TValueType.Specified">
-            <Case Expression="ComponentSpec.FootprintVT">
-              <On Select="TValueType.SpecifiedByTemplate, TValueType.Specified">
-                <Exit Condition="Footprint &lt;&gt; ComponentSpec.Footprint"/>
-              </On>
-              <Otherwise>
-                <Exit/>
-              </Otherwise>
-            </Case>
-          </On>
-          <On Select="TValueType.Error, TValueType.ErrorByTemplate">
-            <Exit/>
-          </On>
-        </Case>
+        <Block Condition="not SkipFootprintMatching">
+          <Case Expression="FootprintVT">
+            <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
+              <Case Expression="ComponentSpec.FootprintVT">
+                <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
+                  <Exit Condition="Footprint &lt;&gt; ComponentSpec.Footprint"/>
+                </On>
+                <On Select="TFootPrintValueType.MaskSpecified, TFootPrintValueType.MaskSpecifiedByTemplate">
+                  <Exit Condition="not ComponentSpec.FootprintMask.Matches(Footprint)"/>
+                </On>
+                <On Select="TFootPrintValueType.Unspecified, TFootPrintValueType.Cleared, TFootPrintValueType.ClearedByTemplate">
+                </On>
+                <Otherwise>
+                  <Exit/>
+                </Otherwise>
+              </Case>
+            </On>
+            <On Select="TFootPrintValueType.Error, TFootPrintValueType.ErrorByTemplate">
+              <Exit/>
+            </On>
+          </Case>
+        </Block>
         <Execute Statement="Result:= True"/>
       </Block>
     </Function>
@@ -1684,17 +1702,22 @@
           </On>
         </Case>
         <Execute Statement="PartNumberModel:= locPartNumberModel"/>
-        <Case Expression="FootPrintVT">
-          <On Select="TValueType.Unspecified, TValueType.Cleared, TValueType.ClearedByTemplate">
-            <Execute Statement="Footprint:= ''"/>
-          </On>
-          <On Select="TValueType.SpecifiedByTemplate, TValueType.Specified">
-            <Execute Statement="Footprint:= FootprintAsString(Self.Footprint)"/>
-          </On>
-          <On Select="TValueType.Error, TValueType.ErrorByTemplate">
-            <Execute Statement="Footprint:= '!' + ErrorFootprint + '!'"/>
-          </On>
-        </Case>
+        <Execute Statement="Footprint:= ''"/>
+        <Block Condition="not HideFootprint">
+          <Case Expression="FootPrintVT">
+            <!--<On Select="TFootPrintValueType.Unspecified, TFootPrintValueType.Cleared, TFootPrintValueType.ClearedByTemplate">
+            </On>-->
+            <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
+              <Execute Statement="Footprint:= Self.Footprint"/>
+            </On>
+            <On Select="TFootPrintValueType.MaskSpecifiedByTemplate, TFootPrintValueType.MaskSpecified">
+              <Execute Statement="Footprint:= Self.FootprintMask.Mask"/>
+            </On>
+            <On Select="TFootPrintValueType.Error, TFootPrintValueType.ErrorByTemplate">
+              <Execute Statement="Footprint:= '!' + ErrorFootprint + '!'"/>
+            </On>
+          </Case>
+        </Block>
         <Case Expression="InternalPartNumberVT">
           <On Select="TValueType.Unspecified, TValueType.Cleared, TValueType.ClearedByTemplate">
             <Execute Statement="InternalPartNumber:= ''"/>
@@ -1798,7 +1821,7 @@
       </Parameters>
       <Variables>
         <Variable Identifier="locComponentKind" Type="TComponentKind"/>
-        <Variable Identifier="locFootprint" Type="TFootprint"/>
+        <!--<Variable Identifier="locFootprint" Type="TFootprint"/>-->
         <Variable Identifier="Found" Type="Boolean"/>
       </Variables>
       <Block>
@@ -1822,24 +1845,23 @@
           <On Select="TCustomField.Footprint">
             <Choose>
               <When Expression="Clear">
-                <Execute Statement="FootprintVT:= TValueType.Cleared"/>
+                <Execute Statement="FootprintVT:= TFootPrintValueType.Cleared"/>
                 <Execute Statement="Self.Footprint:= ''"/>
               </When>
               <Otherwise>
-                <rep:Reporter.Information Text="Format('Footprint: %s', Value)" Condition="IsVerbose"/>
-                <inx:Index.FindValue Index="FootprintIndex" Key="Value" Value="locFootprint" Found="Found" Flags="NoErrorOnNotFound" />
-                <Choose>
-                  <When Expression="Found">
-                    <rep:Reporter.Information Text="Format('Footprint: %d', locFootprint)" Condition="IsVerbose"/>
-                    <Execute Statement="FootprintVT:= TValueType.Specified"/>
-                    <Execute Statement="Footprint:= locFootprint"/>
-                  </When>
-                  <Otherwise>
-                    <rep:Reporter.Error Text="Format('Footprint could not be matched: %s', Value)" Target="Errors"/>
-                    <Execute Statement="FootprintVT:= TValueType.Error"/>
-                    <Execute Statement="ErrorFootprint:= Value"/>
-                  </Otherwise>
-                </Choose>
+                <Execute Statement="Self.Footprint:= Value"/>
+                <Execute Statement="FootprintVT:= TFootPrintValueType.Specified"/>
+              </Otherwise>
+            </Choose>
+          </On>
+          <On Select="TCustomField.FootprintMask">
+            <Choose>
+              <When Expression="Clear">
+                <Execute Statement="FootprintVT:= TFootPrintValueType.Cleared"/>
+              </When>
+              <Otherwise>
+                <Execute Statement="FootprintMask:= MaskManager.NewObject(Value)"/>
+                <Execute Statement="FootprintVT:= TFootPrintValueType.MaskSpecified"/>
               </Otherwise>
             </Choose>
           </On>
@@ -1932,14 +1954,18 @@
           </On>
         </Case>
         <Case Expression="FootprintVT" Optimalisation="integermapping">
-          <On Select="TValueType.Unspecified, TValueType.ClearedByTemplate, TValueType.SpecifiedByTemplate, TValueType.ErrorByTemplate">
+          <On Select="TFootPrintValueType.Unspecified, TFootPrintValueType.ClearedByTemplate, TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.ErrorByTemplate">
             <Case Expression="locTemplate.FootprintVT" Optimalisation="integermapping">
-              <On Select="TValueType.SpecifiedByTemplate, TValueType.Specified">
+              <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
                 <Execute Statement="Footprint:= locTemplate.Footprint"/>
-                <Execute Statement="FootprintVT:= TValueType.SpecifiedByTemplate"/>
+                <Execute Statement="FootprintVT:= TFootPrintValueType.SpecifiedByTemplate"/>
               </On>
-              <On Select="TValueType.Error, TValueType.ErrorByTemplate">
-                <Execute Statement="FootprintVT:= TValueType.ErrorByTemplate"/>
+              <On Select="TFootPrintValueType.MaskSpecified, TFootPrintValueType.MaskSpecifiedByTemplate">
+                <Execute Statement="FootprintMask:= locTemplate.FootprintMask"/>
+                <Execute Statement="FootprintVT:= TFootPrintValueType.MaskSpecifiedByTemplate"/>
+              </On>
+              <On Select="TFootPrintValueType.Error, TFootPrintValueType.ErrorByTemplate">
+                <Execute Statement="FootprintVT:= TFootPrintValueType.ErrorByTemplate"/>
               </On>
             </Case>
           </On>
@@ -1995,6 +2021,12 @@
               <Execute Statement="HandleField(TCustomField.Value, 'Value', Node.Text, Node.Text='-')"/>
             </msx:Block>
           </msx:OnElement>
+          <msx:OnElement baseName="'footprint'">
+            <msx:Block>
+              <rep:Reporter.Information Text="Format('Footprint=%s', Node.Text)" Condition="IsVerbose"/>
+              <Execute Statement="HandleField(TCustomField.Footprint, 'Footprint', Node.Text, Node.Text='')"/>
+            </msx:Block>
+          </msx:OnElement>
           <msx:OnElement baseName="'fields'">
             <msx:Block>
               <msx:Node.IterateChilds Node="Node">
@@ -2075,7 +2107,53 @@
         <Exit Condition="Result &lt;&gt; 0"/>
         <Execute Statement="Result:= CompareStateStringValue(A.ID, A.Manufacturer, A.ManufacturerVT, B.ID, B.Manufacturer, B.ManufacturerVT)"/>
         <Exit Condition="Result &lt;&gt; 0"/>
-        <Execute Statement="Result:= CompareStateValue(A.ID, A.Footprint, A.FootprintVT, B.ID, B.Footprint, B.FootprintVT)"/>
+        <Block Condition="not (HideFootprint and SkipFootprintMatching)">
+          <Case Expression="A.FootprintVT">
+            <On Select="TFootPrintValueType.Unspecified, TFootPrintValueType.Cleared, TFootPrintValueType.ClearedByTemplate">
+              <Case Expression="B.FootprintVT">
+                <On Select="TFootPrintValueType.Error, TFootPrintValueType.ErrorByTemplate">
+                  <Exit Result="-1"/>
+                </On>
+                <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified, TFootPrintValueType.MaskSpecifiedByTemplate, TFootPrintValueType.MaskSpecified">
+                  <Execute Statement="Result:= 1"/>
+                </On>
+              </Case>
+            </On>
+            <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
+              <Case Expression="B.FootprintVT">
+                <On Select="TFootPrintValueType.Unspecified, TFootPrintValueType.Cleared, TFootPrintValueType.ClearedByTemplate, TFootPrintValueType.Error, TFootPrintValueType.ErrorByTemplate, TFootPrintValueType.MaskSpecifiedByTemplate, TFootPrintValueType.MaskSpecified">
+                  <Execute Statement="Result:= -1"/>
+                </On>
+                <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
+                  <Execute Statement="Result:= AnsiCompareStr(A.Footprint, B.Footprint)"/>
+                </On>
+              </Case>
+            </On>
+            <On Select="TFootPrintValueType.MaskSpecifiedByTemplate, TFootPrintValueType.MaskSpecified">
+              <Case Expression="B.FootprintVT">
+                <On Select="TFootPrintValueType.Unspecified, TFootPrintValueType.Cleared, TFootPrintValueType.ClearedByTemplate, TFootPrintValueType.Error, TFootPrintValueType.ErrorByTemplate">
+                  <Execute Statement="Result:= -1"/>
+                </On>
+                <On Select="TFootPrintValueType.SpecifiedByTemplate, TFootPrintValueType.Specified">
+                  <Execute Statement="Result:= 1"/>
+                </On>
+                <On Select="TFootPrintValueType.MaskSpecifiedByTemplate, TFootPrintValueType.MaskSpecified">
+                  <Execute Statement="Result:= AnsiCompareStr(A.FootprintMask.Mask, B.FootprintMask.Mask)"/>
+                </On>
+              </Case>
+            </On>
+            <On Select="TFootPrintValueType.Error, TFootPrintValueType.ErrorByTemplate">
+              <Case Expression="B.FootprintVT">
+                <On Select="TFootPrintValueType.Error, TFootPrintValueType.ErrorByTemplate">
+                  <Exit Result="-1" Condition="A.ID &lt; B.ID"/>
+                </On>
+                <Otherwise>
+                  <Execute Statement="Result:= 1"/>
+                </Otherwise>
+              </Case>
+            </On>
+          </Case>
+        </Block>
       </Block>
     </Function>
 
@@ -2517,7 +2595,7 @@
             <Execute Statement="Specification.Template:= StockComponent.StockCategory.ComponentSpec"/>
             <Execute Statement="Specification.HandleField(TCustomField.Value, '', StockComponent.Name, StockComponent.Name='-')"/>
             <Execute Statement="Specification.HandleField(TCustomField.InternalPartNumber, '', StockComponent.InternalPartNumber, StockComponent.InternalPartNumber='-')" Condition="IsNonEmptyString(StockComponent.InternalPartNumber)"/>
-            <Execute Statement="Specification.HandleField(TCustomField.Footprint, '', StockComponent.FootprintInfo.Name, False)" Condition="Assigned(StockComponent.FootprintInfo)"/>
+            <!--<Execute Statement="Specification.HandleField(TCustomField.Footprint, '', StockComponent.FootprintInfo.Name, False)" Condition="Assigned(StockComponent.FootprintInfo)"/>-->
             <lil:LinkedList.Iterate Head="ValueHead" ItemType="TComponentValue" RunningItem="RunningComponentValue" Next="RunningComponentValue.Next">
               <Execute Statement="CustomField:= TCustomField.Unknown"/>
               <inx:Index.FindValue Index="CustomFieldsIndex" Key="RunningComponentValue.Name" Value="CustomField" Flags="NoErrorOnNotFound" />
@@ -2573,6 +2651,9 @@
           <On Select="TCustomField.Footprint">
             <Execute Statement="Result:= 'Footprint'"/>
           </On>
+          <On Select="TCustomField.FootprintMask">
+            <Execute Statement="Result:= 'Footprint.Mask'"/>
+          </On>
           <On Select="TCustomField.InternalPartNumber">
             <Execute Statement="Result:= 'InternalPartNumber'"/>
           </On>
@@ -2669,7 +2750,7 @@
       </Block>
     </Procedure>
 
-    <Function Identifier="FootprintName" Type="string">
+    <!--<Function Identifier="FootprintName" Type="string">
       <Parameters>
         <Parameter Identifier="Footprint" Type="TFootprint"/>
       </Parameters>
@@ -2689,9 +2770,9 @@
           </Otherwise>
         </Case>
       </Block>
-    </Function>
+    </Function>-->
 
-    <Procedure Identifier="InitFootprintIndex">
+    <!--<Procedure Identifier="InitFootprintIndex">
       <Parameters>
         <Parameter Identifier="Index" Type="TAbstractBoxedValueMappingHashIndex"/>
       </Parameters>
@@ -2700,7 +2781,7 @@
           <inx:Index.MapValue Index="Index" Key="FootprintName(I)" Value="I"/>
         </ForLoop>
       </Block>
-    </Procedure>
+    </Procedure>-->
 
     <Procedure Identifier="InitSymbolComponentKindIndex">
       <Parameters>
@@ -2794,17 +2875,22 @@
   </Procedures>
 
   <Initialization>
+    <Execute Statement="MaskManager:= TAnsiMaskManager.Create"/>
+    <Execute Statement="MaskManager.Groups:= True"/>
+    <Execute Statement="MaskManager.CaseSensitive:= True"/>
+    <Execute Statement="MaskManager.RepeatingGroup:= True"/>
     <Execute Statement="InitCustomFieldIndex(CustomFieldsIndex)"/>
     <Execute Statement="InitComponentKindIndex(ComponentKindIndex)"/>
-    <Execute Statement="InitFootprintIndex(FootprintIndex)"/>
+    <!--<Execute Statement="InitFootprintIndex(FootprintIndex)"/>-->
     <Execute Statement="InitSymbolComponentKindIndex(SymbolComponentKindIndex)"/>
   </Initialization>
 
   <Finalization>
     <Free Identifier="CustomFieldsIndex"/>
-    <Free Identifier="FootprintIndex"/>
+    <!--<Free Identifier="FootprintIndex"/>-->
     <Free Identifier="ComponentKindIndex"/>
     <Free Identifier="SymbolComponentKindIndex"/>
+    <Free Identifier="MaskManager"/>
   </Finalization>
 
 </pkg:Library>
\ No newline at end of file
diff --git a/Script.Project/Generate BOM.xml b/Script.Project/Generate BOM.xml
index 6700885..5ac7f89 100644
--- a/Script.Project/Generate BOM.xml	
+++ b/Script.Project/Generate BOM.xml	
@@ -17,15 +17,12 @@
     <pkg:Target Identifier="Report" Description="BOM report"/>
     <pkg:Target Identifier="DesignatorReport" Description="Designator report"/>
     <pkg:Target Identifier="StorageLocationReport" Description="Storage location report"/>
-    <!--<pkg:Target Identifier="DesignatorStockReport" Description="Designator stock report"/>-->
     <pkg:Target Identifier="StockReport" Description="Partkeepr components"/>
     <pkg:Target Identifier="TaskOutput" Description="Task output"/>
     <pkg:Target Identifier="Info" Description="Info"/>
     <pkg:Target Identifier="Warnings" Description="Warnings"/>
     <pkg:Target Identifier="Errors" Description="Errors"/>
     <pkg:Target Identifier="ReportEEVBlog" Description="BOM report - EEVBlog"/>
-    <!--<pkg:Target Identifier="Errors" Description="Fouten"/>
-    <pkg:Target Identifier="Warnings" Description="Waarschuwingen"/>-->
   </pkg:ReportTargets>
   <pkg:Config xml:space="preserve">[Settings]
 BomFilename=..\Resources.Project\ESeriesBOM.xml
@@ -43,36 +40,36 @@ ExportUnmatchedComponentsStorageID=1
 HideESerieOfValue=0
 HideResistorMaxAmpVolt=0
 HideZenerDiodeMaxAmp=0
+HideFootprint=0
 MaxShowResistorVoltage=230V
 ;Defaults to system
 ;DecimalSeparator=,
 
-[Template.Resistor.THT]
+[Matching]
+SkipFootprint=0
+
+
+[Template.Resistor]
 PowerRating = 250mW
 Tolerance = 2%
 Technology = metal film
-Footprint = THT
-
 
 [Template.Resistor.Variable.THT.rem]
 ;PowerRating = 250mW
 
-[Template.PolarisedCapacitor.THT]
+[Template.PolarisedCapacitor]
 ;Tolerance = 10%
 VoltageRating = 50V
 Technology = electrolytic
-Footprint = THT
 
-[Template.Capacitor.THT]
+[Template.Capacitor]
 ;Tolerance = 10%
 VoltageRating = 50V
 Technology = ceramic
-Footprint = THT
 
-[Template.ZenderDiode.THT]
+[Template.ZenderDiode]
 ;Tolerance = 10%
 PowerRating = 1W
-;Footprint = THT
 
 [Template.Fuse]
 VoltageRating = 250V
@@ -118,6 +115,7 @@ VoltageRating = 250V
     <Constant Identifier="secSettings" Type="string" Expression="'Settings'"/>
     <Constant Identifier="secDisplay" Type="string" Expression="'Display'"/>
     <Constant Identifier="secTasks" Type="string" Expression="'Tasks'"/>
+    <Constant Identifier="secMatching" Type="string" Expression="'Matching'"/>
     <Constant Identifier="keyBomFilename" Type="string" Expression="'BomFilename'"/>
     <Constant Identifier="keyDecimalSeparator" Type="string" Expression="'DecimalSeparator'"/>
     <Constant Identifier="keyBomCount" Type="string" Expression="'BomCount'"/>
@@ -128,8 +126,10 @@ VoltageRating = 250V
     <Constant Identifier="keyHideESerieOfValue" Type="string" Expression="'HideESerieOfValue'"/>
     <Constant Identifier="keyHideResistorMaxAmpVolt" Type="string" Expression="'HideResistorMaxAmpVolt'"/>
     <Constant Identifier="keyHideZenerDiodeMaxAmp" Type="string" Expression="'HideZenerDiodeMaxAmp'"/>
+    <Constant Identifier="keyHideFootprint" Type="string" Expression="'HideFootprint'"/>
     <Constant Identifier="keyMaxShowResistorVoltage" Type="string" Expression="'MaxShowResistorVoltage'"/>
     <Constant Identifier="keySymbolMappingDirectory" Type="string" Expression="'SymbolMappingDirectory'"/>
+    <Constant Identifier="keySkipFootprint" Type="string" Expression="'SkipFootprint'"/>
   </Constants>
   <Variables>
     <Variable Identifier="ConnectionString" Type="string" Init="connsPartKeepr"/>
@@ -153,6 +153,10 @@ VoltageRating = 250V
     <Execute Statement="HideESerieOfValue:= ConfigInifile.ReadBool(secDisplay, keyHideESerieOfValue, HideESerieOfValue)"/>
     <Execute Statement="HideResistorMaxAmpVolt:= ConfigInifile.ReadBool(secDisplay, keyHideResistorMaxAmpVolt, HideESerieOfValue)"/>
     <Execute Statement="HideZenerDiodeMaxAmp:= ConfigInifile.ReadBool(secDisplay, keyHideZenerDiodeMaxAmp, HideESerieOfValue)"/>
+    <Execute Statement="HideFootprint:= ConfigInifile.ReadBool(secDisplay, keyHideFootprint, HideFootprint)"/>
+
+    <Execute Statement="SkipFootprintMatching:= ConfigInifile.ReadBool(secMatching, keySkipFootprint, SkipFootprintMatching)"/>
+
     <Variable Identifier="MaxShowResistorVoltageS" Type="string" Init="ConfigInifile.ReadString(secDisplay, keyMaxShowResistorVoltage, ResistorMaxVoltConv.IntValueToStr(MaxShowResistorVoltage, True))"/>
     <Raise Expression="Exception.Create('Invalid voltage: ' + MaxShowResistorVoltageS)" Condition="not ResistorMaxVoltConv.StrToIntValue(MaxShowResistorVoltageS, MaxShowResistorVoltage)"/>
     <Execute Statement="ConnectionString:= ConfigInifile.ReadString(secSettings, keyConnectionString, ConnectionString)"/>
@@ -188,8 +192,8 @@ VoltageRating = 250V
       <sts:ShowStatus.Information Text="sReadingKnownUnits"/>
       <Execute Statement="ReadKnownUnits(DBConnection)"/>
 
-      <sts:ShowStatus.Information Text="sReadingKnownFootPrints"/>
-      <Execute Statement="ReadKnownFootPrints(DBConnection)"/>
+      <!--<sts:ShowStatus.Information Text="sReadingKnownFootPrints"/>
+      <Execute Statement="ReadKnownFootPrints(DBConnection)"/>-->
       
       <sts:ShowStatus.Information Text="sReadingStock"/>
       <Execute Statement="globStockManager.LoadFromDB(DBConnection)"/>