diff --git a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Apparel.xml b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Apparel.xml
index c9dfab2..072b781 100644
--- a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Apparel.xml
+++ b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Apparel.xml
@@ -7,28 +7,20 @@
 
     <!-- Legion Explorer Armor -->
 
-    <ThingDef ParentName="ArmorMachineableBase">
+    <ThingDef ParentName="FCP_Armor_Machineable_Base">
         <defName>FCP_Apparel_Legion_Explorer_Armor</defName>
         <description>A lightweight suit of armor worn by Legion Scouts, very similar in appearance to the recruit armor. Like most Legion armor, it is made from repurposed sports equipment, consisting of a football player's protective shoulder and chest pads reinforced with additional leather padding and worn over a baseball catcher's vest. It doesn�t protect very well.</description>
-        <techLevel>Industrial</techLevel>
         <label>Legion Explorer Armor</label>
         <recipeMaker>
             <researchPrerequisite>FCP_Legion_Basic_Equipment</researchPrerequisite>
-            <unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
             <skillRequirements>
                 <Crafting>2</Crafting>
             </skillRequirements>
-            <recipeUsers>
-                <li>FCP_Production_Armor_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <graphicData>
             <texPath>Apparel/Legion_Armor/Legion_Explorer/FCP_Legion_Explorer_Armor</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
-        <thingCategories>
-            <li>ApparelArmor</li>
-        </thingCategories>
         <statBases>
             <MaxHitPoints>200</MaxHitPoints>
             <WorkToMake>8200</WorkToMake>
@@ -73,28 +65,20 @@
         </comps>
     </ThingDef>
     <!-- Legion Recruit Armor -->
-    <ThingDef ParentName="ArmorMachineableBase">
+    <ThingDef ParentName="FCP_Armor_Machineable_Base">
         <defName>FCP_Apparel_Legion_Recruit_Armor</defName>
         <description>Like most Legion armor, the recruit armor is made from repurposed sports equipment, consisting of a football player's protective shoulder and chest pads reinforced with additional leather padding and worn over a baseball catcher's vest.</description>
-        <techLevel>Industrial</techLevel>
         <label>Legion Recruit Armor</label>
         <recipeMaker>
             <researchPrerequisite>FCP_Legion_Basic_Equipment</researchPrerequisite>
-            <unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
             <skillRequirements>
                 <Crafting>2</Crafting>
             </skillRequirements>
-            <recipeUsers>
-                <li>FCP_Production_Armor_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <graphicData>
             <texPath>Apparel/Legion_Armor/Legion_Recruit/FCP_Legion_Recruit_Armor</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
-        <thingCategories>
-            <li>ApparelArmor</li>
-        </thingCategories>
         <statBases>
             <MaxHitPoints>200</MaxHitPoints>
             <WorkToMake>8500</WorkToMake>
@@ -138,28 +122,20 @@
         </comps>
     </ThingDef>
     <!-- Legion Prime Armor -->
-    <ThingDef ParentName="ArmorMachineableBase">
+    <ThingDef ParentName="FCP_Armor_Machineable_Base">
         <defName>FCP_Apparel_Legion_Prime_Armor</defName>
         <description>The Legion�s main fighting force, the prime legionaries have earned their right to wear better armor compared to the recruits. It�s still made with the same protective shoulder and chest pads but features additional armor bands wrapped around the upper body.</description>
-        <techLevel>Industrial</techLevel>
         <label>Legion Prime Armor</label>
         <recipeMaker>
             <researchPrerequisite>FCP_Legion_Basic_Equipment</researchPrerequisite>
-            <unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
             <skillRequirements>
                 <Crafting>3</Crafting>
             </skillRequirements>
-            <recipeUsers>
-                <li>FCP_Production_Armor_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <graphicData>
             <texPath>Apparel/Legion_Armor/Legion_Prime/FCP_Legion_Prime_Armor</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
