diff --git a/1.6/Defs/RecipeDefs/PowerArmor_Helmet_Paintjob_Recipes.xml b/1.6/Defs/RecipeDefs/PowerArmor_Helmet_Paintjob_Recipes.xml
new file mode 100644
index 0000000..52b0d3e
--- /dev/null
+++ b/1.6/Defs/RecipeDefs/PowerArmor_Helmet_Paintjob_Recipes.xml
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!-- T-51 Hotrodder Flame Job Power Armor Helmet -->
+    <RecipeDef>
+        <defName>Make_FCP_Apparel_T51_Hotrod_Flames_Power_Armor_Helmet</defName>
+        <label>paint T-51 power armor helmet (Hotrodder Flame Job)</label>
+        <description>Paint a T-51 power armor helmet with dazzling flame decals.</description>
+        <jobString>Painting T-51 power armor helmet.</jobString>
+        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+        <effectWorking>Smith</effectWorking>
+        <soundWorking>Recipe_Smith</soundWorking>
+        <workAmount>1200</workAmount>
+        <workSkill>Crafting</workSkill>
+        <skillRequirements>
+            <Crafting>6</Crafting>
+        </skillRequirements>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>FCP_Apparel_Power_Armor_T51_Helmet</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <products>
+            <FCP_Apparel_T51_Hotrod_Flames_Power_Armor_Helmet>1</FCP_Apparel_T51_Hotrod_Flames_Power_Armor_Helmet>
+        </products>
+        <researchPrerequisite>FCP_Research_Hotrodder_FlameJob</researchPrerequisite>
+        <recipeUsers>
+            <li>FCP_Production_Armor_Workbench</li>
+        </recipeUsers>
+    </RecipeDef>
+
+    <!-- T-51 Hotrodder Shark Paint Power Armor Helmet -->
+    <RecipeDef>
+        <defName>Make_FCP_Apparel_T51_Shark_Paint_Power_Armor_Helmet</defName>
+        <label>paint T-51 power armor helmet (Hotrodder Shark Paint)</label>
+        <description>Paint a T-51 power armor helmet with menacing shark teeth.</description>
+        <jobString>Painting T-51 power armor helmet.</jobString>
+        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+        <effectWorking>Smith</effectWorking>
+        <soundWorking>Recipe_Smith</soundWorking>
+        <workAmount>1200</workAmount>
+        <workSkill>Crafting</workSkill>
+        <skillRequirements>
+            <Crafting>6</Crafting>
+        </skillRequirements>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>FCP_Apparel_Power_Armor_T51_Helmet</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <products>
+            <FCP_Apparel_T51_Shark_Paint_Power_Armor_Helmet>1</FCP_Apparel_T51_Shark_Paint_Power_Armor_Helmet>
+        </products>
+        <researchPrerequisite>FCP_Research_Hotrodder_SharkPaint</researchPrerequisite>
+        <recipeUsers>
+            <li>FCP_Production_Armor_Workbench</li>
+        </recipeUsers>
+    </RecipeDef>
+
+    <!-- T-51 Hotrodder Hotpink Power Armor Helmet -->
+    <RecipeDef>
+        <defName>Make_FCP_Apparel_T51_Hotrod_Pink_Power_Armor_Helmet</defName>
+        <label>paint T-51 power armor helmet (Hotrodder Hotpink)</label>
+        <description>Paint a T-51 power armor helmet in bold, vibrant hot pink.</description>
+        <jobString>Painting T-51 power armor helmet.</jobString>
+        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+        <effectWorking>Smith</effectWorking>
+        <soundWorking>Recipe_Smith</soundWorking>
+        <workAmount>1200</workAmount>
+        <workSkill>Crafting</workSkill>
+        <skillRequirements>
+            <Crafting>6</Crafting>
+        </skillRequirements>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>FCP_Apparel_Power_Armor_T51_Helmet</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <products>
+            <FCP_Apparel_T51_Hotrod_Pink_Power_Armor_Helmet>1</FCP_Apparel_T51_Hotrod_Pink_Power_Armor_Helmet>
+        </products>
+        <researchPrerequisite>FCP_Research_Hotrodder_Hotpink</researchPrerequisite>
+        <recipeUsers>
+            <li>FCP_Production_Armor_Workbench</li>
+        </recipeUsers>
+    </RecipeDef>
+
+    <!-- T-51 Abraxo Power Armor Helmet -->
+    <RecipeDef>
+        <defName>Make_FCP_Apparel_T51_Abraxo_Power_Armor_Helmet</defName>
+        <label>paint T-51 power armor helmet (Abraxo)</label>
+        <description>Paint a T-51 power armor helmet with Abraxo Cleaner branding.</description>
+        <jobString>Painting T-51 power armor helmet.</jobString>
+        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+        <effectWorking>Smith</effectWorking>
+        <soundWorking>Recipe_Smith</soundWorking>
+        <workAmount>1200</workAmount>
+        <workSkill>Crafting</workSkill>
+        <skillRequirements>
+            <Crafting>6</Crafting>
+        </skillRequirements>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>FCP_Apparel_Power_Armor_T51_Helmet</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <products>
+            <FCP_Apparel_T51_Abraxo_Power_Armor_Helmet>1</FCP_Apparel_T51_Abraxo_Power_Armor_Helmet>
+        </products>
+        <researchPrerequisite>FCP_Research_Power_Paints_Abraxo</researchPrerequisite>
+        <recipeUsers>
+            <li>FCP_Production_Armor_Workbench</li>
+        </recipeUsers>
+    </RecipeDef>
+
+    <!-- T-51 Sugar Bombs Power Armor Helmet -->
+    <RecipeDef>
+        <defName>Make_FCP_Apparel_T51_Sugar_Bombs_Power_Armor_Helmet</defName>
+        <label>paint T-51 power armor helmet (Sugar Bombs)</label>
+        <description>Paint a T-51 power armor helmet with Sugar Bombs branding.</description>
+        <jobString>Painting T-51 power armor helmet.</jobString>
+        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+        <effectWorking>Smith</effectWorking>
+        <soundWorking>Recipe_Smith</soundWorking>
+        <workAmount>1200</workAmount>
+        <workSkill>Crafting</workSkill>
+        <skillRequirements>
+            <Crafting>6</Crafting>
+        </skillRequirements>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>FCP_Apparel_Power_Armor_T51_Helmet</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <products>
+            <FCP_Apparel_T51_Sugar_Bombs_Power_Armor_Helmet>1</FCP_Apparel_T51_Sugar_Bombs_Power_Armor_Helmet>
+        </products>
+        <researchPrerequisite>FCP_Research_Power_Paints_SugarBombs</researchPrerequisite>
+        <recipeUsers>
+            <li>FCP_Production_Armor_Workbench</li>
+        </recipeUsers>
+    </RecipeDef>
+
+    <!-- T-60 Hotrodder Flame Job Power Armor Helmet -->
+    <RecipeDef>
+        <defName>Make_FCP_Apparel_T60_Hotrod_Flames_Power_Armor_Helmet</defName>
+        <label>paint T-60 power armor helmet (Hotrodder Flame Job)</label>
+        <description>Paint a T-60 power armor helmet with dazzling flame decals.</description>
+        <jobString>Painting T-60 power armor helmet.</jobString>
+        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+        <effectWorking>Smith</effectWorking>
+        <soundWorking>Recipe_Smith</soundWorking>
+        <workAmount>1200</workAmount>
+        <workSkill>Crafting</workSkill>
+        <skillRequirements>
+            <Crafting>6</Crafting>
+        </skillRequirements>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>FCP_Apparel_Power_Armor_T60_Helmet</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <products>
+            <FCP_Apparel_T60_Hotrod_Flames_Power_Armor_Helmet>1</FCP_Apparel_T60_Hotrod_Flames_Power_Armor_Helmet>
+        </products>
+        <researchPrerequisite>FCP_Research_Hotrodder_FlameJob</researchPrerequisite>
+        <recipeUsers>
+            <li>FCP_Production_Armor_Workbench</li>
+        </recipeUsers>
+    </RecipeDef>
+
+    <!-- T-60 Hotrodder Shark Paint Power Armor Helmet -->
+    <RecipeDef>
+        <defName>Make_FCP_Apparel_T60_Shark_Paint_Power_Armor_Helmet</defName>
+        <label>paint T-60 power armor helmet (Hotrodder Shark Paint)</label>
+        <description>Paint a T-60 power armor helmet with menacing shark teeth.</description>
+        <jobString>Painting T-60 power armor helmet.</jobString>
+        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+        <effectWorking>Smith</effectWorking>
+        <soundWorking>Recipe_Smith</soundWorking>
+        <workAmount>1200</workAmount>
+        <workSkill>Crafting</workSkill>
+        <skillRequirements>
+            <Crafting>6</Crafting>
+        </skillRequirements>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>FCP_Apparel_Power_Armor_T60_Helmet</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <products>
+            <FCP_Apparel_T60_Shark_Paint_Power_Armor_Helmet>1</FCP_Apparel_T60_Shark_Paint_Power_Armor_Helmet>
+        </products>
+        <researchPrerequisite>FCP_Research_Hotrodder_SharkPaint</researchPrerequisite>
+        <recipeUsers>
+            <li>FCP_Production_Armor_Workbench</li>
+        </recipeUsers>
+    </RecipeDef>
+
+    <!-- T-60 Hotrodder Hotpink Power Armor Helmet -->
+    <RecipeDef>
+        <defName>Make_FCP_Apparel_T60_Hotrod_Pink_Power_Armor_Helmet</defName>
+        <label>paint T-60 power armor helmet (Hotrodder Hotpink)</label>
+        <description>Paint a T-60 power armor helmet in bold, vibrant hot pink.</description>
+        <jobString>Painting T-60 power armor helmet.</jobString>
+        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+        <effectWorking>Smith</effectWorking>
+        <soundWorking>Recipe_Smith</soundWorking>
+        <workAmount>1200</workAmount>
+        <workSkill>Crafting</workSkill>
+        <skillRequirements>
+            <Crafting>6</Crafting>
+        </skillRequirements>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>FCP_Apparel_Power_Armor_T60_Helmet</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <products>
+            <FCP_Apparel_T60_Hotrod_Pink_Power_Armor_Helmet>1</FCP_Apparel_T60_Hotrod_Pink_Power_Armor_Helmet>
+        </products>
+        <researchPrerequisite>FCP_Research_Hotrodder_Hotpink</researchPrerequisite>
+        <recipeUsers>
+            <li>FCP_Production_Armor_Workbench</li>
+        </recipeUsers>
+    </RecipeDef>
+
+</Defs>
diff --git a/1.6/Defs/RecipeDefs/PowerArmor_Paintjob_Recipes.xml b/1.6/Defs/RecipeDefs/PowerArmor_Paintjob_Recipes.xml
new file mode 100644
index 0000000..fba4661
--- /dev/null
+++ b/1.6/Defs/RecipeDefs/PowerArmor_Paintjob_Recipes.xml
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!-- T-51 Hotrodder Flame Job Power Armor -->
+    <RecipeDef>
+        <defName>Make_FCP_Apparel_T51_Hotrod_Flames_Power_Armor</defName>
+        <label>paint T-51 power armor (Hotrodder Flame Job)</label>
+        <description>Paint a T-51 power armor with dazzling flame decals.</description>
+        <jobString>Painting T-51 power armor.</jobString>
+        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+        <effectWorking>Smith</effectWorking>
+        <soundWorking>Recipe_Smith</soundWorking>
+        <workAmount>2500</workAmount>
+        <workSkill>Crafting</workSkill>
+        <skillRequirements>
+            <Crafting>8</Crafting>
+        </skillRequirements>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>FCP_Apparel_Power_Armor_T51Armor</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <products>
+            <FCP_Apparel_T51_Hotrod_Flames_Power_Armor>1</FCP_Apparel_T51_Hotrod_Flames_Power_Armor>
+        </products>
+        <researchPrerequisite>FCP_Research_Hotrodder_FlameJob</researchPrerequisite>
+        <recipeUsers>
+            <li>FCP_Production_Armor_Workbench</li>
+        </recipeUsers>
+    </RecipeDef>
+
+    <!-- T-51 Hotrodder Shark Paint Power Armor -->
+    <RecipeDef>
+        <defName>Make_FCP_Apparel_T51_Shark_Paint_Power_Armor</defName>
+        <label>paint T-51 power armor (Hotrodder Shark Paint)</label>
+        <description>Paint a T-51 power armor with menacing shark teeth.</description>
+        <jobString>Painting T-51 power armor.</jobString>
+        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+        <effectWorking>Smith</effectWorking>
+        <soundWorking>Recipe_Smith</soundWorking>
+        <workAmount>2500</workAmount>
+        <workSkill>Crafting</workSkill>
+        <skillRequirements>
+            <Crafting>8</Crafting>
+        </skillRequirements>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>FCP_Apparel_Power_Armor_T51Armor</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <products>
+            <FCP_Apparel_T51_Shark_Paint_Power_Armor>1</FCP_Apparel_T51_Shark_Paint_Power_Armor>
+        </products>
+        <researchPrerequisite>FCP_Research_Hotrodder_SharkPaint</researchPrerequisite>
+        <recipeUsers>
+            <li>FCP_Production_Armor_Workbench</li>
+        </recipeUsers>
+    </RecipeDef>
+
+    <!-- T-51 Hotrodder Hotpink Power Armor -->
+    <RecipeDef>
+        <defName>Make_FCP_Apparel_T51_Hotrod_Pink_Power_Armor</defName>
+        <label>paint T-51 power armor (Hotrodder Hotpink)</label>
+        <description>Paint a T-51 power armor in bold, vibrant hot pink.</description>
+        <jobString>Painting T-51 power armor.</jobString>
+        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+        <effectWorking>Smith</effectWorking>
+        <soundWorking>Recipe_Smith</soundWorking>
+        <workAmount>2500</workAmount>
+        <workSkill>Crafting</workSkill>
+        <skillRequirements>
+            <Crafting>8</Crafting>
+        </skillRequirements>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>FCP_Apparel_Power_Armor_T51Armor</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <products>
+            <FCP_Apparel_T51_Hotrod_Pink_Power_Armor>1</FCP_Apparel_T51_Hotrod_Pink_Power_Armor>
+        </products>
+        <researchPrerequisite>FCP_Research_Hotrodder_Hotpink</researchPrerequisite>
+        <recipeUsers>
+            <li>FCP_Production_Armor_Workbench</li>
+        </recipeUsers>
+    </RecipeDef>
+
+    <!-- T-51 Abraxo Power Armor -->
+    <RecipeDef>
+        <defName>Make_FCP_Apparel_T51_Abraxo_Power_Armor</defName>
+        <label>paint T-51 power armor (Abraxo)</label>
+        <description>Paint a T-51 power armor with Abraxo Cleaner branding.</description>
+        <jobString>Painting T-51 power armor.</jobString>
+        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+        <effectWorking>Smith</effectWorking>
+        <soundWorking>Recipe_Smith</soundWorking>
+        <workAmount>2500</workAmount>
+        <workSkill>Crafting</workSkill>
+        <skillRequirements>
+            <Crafting>8</Crafting>
+        </skillRequirements>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>FCP_Apparel_Power_Armor_T51Armor</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <products>
+            <FCP_Apparel_T51_Abraxo_Power_Armor>1</FCP_Apparel_T51_Abraxo_Power_Armor>
+        </products>
+        <researchPrerequisite>FCP_Research_Power_Paints_Abraxo</researchPrerequisite>
+        <recipeUsers>
+            <li>FCP_Production_Armor_Workbench</li>
+        </recipeUsers>
+    </RecipeDef>
+
+    <!-- T-51 Sugar Bombs Power Armor -->
+    <RecipeDef>
+        <defName>Make_FCP_Apparel_T51_Sugar_Bombs_Power_Armor</defName>
+        <label>paint T-51 power armor (Sugar Bombs)</label>
+        <description>Paint a T-51 power armor with Sugar Bombs branding.</description>
+        <jobString>Painting T-51 power armor.</jobString>
+        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+        <effectWorking>Smith</effectWorking>
+        <soundWorking>Recipe_Smith</soundWorking>
+        <workAmount>2500</workAmount>
+        <workSkill>Crafting</workSkill>
+        <skillRequirements>
+            <Crafting>8</Crafting>
+        </skillRequirements>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>FCP_Apparel_Power_Armor_T51Armor</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <products>
+            <FCP_Apparel_T51_Sugar_Bombs_Power_Armor>1</FCP_Apparel_T51_Sugar_Bombs_Power_Armor>
+        </products>
+        <researchPrerequisite>FCP_Research_Power_Paints_SugarBombs</researchPrerequisite>
+        <recipeUsers>
+            <li>FCP_Production_Armor_Workbench</li>
+        </recipeUsers>
+    </RecipeDef>
+
+    <!-- T-60 Hotrodder Flame Job Power Armor -->
+    <RecipeDef>
+        <defName>Make_FCP_Apparel_T60_Hotrod_Flames_Power_Armor</defName>
+        <label>paint T-60 power armor (Hotrodder Flame Job)</label>
+        <description>Paint a T-60 power armor with dazzling flame decals.</description>
+        <jobString>Painting T-60 power armor.</jobString>
+        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+        <effectWorking>Smith</effectWorking>
+        <soundWorking>Recipe_Smith</soundWorking>
+        <workAmount>2500</workAmount>
+        <workSkill>Crafting</workSkill>
+        <skillRequirements>
+            <Crafting>8</Crafting>
+        </skillRequirements>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>FCP_Apparel_Power_Armor_T60Armor</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <products>
+            <FCP_Apparel_T60_Hotrod_Flames_Power_Armor>1</FCP_Apparel_T60_Hotrod_Flames_Power_Armor>
+        </products>
+        <researchPrerequisite>FCP_Research_Hotrodder_FlameJob</researchPrerequisite>
+        <recipeUsers>
+            <li>FCP_Production_Armor_Workbench</li>
+        </recipeUsers>
+    </RecipeDef>
+
+    <!-- T-60 Hotrodder Shark Paint Power Armor -->
+    <RecipeDef>
+        <defName>Make_FCP_Apparel_T60_Shark_Paint_Power_Armor</defName>
+        <label>paint T-60 power armor (Hotrodder Shark Paint)</label>
+        <description>Paint a T-60 power armor with menacing shark teeth.</description>
+        <jobString>Painting T-60 power armor.</jobString>
+        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+        <effectWorking>Smith</effectWorking>
+        <soundWorking>Recipe_Smith</soundWorking>
+        <workAmount>2500</workAmount>
+        <workSkill>Crafting</workSkill>
+        <skillRequirements>
+            <Crafting>8</Crafting>
+        </skillRequirements>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>FCP_Apparel_Power_Armor_T60Armor</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <products>
+            <FCP_Apparel_T60_Shark_Paint_Power_Armor>1</FCP_Apparel_T60_Shark_Paint_Power_Armor>
+        </products>
+        <researchPrerequisite>FCP_Research_Hotrodder_SharkPaint</researchPrerequisite>
+        <recipeUsers>
+            <li>FCP_Production_Armor_Workbench</li>
+        </recipeUsers>
+    </RecipeDef>
+
+    <!-- T-60 Hotrodder Hotpink Power Armor -->
+    <RecipeDef>
+        <defName>Make_FCP_Apparel_T60_Hotrod_Pink_Power_Armor</defName>
+        <label>paint T-60 power armor (Hotrodder Hotpink)</label>
+        <description>Paint a T-60 power armor in bold, vibrant hot pink.</description>
+        <jobString>Painting T-60 power armor.</jobString>
+        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+        <effectWorking>Smith</effectWorking>
+        <soundWorking>Recipe_Smith</soundWorking>
+        <workAmount>2500</workAmount>
+        <workSkill>Crafting</workSkill>
+        <skillRequirements>
+            <Crafting>8</Crafting>
+        </skillRequirements>
+        <ingredients>
+            <li>
+                <filter>
+                    <thingDefs>
+                        <li>FCP_Apparel_Power_Armor_T60Armor</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <products>
+            <FCP_Apparel_T60_Hotrod_Pink_Power_Armor>1</FCP_Apparel_T60_Hotrod_Pink_Power_Armor>
+        </products>
+        <researchPrerequisite>FCP_Research_Hotrodder_Hotpink</researchPrerequisite>
+        <recipeUsers>
+            <li>FCP_Production_Armor_Workbench</li>
+        </recipeUsers>
+    </RecipeDef>
+
+</Defs>
diff --git a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor.xml b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor.xml
index b0a81e5..48c155b 100644
--- a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor.xml
+++ b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor.xml
@@ -61,7 +61,7 @@
 			</li>
 			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
 				<repairResourcesPerHP>