-        <thingCategories>
-            <li>ApparelArmor</li>
-        </thingCategories>
         <statBases>
             <MaxHitPoints>200</MaxHitPoints>
             <WorkToMake>8500</WorkToMake>
@@ -205,28 +181,20 @@
         </comps>
     </ThingDef>
     <!-- Legion Veteran Armor -->
-    <ThingDef ParentName="ArmorMachineableBase">
+    <ThingDef ParentName="FCP_Armor_Machineable_Base">
         <defName>FCP_Apparel_Legion_Veteran_Armor</defName>
         <description>Compared to regular legionaries� armor, veteran armor has additional armor pads on the lower legs, as well as several sharp nails sticking out of the shoulder pads and the leather wrappings on the right arm. It offers more protection while still being somewhat light.</description>
-        <techLevel>Industrial</techLevel>
         <label>Legion Veteran Armor</label>
         <recipeMaker>
             <researchPrerequisite>FCP_Legion_Advanced_Equipment</researchPrerequisite>
-            <unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
             <skillRequirements>
                 <Crafting>3</Crafting>
             </skillRequirements>
-            <recipeUsers>
-                <li>FCP_Production_Armor_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <graphicData>
             <texPath>Apparel/Legion_Armor/Legion_Veteran/FCP_Legion_Veteran_Armor</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
-        <thingCategories>
-            <li>ApparelArmor</li>
-        </thingCategories>
         <statBases>
             <MaxHitPoints>200</MaxHitPoints>
             <WorkToMake>8700</WorkToMake>
@@ -272,28 +240,20 @@
         </comps>
     </ThingDef>
     <!-- Legion Vexillarius Armor -->
-    <ThingDef ParentName="ArmorMachineableBase">
+    <ThingDef ParentName="FCP_Armor_Machineable_Base">
         <defName>FCP_Apparel_Legion_Vexillarius_Armor</defName>
         <description>Based on a suit of Legion veteran armor, with the addition of circular metal plates attached to the torso, as well as a banner displaying the flag of the Legion worn on the back. While it is a step up from the lower ranks� armor, it is also considerably heavier.</description>
-        <techLevel>Industrial</techLevel>
         <label>Legion Vexillarius Armor</label>
         <recipeMaker>
             <researchPrerequisite>FCP_Legion_Advanced_Equipment</researchPrerequisite>
-            <unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
             <skillRequirements>
                 <Crafting>4</Crafting>
             </skillRequirements>
-            <recipeUsers>
-                <li>FCP_Production_Armor_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <graphicData>
             <texPath>Apparel/Legion_Armor/Legion_Vexillarius/FCP_Legion_Vexillarius_Armor</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
-        <thingCategories>
-            <li>ApparelArmor</li>
-        </thingCategories>
         <statBases>
             <MaxHitPoints>200</MaxHitPoints>
             <WorkToMake>8850</WorkToMake>
@@ -340,28 +300,20 @@
         </comps>
     </ThingDef>
     <!-- Legion Praetorian Armor -->
-    <ThingDef ParentName="ArmorMachineableBase">
+    <ThingDef ParentName="FCP_Armor_Machineable_Base">
         <defName>FCP_Apparel_Legion_Praetorian_Armor</defName>
         <description>This armor commonly worn by Caesar�s personal guard is similar to the recruit armor, but sports additional metal bracers on the forearms, probably because of the Praetorian�s preference for punching people with their fists, as well as a short red cape and a red cowl. Despite its close resemblance, this armor protects it�s wearer a lot better than the recruit armor while weighing about the same.</description>
-        <techLevel>Industrial</techLevel>
         <label>Legion Praetorian Armor</label>
         <recipeMaker>
             <researchPrerequisite>FCP_Legion_Advanced_Equipment</researchPrerequisite>
-            <unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
             <skillRequirements>
                 <Crafting>4</Crafting>
             </skillRequirements>
-            <recipeUsers>
-                <li>FCP_Production_Armor_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <graphicData>
             <texPath>Apparel/Legion_Armor/Legion_Praetorian/FCP_Legion_Praetorian_Armor</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