-					<Steel>5</Steel>
+					<Plasteel>2</Plasteel>
 					<ComponentIndustrial>0.1</ComponentIndustrial>
 				</repairResourcesPerHP>
 				<repairTimeCostPerHP>60</repairTimeCostPerHP>
@@ -198,6 +198,15 @@
 		<apparel>
 			<wornGraphicPath>Things/Apparel/Power_Armors/T45/FCP_T45_Power_Armor</wornGraphicPath>
 		</apparel>
+		<comps>
+			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+				<repairResourcesPerHP>
+					<Plasteel>1.5</Plasteel>
+					<ComponentIndustrial>0.08</ComponentIndustrial>
+				</repairResourcesPerHP>
+				<repairTimeCostPerHP>60</repairTimeCostPerHP>
+			</li>
+		</comps>
 	</ThingDef>
 
 	<!--_____ T-51 _____-->
@@ -228,6 +237,15 @@
 		<apparel>
 			<wornGraphicPath>Things/Apparel/Power_Armors/T51/FCP_T51_Power_Armor</wornGraphicPath>
 		</apparel>
+		<comps>
+			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+				<repairResourcesPerHP>
+					<Plasteel>2</Plasteel>
+					<ComponentIndustrial>0.1</ComponentIndustrial>
+				</repairResourcesPerHP>
+				<repairTimeCostPerHP>60</repairTimeCostPerHP>
+			</li>
+		</comps>
 	</ThingDef>
 
 	<!--_____ T-60 _____-->