-        <thingCategories>
-            <li>ApparelArmor</li>
-        </thingCategories>
         <statBases>
             <MaxHitPoints>200</MaxHitPoints>
             <WorkToMake>9000</WorkToMake>
@@ -406,28 +358,20 @@
         </comps>
     </ThingDef>
     <!-- Legion Centurion Armor -->
-    <ThingDef ParentName="ArmorMachineableBase">
+    <ThingDef ParentName="FCP_Armor_Machineable_Base">
         <defName>FCP_Apparel_Legion_Centurion_Armor</defName>
         <description>A heavy suit of armor worn by the Legion�s centurions, the elite of the Legion. It�s composed of a wild assortment of different armors, including pieces of combat armor, power armor leather armor and even super mutant armor. These pieces are likely taken from enemies defeated by the wearer. Despite being such a crude assortment of different armors, it offers superior protection.</description>
-        <techLevel>Industrial</techLevel>
         <label>Legion Centurion Armor</label>
         <recipeMaker>
             <researchPrerequisite>FCP_Legion_Advanced_Equipment</researchPrerequisite>
-            <unfinishedThingDef>UnfinishedMetallicTechArmor</unfinishedThingDef>
             <skillRequirements>
                 <Crafting>5</Crafting>
             </skillRequirements>
-            <recipeUsers>
-                <li>FCP_Production_Armor_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <graphicData>
             <texPath>Apparel/Legion_Armor/Legion_Centurion/FCP_Legion_Centurion_Armor</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
-        <thingCategories>
-            <li>ApparelArmor</li>
-        </thingCategories>
         <statBases>
             <MaxHitPoints>265</MaxHitPoints>
             <WorkToMake>12500</WorkToMake>
@@ -475,28 +419,20 @@
         </comps>
     </ThingDef>
     <!-- Legion Legate Armor -->
-    <ThingDef ParentName="ArmorMachineableBase">
+    <ThingDef ParentName="FCP_Armor_Machineable_Base">
         <defName>FCP_Apparel_Legion_Legate_Armor</defName>
         <description>The armor of a Legate, a close confidante of the mighty Caesar himself. A full suit of heavy gauge steel, bearing numerous scratches and dents from countless battles, and offers full body protection. It was crafted to closely resemble the armors of the ancient romans and has little to do with the repurposed sports equipment most members of the Legion wear. Unsurprisingly it provides it�s wearer with superior protection but is incredibly heavy.</description>
-        <techLevel>Industrial</techLevel>
         <label>Legion Legate Armor</label>
         <recipeMaker>
             <researchPrerequisite>FCP_Legion_Advanced_Equipment</researchPrerequisite>
-            <unfinishedThingDef>UnfinishedMetallicTechArmor</unfinishedThingDef>
             <skillRequirements>
                 <Crafting>6</Crafting>
             </skillRequirements>
-            <recipeUsers>
-                <li>FCP_Production_Armor_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <graphicData>
             <texPath>Apparel/Legion_Armor/Legion_Legate/FCP_Legion_Legate_Armor</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
-        <thingCategories>
-            <li>ApparelArmor</li>
-        </thingCategories>
         <statBases>
             <MaxHitPoints>265</MaxHitPoints>
             <WorkToMake>13000</WorkToMake>
@@ -545,27 +481,17 @@
     </ThingDef>
     <!--_____ Legion Accessories _____-->
     <!-- Legion Tunic -->
-    <ThingDef ParentName="ApparelMakeableBase">
+    <ThingDef ParentName="FCP_Apparel_Makeable_Base">
         <defName>FCP_Apparel_Legion_Tunic</defName>
         <description>The common tunic worn by the members of Caesar�s Legion.</description>
         <label>Legion Tunic</label>
         <recipeMaker>
             <researchPrerequisite>FCP_Legion_Basic_Equipment</researchPrerequisite>
-            <unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
-            <skillRequirements>
-                <Crafting>2</Crafting>
-            </skillRequirements>
-            <recipeUsers>
-                <li>FCP_Production_Tailoring_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <graphicData>
             <texPath>Apparel/Legion_Armor/Legion_Tunic/FCP_Legion_Tunic</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
-        <thingCategories>
-            <li>ApparelArmor</li>
-        </thingCategories>
         <statBases>
             <MaxHitPoints>200</MaxHitPoints>
             <WorkToMake>8200</WorkToMake>
@@ -599,27 +525,20 @@
         </comps>
     </ThingDef>
     <!-- Legion Plate -->
-    <ThingDef ParentName="ArmorMachineableBase">
+    <ThingDef ParentName="FCP_Armor_Machineable_Base">
         <defName>FCP_Apparel_Legion_Plate</defName>
         <description>A set of Legion plate armor, usauly made of scavenged pre-war football pads with nails added to the shoulders for extra protection.</description>
         <label>Legion Plate</label>
         <recipeMaker>
             <researchPrerequisite>FCP_Legion_Basic_Equipment</researchPrerequisite>
-            <unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
             <skillRequirements>
                 <Crafting>2</Crafting>
             </skillRequirements>
-            <recipeUsers>
-                <li>FCP_Production_Armor_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <graphicData>
             <texPath>Apparel/Legion_Armor/Legion_Plate/FCP_Legion_Plate</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
-        <thingCategories>
-            <li>ApparelArmor</li>
-        </thingCategories>
         <statBases>
             <MaxHitPoints>200</MaxHitPoints>
             <WorkToMake>1000</WorkToMake>
@@ -652,27 +571,17 @@
         </comps>
     </ThingDef>
     <!-- Legion Leather Vest -->
-    <ThingDef ParentName="ArmorMachineableBase">
+    <ThingDef ParentName="FCP_Apparel_Makeable_Base">
         <defName>FCP_Apparel_Legion_Vest</defName>
         <description>A lightweight leather vest used by the Legion. The base of the vest seams to be made from an old baseball umpires pads, or even some football training pads. Either way it gives the user some more protection than nothing at all.</description>
         <label>Legion Vest</label>
         <recipeMaker>
             <researchPrerequisite>FCP_Legion_Basic_Equipment</researchPrerequisite>
-            <unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
-            <skillRequirements>
-                <Crafting>2</Crafting>
-            </skillRequirements>
-            <recipeUsers>
-                <li>FCP_Production_Tailoring_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <graphicData>
             <texPath>Apparel/Legion_Armor/Legion_Vest/FCP_Legion_Vest</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
-        <thingCategories>
-            <li>ApparelArmor</li>
-        </thingCategories>
         <statBases>
             <MaxHitPoints>200</MaxHitPoints>
             <WorkToMake>700</WorkToMake>
@@ -708,20 +617,15 @@
     </ThingDef>
     <!--_____ Legion Headgear _____-->
     <!-- Legion Explorer Hood -->
-    <ThingDef ParentName="ArmorHelmetMakeableBase">
+    <ThingDef ParentName="FCP_Armor_Helmet_Makeable_Base">
         <defName>FCP_Apparel_Legion_Explorer_Hood</defName>
         <label>Legion Explorers Hood</label>
         <description>A basic, lightweight helmet composed of a thick brown cloth headwrap featuring a visor to shield the wearer�s eyes from the scorching sun. Worn by the explorers, scouts in service of Caesar�s Legion</description>
-        <techLevel>Industrial</techLevel>
         <recipeMaker>
             <researchPrerequisite>FCP_Legion_Basic_Equipment</researchPrerequisite>
-            <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
             <skillRequirements>
                 <Crafting>2</Crafting>
             </skillRequirements>
-            <recipeUsers>
-                <li>FCP_Production_Tailoring_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <graphicData>
             <texPath>Apparel/Legion_Armor/Legion_Explorer/Legion_Explorer_Hood/FCP_Legion_Explorer_Hood</texPath>