@@ -258,6 +276,15 @@
 		<apparel>
 			<wornGraphicPath>Things/Apparel/Power_Armors/T60/FCP_T60_Power_Armor</wornGraphicPath>
 		</apparel>
+		<comps>
+			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+				<repairResourcesPerHP>
+					<Plasteel>2.5</Plasteel>
+					<ComponentIndustrial>0.12</ComponentIndustrial>
+				</repairResourcesPerHP>
+				<repairTimeCostPerHP>60</repairTimeCostPerHP>
+			</li>
+		</comps>
 	</ThingDef>
 
 	<!--_____ X-01 _____-->
@@ -291,13 +318,22 @@
 		<apparel>
 			<wornGraphicPath>Things/Apparel/Power_Armors/X01/FCP_X01_Power_Armor</wornGraphicPath>
 		</apparel>
+		<comps>
+			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+				<repairResourcesPerHP>
+					<Plasteel>3</Plasteel>
+					<ComponentIndustrial>0.15</ComponentIndustrial>
+				</repairResourcesPerHP>
+				<repairTimeCostPerHP>60</repairTimeCostPerHP>
+			</li>
+		</comps>
 	</ThingDef>
 
 	<!--_____ T-51 Paintjobs _____-->
 
 	<!--___ T-51 Paintjob Base ___-->
 