@@ -738,9 +642,6 @@
             <Insulation_Heat>5</Insulation_Heat>
             <EquipDelay>1.5</EquipDelay>
         </statBases>
-        <thingCategories>
-            <li>ApparelArmor</li>
-        </thingCategories>
         <costList>
             <Cloth>15</Cloth>
             <Leather_Plain>10</Leather_Plain>
@@ -767,20 +668,15 @@
         </comps>
     </ThingDef>
     <!-- Legion Recruit Decanus Helmet -->
-    <ThingDef ParentName="ArmorHelmetMakeableBase">
+    <ThingDef ParentName="FCP_Armor_Helmet_Makeable_Base">
         <defName>FCP_Apparel_Legion_Recruit_Decanus_Helmet</defName>
         <label>Legion Recruit Decanus Helmet</label>
         <description>A pre-war football helmet adorned with feathers, worn with a red face wrap and black goggles. While it offers a decent amount of protection, its main use is to serve as a symbol of rank. The red and black feathers fastened on the helmet identify the wearer as a recruit decanus, the most junior rank of officer within Caesar�s Legion, leading a squad of inexperienced recruits.</description>
-        <techLevel>Industrial</techLevel>
         <recipeMaker>
             <researchPrerequisite>FCP_Legion_Basic_Equipment</researchPrerequisite>
-            <unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
             <skillRequirements>
                 <Crafting>2</Crafting>
             </skillRequirements>
-            <recipeUsers>
-                <li>FCP_Production_Armor_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <graphicData>
             <texPath>Apparel/Legion_Armor/Legion_Recruit/Legion_Recruit_Decanus_Helmet/FCP_Legion_Recruit_Decanus_Helmet</texPath>
@@ -797,9 +693,6 @@
             <Insulation_Heat>5</Insulation_Heat>
             <EquipDelay>1.5</EquipDelay>
         </statBases>
-        <thingCategories>
-            <li>ApparelArmor</li>
-        </thingCategories>
         <costList>
             <Cloth>15</Cloth>
             <Leather_Plain>20</Leather_Plain>
@@ -826,20 +719,15 @@
         </comps>
     </ThingDef>
     <!-- Legion Recruit Helmet -->
-    <ThingDef ParentName="ArmorHelmetMakeableBase">
+    <ThingDef ParentName="FCP_Armor_Helmet_Makeable_Base">
         <defName>FCP_Apparel_Legion_Recruit_Helmet</defName>
         <label>Legion Recruit Helmet</label>
         <description>A brown leather cap worn with black protective goggles and the lower face is wrapped with a bandana. Not the best helmet, but it is easy to make and lightweight.</description>
-        <techLevel>Industrial</techLevel>
         <recipeMaker>
             <researchPrerequisite>FCP_Legion_Basic_Equipment</researchPrerequisite>
-            <unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
             <skillRequirements>
                 <Crafting>2</Crafting>
             </skillRequirements>
-            <recipeUsers>
-                <li>FCP_Production_Armor_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <graphicData>
             <texPath>Apparel/Legion_Armor/Legion_Recruit/Legion_Recruit_Helmet/FCP_Legion_Recruit_Helmet</texPath>
@@ -856,9 +744,6 @@
             <Insulation_Heat>5</Insulation_Heat>
             <EquipDelay>1.5</EquipDelay>
         </statBases>
-        <thingCategories>
-            <li>ApparelArmor</li>
-        </thingCategories>
         <costList>
             <Cloth>15</Cloth>
             <Leather_Plain>20</Leather_Plain>
@@ -885,20 +770,15 @@
         </comps>
     </ThingDef>
     <!-- Legion Prime Decanus Helmet -->