-	<ThingDef ParentName="FCP_Apparel_Power_Armor_Base" Name="FCP_Apparel_T51_Paintjob_Base" Abstract="True">
+	<ThingDef ParentName="ApparelUpgradeableBase" Name="FCP_Apparel_T51_Paintjob_Base" Abstract="True">
 		<generateCommonality>0</generateCommonality>
 		<statBases>
 			<WorkToMake>2500</WorkToMake>
@@ -311,18 +347,15 @@
 			<AimingDelayFactor>-0.03</AimingDelayFactor>
 			<ToxicEnvironmentResistance>0.8</ToxicEnvironmentResistance>
 		</equippedStatOffsets>
-		<recipeMaker>
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
-			<skillRequirements>
-				<Crafting>8</Crafting>
-			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
-		</recipeMaker>
-		<costList>
-			<FCP_Apparel_Power_Armor_T51Armor>1</FCP_Apparel_Power_Armor_T51Armor>
-		</costList>
+		<comps>
+			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+				<repairResourcesPerHP>
+					<Plasteel>2</Plasteel>
+					<ComponentIndustrial>0.1</ComponentIndustrial>
+				</repairResourcesPerHP>
+				<repairTimeCostPerHP>60</repairTimeCostPerHP>
+			</li>
+		</comps>
 	</ThingDef>
 
 	<!--___ T-51 Paintjob Variants ___-->