-    <ThingDef ParentName="ArmorHelmetMakeableBase">
+    <ThingDef ParentName="FCP_Armor_Helmet_Makeable_Base">
         <defName>FCP_Apparel_Legion_Prime_Decanus_Helmet</defName>
         <label>Legion Prime Decanus Helmet</label>
         <description>A pre-war football helmet adorned with feathers, worn with a red face wrap and black goggles. While it offers a decent amount of protection, its main use is to serve as a symbol of rank. The black feathers fastened on the helmet identify the wearer as a prime decanus, a middle rank of officer within Caesar�s Legion, leading a squad of prime legionaries.</description>
-        <techLevel>Industrial</techLevel>
         <recipeMaker>
             <researchPrerequisite>FCP_Legion_Basic_Equipment</researchPrerequisite>
-            <unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
             <skillRequirements>
                 <Crafting>2</Crafting>
             </skillRequirements>
-            <recipeUsers>
-                <li>FCP_Production_Armor_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <graphicData>
             <texPath>Apparel/Legion_Armor/Legion_Prime/Legion_Prime_Decanus_Helmet/FCP_Legion_Prime_Decanus_Helmet</texPath>
@@ -915,9 +795,6 @@
             <Insulation_Heat>5</Insulation_Heat>
             <EquipDelay>1.5</EquipDelay>
         </statBases>
-        <thingCategories>
-            <li>ApparelArmor</li>
-        </thingCategories>
         <costList>
             <Cloth>15</Cloth>
             <Leather_Plain>20</Leather_Plain>
@@ -944,20 +821,15 @@
         </comps>
     </ThingDef>
     <!-- Legion Prime Helmet -->
-    <ThingDef ParentName="ArmorHelmetMakeableBase">
+    <ThingDef ParentName="FCP_Armor_Helmet_Makeable_Base">
         <defName>FCP_Apparel_Legion_Prime_Helmet</defName>
         <label>Legion Prime Helmet</label>
         <description>The prime helmet is a brown cap that is equipped with black protective goggles and a red bandanna is wrapped around the lower face. It�s essentially the same helmet as the recruits� one but features a different coloured bandana to mark the different ranks.</description>
-        <techLevel>Industrial</techLevel>
         <recipeMaker>
             <researchPrerequisite>FCP_Legion_Basic_Equipment</researchPrerequisite>
-            <unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
             <skillRequirements>
                 <Crafting>2</Crafting>
             </skillRequirements>
-            <recipeUsers>
-                <li>FCP_Production_Armor_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <graphicData>
             <texPath>Apparel/Legion_Armor/Legion_Prime/Legion_Prime_Helmet/FCP_Legion_Prime_Helmet</texPath>
@@ -974,9 +846,6 @@
             <Insulation_Heat>5</Insulation_Heat>
             <EquipDelay>1.5</EquipDelay>
         </statBases>
-        <thingCategories>
-            <li>ApparelArmor</li>
-        </thingCategories>
         <costList>
             <Cloth>15</Cloth>
             <Leather_Plain>20</Leather_Plain>
@@ -1003,20 +872,15 @@
         </comps>
     </ThingDef>
     <!-- Legion Veteran Decanus Helmet -->
-    <ThingDef ParentName="ArmorHelmetMakeableBase">
+    <ThingDef ParentName="FCP_Armor_Helmet_Makeable_Base">
         <defName>FCP_Apparel_Legion_Veteran_Decanus_Helmet</defName>
         <label>Legion Veteran Decanus Helmet</label>
         <description>A pre-war football helmet adorned with feathers, worn with a red face wrap and black goggles. While it offers a decent amount of protection, its main use is to serve as a symbol of rank. The red, white and black feathers fastened on the helmet identify the wearer as a veteran decanus, a higher-ranking officer within Caesar�s Legion, leading a squad of hardened veteran legionaries.</description>
-        <techLevel>Industrial</techLevel>
         <recipeMaker>
             <researchPrerequisite>FCP_Legion_Basic_Equipment</researchPrerequisite>
-            <unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
             <skillRequirements>
                 <Crafting>3</Crafting>
             </skillRequirements>