@@ -333,9 +366,6 @@
 		<defName>FCP_Apparel_T51_Hotrod_Flames_Power_Armor</defName>
 		<label>T-51 Hotrodder Flame Job Power Armor</label>
 		<description>T-51 power armor emblazoned with dazzling flame decals that turn heads and strike fear into the hearts of enemies. This iconic hot rod design brings wasteland style to the battlefield.</description>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Hotrodder_FlameJob</researchPrerequisite>
-		</recipeMaker>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T51_Hotrod_Flames/FCP_T51_Hotrod_Flames_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -357,9 +387,6 @@
 		<defName>FCP_Apparel_T51_Shark_Paint_Power_Armor</defName>
 		<label>T-51 Hotrodder Shark Paint Power Armor</label>
 		<description>T-51 power armor with menacing shark teeth painted in the style of pre-war fighter planes. This aggressive paint scheme shows your enemies you mean business.</description>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Hotrodder_SharkPaint</researchPrerequisite>
-		</recipeMaker>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T51_Shark_Paint/FCP_T51_Shark_Paint_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -381,9 +408,6 @@
 		<defName>FCP_Apparel_T51_Hotrod_Pink_Power_Armor</defName>
 		<label>T-51 Hotrodder Hotpink Power Armor</label>
 		<description>T-51 power armor in bold, vibrant hot pink that makes a statement. This eye-catching color scheme ensures you'll never be overlooked on the battlefield.</description>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Hotrodder_Hotpink</researchPrerequisite>
-		</recipeMaker>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T51_Hotrod_Pink/FCP_T51_Hotrod_Pink_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -405,9 +429,6 @@
 		<defName>FCP_Apparel_T51_Abraxo_Power_Armor</defName>
 		<label>T-51 Power Paints Abraxo Power Armor</label>
 		<description>T-51 power armor with a paint scheme inspired by the iconic Abraxo Cleaner branding. Clean, crisp, and unmistakable - this corporate paint job brings pre-war advertising aesthetics to the wasteland.</description>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Power_Paints_Abraxo</researchPrerequisite>
-		</recipeMaker>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T51_Abraxo/FCP_T51_Abraxo_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -433,9 +454,6 @@
 		<defName>FCP_Apparel_T51_Sugar_Bombs_Power_Armor</defName>
 		<label>T-51 Power Paints Sugar Bombs Power Armor</label>
 		<description>T-51 power armor with colorful Sugar Bombs cereal branding. Sweet and explosive, this playful paint scheme combines nostalgia with intimidation.</description>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Power_Paints_SugarBombs</researchPrerequisite>
-		</recipeMaker>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T51_Sugar_Bombs/FCP_T51_Sugar_Bombs_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -456,7 +474,7 @@
 
 	<!--___ T-60 Paintjob Base ___-->
 
-	<ThingDef ParentName="FCP_Apparel_Power_Armor_Base" Name="FCP_Apparel_T60_Paintjob_Base" Abstract="True">
+	<ThingDef ParentName="ApparelUpgradeableBase" Name="FCP_Apparel_T60_Paintjob_Base" Abstract="True">
 		<generateCommonality>0</generateCommonality>
 		<statBases>
 			<WorkToMake>2500</WorkToMake>
@@ -469,20 +487,15 @@
 			<MoveSpeed>0.10</MoveSpeed>
 			<AimingDelayFactor>-0.04</AimingDelayFactor>
 			<ToxicEnvironmentResistance>0.9</ToxicEnvironmentResistance>
-		</equippedStatOffsets>
-		<recipeMaker>
-			<unfinishedThingDef>UnfinishedArmor</unfinishedThingDef>
-			<skillRequirements>
-				<Crafting>8</Crafting>
-			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
-		</recipeMaker>
-		<costList>
-			<FCP_Apparel_Power_Armor_T60Armor>1</FCP_Apparel_Power_Armor_T60Armor>
-		</costList>
-	</ThingDef>
+		</equippedStatOffsets>		<comps>
+			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+				<repairResourcesPerHP>
+					<Plasteel>2</Plasteel>
+					<ComponentIndustrial>0.1</ComponentIndustrial>
+				</repairResourcesPerHP>
+				<repairTimeCostPerHP>60</repairTimeCostPerHP>
+			</li>
+		</comps>	</ThingDef>
 
 	<!--___ T-60 Paintjob Variants ___-->
 
@@ -492,9 +505,6 @@
 		<defName>FCP_Apparel_T60_Hotrod_Flames_Power_Armor</defName>
 		<label>T-60 Hotrodder Flame Job Power Armor</label>
 		<description>T-60 power armor emblazoned with dazzling flame decals that turn heads and strike fear into the hearts of enemies. This iconic hot rod design brings wasteland style to the battlefield.</description>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Hotrodder_FlameJob</researchPrerequisite>
-		</recipeMaker>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T60_Hotrod_Flames/FCP_T60_Hotrod_Flames_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -516,9 +526,6 @@
 		<defName>FCP_Apparel_T60_Shark_Paint_Power_Armor</defName>
 		<label>T-60 Hotrodder Shark Paint Power Armor</label>
 		<description>T-60 power armor with menacing shark teeth painted in the style of pre-war fighter planes. This aggressive paint scheme shows your enemies you mean business.</description>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Hotrodder_SharkPaint</researchPrerequisite>
-		</recipeMaker>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T60_Shark_Paint/FCP_T60_Shark_Paint_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -541,9 +548,6 @@
 		<defName>FCP_Apparel_T60_Hotrod_Pink_Power_Armor</defName>
 		<label>T-60 Hotrodder Hotpink Power Armor</label>
 		<description>T-60 power armor in bold, vibrant hot pink that makes a statement. This eye-catching color scheme ensures you'll never be overlooked on the battlefield.</description>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Hotrodder_Hotpink</researchPrerequisite>
-		</recipeMaker>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T60_Hotrod_Pink/FCP_T60_Hotrod_Pink_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
diff --git a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor_Headgear.xml b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor_Headgear.xml
index 185d217..cfaf897 100644
--- a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor_Headgear.xml
+++ b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor_Headgear.xml
@@ -131,6 +131,13 @@
                     <li>FCP_Apparel_Power_Armor_Frame</li>
                 </requiredApparels>
             </li>
+			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+				<repairResourcesPerHP>
+					<Plasteel>1</Plasteel>
+					<ComponentIndustrial>0.05</ComponentIndustrial>
+				</repairResourcesPerHP>
+				<repairTimeCostPerHP>60</repairTimeCostPerHP>
+			</li>
         </comps>
     </ThingDef>
 
@@ -185,6 +192,13 @@
                     <li>FCP_Apparel_Power_Armor_Frame</li>
                 </requiredApparels>
             </li>
+			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+				<repairResourcesPerHP>
+					<Plasteel>1.25</Plasteel>
+					<ComponentIndustrial>0.06</ComponentIndustrial>
+				</repairResourcesPerHP>
+				<repairTimeCostPerHP>60</repairTimeCostPerHP>
+			</li>
         </comps>
     </ThingDef>
 
@@ -238,6 +252,13 @@
                     <li>FCP_Apparel_Power_Armor_Frame</li>
                 </requiredApparels>
             </li>
+			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+				<repairResourcesPerHP>
+					<Plasteel>1.5</Plasteel>
+					<ComponentIndustrial>0.08</ComponentIndustrial>
+				</repairResourcesPerHP>
+				<repairTimeCostPerHP>60</repairTimeCostPerHP>
+			</li>
         </comps>
     </ThingDef>
 
@@ -245,7 +266,7 @@
 
 	<!--___ T-51 Helmet Paintjob Base ___-->
 