-            <recipeUsers>
-                <li>FCP_Production_Armor_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <graphicData>
             <texPath>Apparel/Legion_Armor/Legion_Veteran/Legion_Veteran_Decanus_Helmet/FCP_Legion_Veteran_Decanus_Helmet</texPath>
@@ -1033,9 +897,6 @@
             <Insulation_Heat>5</Insulation_Heat>
             <EquipDelay>1.5</EquipDelay>
         </statBases>
-        <thingCategories>
-            <li>ApparelArmor</li>
-        </thingCategories>
         <costList>
             <Cloth>15</Cloth>
             <Leather_Plain>20</Leather_Plain>
@@ -1062,20 +923,15 @@
         </comps>
     </ThingDef>
     <!-- Legion Veteran Helmet -->
-    <ThingDef ParentName="ArmorHelmetMakeableBase">
+    <ThingDef ParentName="FCP_Armor_Helmet_Makeable_Base">
         <defName>FCP_Apparel_Legion_Veteran_Helmet</defName>
         <label>Legion Veteran Helmet</label>
         <description>A baseball cap with an aluminium helmet, goggles for the eyes, and a face wrap. It offers a bit more protection compared to the helmets of the Legion�s lower ranks while not weighing more.</description>
-        <techLevel>Industrial</techLevel>
         <recipeMaker>
             <researchPrerequisite>FCP_Legion_Advanced_Equipment</researchPrerequisite>
-            <unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
             <skillRequirements>
                 <Crafting>3</Crafting>
             </skillRequirements>
-            <recipeUsers>
-                <li>FCP_Production_Armor_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <graphicData>
             <texPath>Apparel/Legion_Armor/Legion_Veteran/Legion_Veteran_Helmet/FCP_Legion_Veteran_Helmet</texPath>
@@ -1092,9 +948,6 @@
             <Insulation_Heat>5</Insulation_Heat>
             <EquipDelay>1.5</EquipDelay>
         </statBases>
-        <thingCategories>
-            <li>ApparelArmor</li>
-        </thingCategories>
         <costList>
             <Cloth>20</Cloth>
             <Steel>20</Steel>
@@ -1121,20 +974,15 @@
         </comps>
     </ThingDef>
     <!-- Legion Vexillarius Helmet -->
-    <ThingDef ParentName="ArmorHelmetMakeableBase">
+    <ThingDef ParentName="FCP_Armor_Helmet_Makeable_Base">
         <defName>FCP_Apparel_Legion_Vexillarius_Helmet</defName>
         <label>Legion Vexillarius Helmet</label>
         <description>Worn by the advance scouts of Caesar's Legion, the vexillarii, this helmet is fashioned from the pelt from the head of a coyote. It offers little protection as its main use is symbolic in nature.</description>
-        <techLevel>Industrial</techLevel>
         <recipeMaker>
             <researchPrerequisite>FCP_Legion_Advanced_Equipment</researchPrerequisite>
-            <unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
             <skillRequirements>
                 <Crafting>4</Crafting>
             </skillRequirements>
-            <recipeUsers>
-                <li>FCP_Production_Tailoring_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <graphicData>
             <texPath>Apparel/Legion_Armor/Legion_Vexillarius/Legion_Vexillarius_Helmet/FCP_Legion_Vexillarius_Helmet</texPath>
@@ -1151,9 +999,6 @@
             <Insulation_Heat>7</Insulation_Heat>
             <EquipDelay>1.5</EquipDelay>
         </statBases>
-        <thingCategories>
-            <li>ApparelArmor</li>
-        </thingCategories>
         <costList>
             <Cloth>20</Cloth>
             <Leather_Plain>20</Leather_Plain>
@@ -1183,20 +1028,15 @@
         </comps>
     </ThingDef>
     <!-- Legion Centurion Helmet -->