-	<ThingDef ParentName="FCP_Apparel_Power_Armor_Helmet_Base" Name="FCP_Apparel_T51_Helmet_Paintjob_Base" Abstract="True">
+	<ThingDef ParentName="ApparelUpgradeableBase" Name="FCP_Apparel_T51_Helmet_Paintjob_Base" Abstract="True">
 		<generateCommonality>0</generateCommonality>
 		<techLevel>Industrial</techLevel>
 		<smeltable>false</smeltable>
@@ -276,18 +297,6 @@
 			<useDeflectMetalEffect>true</useDeflectMetalEffect>
 			<developmentalStageFilter>Adult</developmentalStageFilter>
 		</apparel>
-		<recipeMaker>
-			<unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
-			<skillRequirements>
-				<Crafting>6</Crafting>
-			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
-		</recipeMaker>
-		<costList>
-			<FCP_Apparel_Power_Armor_T51_Helmet>1</FCP_Apparel_Power_Armor_T51_Helmet>
-		</costList>
 		<comps>
 			<li Class="FCP.Core.CompProperties_LabelColored">
 				<rarity>Rare</rarity>
@@ -297,6 +306,13 @@
 					<li>FCP_Apparel_Power_Armor_Frame</li>
 				</requiredApparels>
 			</li>
+			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+				<repairResourcesPerHP>
+					<Plasteel>1</Plasteel>
+					<ComponentIndustrial>0.05</ComponentIndustrial>
+				</repairResourcesPerHP>
+				<repairTimeCostPerHP>60</repairTimeCostPerHP>
+			</li>
 		</comps>
 	</ThingDef>
 
@@ -308,9 +324,6 @@
 		<defName>FCP_Apparel_T51_Hotrod_Flames_Power_Armor_Helmet</defName>
 		<label>T-51 Hotrodder Flame Job Helmet</label>
 		<description>A T-51 power armor helmet emblazoned with dazzling flame decals. This iconic hot rod design turns heads on the battlefield.</description>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Hotrodder_FlameJob</researchPrerequisite>
-		</recipeMaker>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armor_Headgear/T51_Hotrod_Flames_Helmet/FCP_T51_Hotrod_Flames_Power_Armor_Helmet_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -330,9 +343,6 @@
 		<defName>FCP_Apparel_T51_Shark_Paint_Power_Armor_Helmet</defName>
 		<label>T-51 Hotrodder Shark Paint Helmet</label>
 		<description>A T-51 power armor helmet with menacing shark teeth painted in the style of pre-war fighter planes.</description>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Hotrodder_SharkPaint</researchPrerequisite>
-		</recipeMaker>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armor_Headgear/T51_Shark_Paint_Helmet/FCP_T51_Shark_Paint_Power_Armor_Helmet_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -353,9 +363,6 @@
 		<defName>FCP_Apparel_T51_Hotrod_Pink_Power_Armor_Helmet</defName>
 		<label>T-51 Hotrodder Hotpink Helmet</label>
 		<description>A T-51 power armor helmet in bold, vibrant hot pink. This eye-catching color scheme ensures you'll never be overlooked.</description>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Hotrodder_Hotpink</researchPrerequisite>
-		</recipeMaker>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armor_Headgear/T51_Hotrod_Pink_Helmet/FCP_T51_Hotrod_Pink_Power_Armor_Helmet_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -375,9 +382,6 @@
 		<defName>FCP_Apparel_T51_Abraxo_Power_Armor_Helmet</defName>
 		<label>T-51 Power Paints Abraxo Helmet</label>
 		<description>A T-51 power armor helmet with Abraxo Cleaner branding. Clean, crisp, and unmistakable corporate aesthetics.</description>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Power_Paints_Abraxo</researchPrerequisite>
-		</recipeMaker>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armor_Headgear/T51_Abraxo_Helmet/FCP_T51_Abraxo_Power_Armor_Helmet_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -398,9 +402,6 @@
 		<defName>FCP_Apparel_T51_Sugar_Bombs_Power_Armor_Helmet</defName>
 		<label>T-51 Power Paints Sugar Bombs Helmet</label>
 		<description>A T-51 power armor helmet with colorful Sugar Bombs cereal branding. Sweet and explosive nostalgia.</description>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Power_Paints_SugarBombs</researchPrerequisite>
-		</recipeMaker>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armor_Headgear/T51_Sugar_Bombs_Helmet/FCP_T51_Sugar_Bombs_Power_Armor_Helmet_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -419,7 +420,7 @@
 
 	<!--___ T-60 Helmet Paintjob Base ___-->
 
-	<ThingDef ParentName="FCP_Apparel_Power_Armor_Helmet_Base" Name="FCP_Apparel_T60_Helmet_Paintjob_Base" Abstract="True">
+	<ThingDef ParentName="ApparelUpgradeableBase" Name="FCP_Apparel_T60_Helmet_Paintjob_Base" Abstract="True">
 		<generateCommonality>0</generateCommonality>
 		<techLevel>Industrial</techLevel>
 		<smeltable>false</smeltable>
@@ -449,18 +450,6 @@
 			<useDeflectMetalEffect>true</useDeflectMetalEffect>
 			<developmentalStageFilter>Adult</developmentalStageFilter>
 		</apparel>
-		<recipeMaker>
-			<unfinishedThingDef>UnfinishedApparel</unfinishedThingDef>
-			<skillRequirements>
-				<Crafting>6</Crafting>
-			</skillRequirements>
-			<recipeUsers>
-				<li>FCP_Production_Armor_Workbench</li>
-			</recipeUsers>
-		</recipeMaker>
-		<costList>
-			<FCP_Apparel_Power_Armor_T60_Helmet>1</FCP_Apparel_Power_Armor_T60_Helmet>
-		</costList>
 		<comps>
 			<li Class="FCP.Core.CompProperties_LabelColored">
 				<rarity>Rare</rarity>