-    <ThingDef ParentName="ArmorHelmetMakeableBase">
+    <ThingDef ParentName="FCP_Armor_Helmet_Makeable_Base">
         <defName>FCP_Apparel_Legion_Centurion_Helmet</defName>
         <label>Legion Centurion Helmet</label>
         <description>Worn by the advance scouts of Caesar's Legion, the vexillarii, this helmet is fashioned from the pelt from the head of a coyote. It offers little protection as its main use is symbolic in nature.</description>
-        <techLevel>Industrial</techLevel>
         <recipeMaker>
             <researchPrerequisite>FCP_Legion_Advanced_Equipment</researchPrerequisite>
-            <unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
             <skillRequirements>
                 <Crafting>5</Crafting>
             </skillRequirements>
-            <recipeUsers>
-                <li>FCP_Production_Armor_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <graphicData>
             <texPath>Apparel/Legion_Armor/Legion_Centurion/Legion_Centurion_Helmet/FCP_Legion_Centurion_Helmet</texPath>
@@ -1213,9 +1053,6 @@
             <Insulation_Heat>7</Insulation_Heat>
             <EquipDelay>1.5</EquipDelay>
         </statBases>
-        <thingCategories>
-            <li>ApparelArmor</li>
-        </thingCategories>
         <costList>
             <Cloth>20</Cloth>
             <Steel>30</Steel>
@@ -1245,28 +1082,20 @@
         </comps>
     </ThingDef>
     <!-- Legion Legate Helmet -->
-    <ThingDef ParentName="ArmorHelmetMakeableBase">
+    <ThingDef ParentName="FCP_Armor_Helmet_Makeable_Base">
         <defName>FCP_Apparel_Legion_Legate_Helmet</defName>
         <label>Legion Legate Helmet</label>
         <description>The helmet of a legate, the highest-ranking warlords in the Legion, apart from Caesar of course. Its fashioned after the enclosed masks often worn by the cavalry of ancient Rome and sports red frills and horns to make the wearer look more intimidating.</description>
-        <techLevel>Industrial</techLevel>
         <recipeMaker>
             <researchPrerequisite>FCP_Legion_Advanced_Equipment</researchPrerequisite>
-            <unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
             <skillRequirements>
                 <Crafting>5</Crafting>
             </skillRequirements>
-            <recipeUsers>
-                <li>FCP_Production_Armor_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <graphicData>
             <texPath>Apparel/Legion_Armor/Legion_Legate/Legion_Legate_Helmet/FCP_Legion_Legate_Helmet</texPath>
             <graphicClass>Graphic_Single</graphicClass>
         </graphicData>
-        <thingCategories>
-            <li>ApparelArmor</li>
-        </thingCategories>
         <statBases>
             <WorkToMake>8200</WorkToMake>
             <MaxHitPoints>190</MaxHitPoints>
@@ -1306,12 +1135,11 @@
         </comps>
     </ThingDef>
     <!-- Caesar's Robes -->
-    <ThingDef ParentName="ApparelMakeableBase">
+    <ThingDef ParentName="FCP_Apparel_Makeable_Base">
         <defName>FCP_Apparel_Caesar_Robes</defName>
         <useHitPoints>false</useHitPoints>
         <label>Caesar's Robes</label>
         <description>The ornate ceremonial robes worn by Caesar himself, the supreme leader of the Legion. These magnificent red and gold robes are crafted from the finest pre-war materials and adorned with golden trim, symbolizing absolute authority over the Legion. The robes provide modest protection but their true power lies in the awe and respect they command from all who see them.</description>
-        <techLevel>Industrial</techLevel>
         <recipeMaker>
             <researchPrerequisite>FCP_Legion_Advanced_Equipment</researchPrerequisite>
             <unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
@@ -1319,9 +1147,6 @@
                 <Crafting>8</Crafting>
                 <Artistic>6</Artistic>
             </skillRequirements>
-            <recipeUsers>
-                <li>FCP_Production_Tailoring_Workbench</li>
-            </recipeUsers>
         </recipeMaker>
         <graphicData>
             <texPath>Apparel/Legion_Armor/Caesar_Robes/FCP_Caesar_Robes</texPath>