@@ -470,6 +459,13 @@
 					<li>FCP_Apparel_Power_Armor_Frame</li>
 				</requiredApparels>
 			</li>
+			<li Class="RangerRick_PowerArmor.CompProperties_RepairableAtStation">
+				<repairResourcesPerHP>
+					<Plasteel>1</Plasteel>
+					<ComponentIndustrial>0.05</ComponentIndustrial>
+				</repairResourcesPerHP>
+				<repairTimeCostPerHP>60</repairTimeCostPerHP>
+			</li>
 		</comps>
 	</ThingDef>
 
@@ -481,9 +477,6 @@
 		<defName>FCP_Apparel_T60_Hotrod_Flames_Power_Armor_Helmet</defName>
 		<label>T-60 Hotrodder Flame Job Helmet</label>
 		<description>A T-60 power armor helmet emblazoned with dazzling flame decals. This iconic hot rod design turns heads on the battlefield.</description>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Hotrodder_FlameJob</researchPrerequisite>
-		</recipeMaker>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armor_Headgear/T60_Hotrod_Flames_Helmet/FCP_T60_Hotrod_Flames_Power_Armor_Helmet_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -504,9 +497,6 @@
 		<defName>FCP_Apparel_T60_Shark_Paint_Power_Armor_Helmet</defName>
 		<label>T-60 Hotrodder Shark Paint Helmet</label>
 		<description>A T-60 power armor helmet with menacing shark teeth painted in the style of pre-war fighter planes.</description>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Hotrodder_SharkPaint</researchPrerequisite>
-		</recipeMaker>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armor_Headgear/T60_Shark_Paint_Helmet/FCP_T60_Shark_Paint_Power_Armor_Helmet_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -527,9 +517,6 @@
 		<defName>FCP_Apparel_T60_Hotrod_Pink_Power_Armor_Helmet</defName>
 		<label>T-60 Hotrodder Hotpink Helmet</label>
 		<description>A T-60 power armor helmet in bold, vibrant hot pink. This eye-catching color scheme ensures you'll never be overlooked.</description>
-		<recipeMaker>
-			<researchPrerequisite>FCP_Research_Hotrodder_Hotpink</researchPrerequisite>
-		</recipeMaker>
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armor_Headgear/T60_Hotrod_Pink_Helmet/FCP_T60_Hotrod_Pink_Power_Armor_Helmet_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
diff --git a/1.6/Defs/ThingDefs_Misc/Apparel_Parents.xml b/1.6/Defs/ThingDefs_Misc/Apparel_Parents.xml
new file mode 100644
index 0000000..4f91e3c
--- /dev/null
+++ b/1.6/Defs/ThingDefs_Misc/Apparel_Parents.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+
+    <!-- Parent for armor that is upgraded from other armor pieces, not crafted from raw materials -->
+    <ThingDef Name="ApparelUpgradeableBase" ParentName="ApparelBase" Abstract="True">
+        <thingClass>Apparel</thingClass>
+        <category>Item</category>
+        <selectable>true</selectable>
+        <pathCost>14</pathCost>
+        <useHitPoints>true</useHitPoints>
+        <graphicData>
+            <onGroundRandomRotateAngle>35</onGroundRandomRotateAngle>
+        </graphicData>
+        <drawGUIOverlay>true</drawGUIOverlay>
+        <statBases>
+            <MaxHitPoints>100</MaxHitPoints>
+            <Flammability>1.0</Flammability>
+            <DeteriorationRate>2</DeteriorationRate>
+            <SellPriceFactor>0.5</SellPriceFactor>
+        </statBases>
+        <altitudeLayer>Item</altitudeLayer>
+        <alwaysHaulable>true</alwaysHaulable>
+        <tickerType>Never</tickerType>
+        <burnableByRecipe>true</burnableByRecipe>
+        <smeltable>false</smeltable>
+        <thingCategories>
+            <li>ApparelArmor</li>
+        </thingCategories>
+        <statBases Inherit="False">
+            <MaxHitPoints>250</MaxHitPoints>
+            <Mass>6.0</Mass>
+            <Insulation_Cold>3</Insulation_Cold>
+            <Insulation_Heat>3</Insulation_Heat>
+            <EquipDelay>1.2</EquipDelay>
+            <Flammability>1.0</Flammability>
+            <DeteriorationRate>2</DeteriorationRate>
+            <SellPriceFactor>0.5</SellPriceFactor>
+        </statBases>
+        <apparel>
+            <bodyPartGroups>
+                <li>Hands</li>
+                <li>Feet</li>
+                <li>Neck</li>
+                <li>Legs</li>
+                <li>Arms</li>
+                <li>Torso</li>
+                <li>Waist</li>
+                <li>Shoulders</li>
+            </bodyPartGroups>
+            <layers>
+                <li>Shell</li>
+            </layers>
+            <shellRenderedBehindHead>true</shellRenderedBehindHead>
+            <canBeGeneratedToSatisfyWarmth>false</canBeGeneratedToSatisfyWarmth>
+            <developmentalStageFilter>Adult</developmentalStageFilter>
+        </apparel>
+        <comps>
+            <li Class="CompProperties_Forbiddable"/>
+            <li>
+                <compClass>CompColorable</compClass>
+            </li>
+        </comps>
+    </ThingDef>
+
+</Defs>