diff --git a/1.6/Defs/RecipeDefs/PowerArmor_Helmet_Paintjob_Recipes.xml b/1.6/Defs/RecipeDefs/PowerArmor_Helmet_Paintjob_Recipes.xml
index 52b0d3e..69ac559 100644
--- a/1.6/Defs/RecipeDefs/PowerArmor_Helmet_Paintjob_Recipes.xml
+++ b/1.6/Defs/RecipeDefs/PowerArmor_Helmet_Paintjob_Recipes.xml
@@ -2,8 +2,9 @@
 <Defs>
 
     <!-- T-51 Hotrodder Flame Job Power Armor Helmet -->
+
     <RecipeDef>
-        <defName>Make_FCP_Apparel_T51_Hotrod_Flames_Power_Armor_Helmet</defName>
+        <defName>FCP_Paint_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>
@@ -35,8 +36,9 @@
     </RecipeDef>
 
     <!-- T-51 Hotrodder Shark Paint Power Armor Helmet -->
+
     <RecipeDef>
-        <defName>Make_FCP_Apparel_T51_Shark_Paint_Power_Armor_Helmet</defName>
+        <defName>FCP_Paint_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>
@@ -68,8 +70,9 @@
     </RecipeDef>
 
     <!-- T-51 Hotrodder Hotpink Power Armor Helmet -->
+
     <RecipeDef>
-        <defName>Make_FCP_Apparel_T51_Hotrod_Pink_Power_Armor_Helmet</defName>
+        <defName>FCP_Paint_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>
@@ -101,8 +104,9 @@
     </RecipeDef>
 
     <!-- T-51 Abraxo Power Armor Helmet -->
+
     <RecipeDef>
-        <defName>Make_FCP_Apparel_T51_Abraxo_Power_Armor_Helmet</defName>
+        <defName>FCP_Paint_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>
@@ -134,8 +138,9 @@
     </RecipeDef>
 
     <!-- T-51 Sugar Bombs Power Armor Helmet -->
+
     <RecipeDef>
-        <defName>Make_FCP_Apparel_T51_Sugar_Bombs_Power_Armor_Helmet</defName>
+        <defName>FCP_Paint_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>
@@ -167,8 +172,9 @@
     </RecipeDef>
 
     <!-- T-60 Hotrodder Flame Job Power Armor Helmet -->
+
     <RecipeDef>
-        <defName>Make_FCP_Apparel_T60_Hotrod_Flames_Power_Armor_Helmet</defName>
+        <defName>FCP_Paint_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>
@@ -200,8 +206,9 @@
     </RecipeDef>
 
     <!-- T-60 Hotrodder Shark Paint Power Armor Helmet -->
+
     <RecipeDef>
-        <defName>Make_FCP_Apparel_T60_Shark_Paint_Power_Armor_Helmet</defName>
+        <defName>FCP_Paint_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>
@@ -233,8 +240,9 @@
     </RecipeDef>
 
     <!-- T-60 Hotrodder Hotpink Power Armor Helmet -->
+
     <RecipeDef>
-        <defName>Make_FCP_Apparel_T60_Hotrod_Pink_Power_Armor_Helmet</defName>
+        <defName>FCP_Paint_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>
@@ -265,4 +273,74 @@
         </recipeUsers>
     </RecipeDef>
 
+    <!-- Repaint to original -->
+
+    <RecipeDef>
+        <defName>FCP_Paint_Apparel_Power_Armor_T51_Helmet_Restore_Original</defName>
+        <label>Strip paint for T-51 power armor helmet</label>
+        <description>Strip paint and restore a T-51 power armor helmet to its original finish.</description>
+        <jobString>Restoring 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_T51_Hotrod_Flames_Power_Armor_Helmet</li>
+                        <li>FCP_Apparel_T51_Shark_Paint_Power_Armor_Helmet</li>
+                        <li>FCP_Apparel_T51_Hotrod_Pink_Power_Armor_Helmet</li>
+                        <li>FCP_Apparel_T51_Abraxo_Power_Armor_Helmet</li>
+                        <li>FCP_Apparel_T51_Sugar_Bombs_Power_Armor_Helmet</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <products>
+            <FCP_Apparel_Power_Armor_T51_Helmet>1</FCP_Apparel_Power_Armor_T51_Helmet>
+        </products>
+        <recipeUsers>
+            <li>FCP_Production_Armor_Workbench</li>
+        </recipeUsers>
+    </RecipeDef>
+
+    <RecipeDef>
+        <defName>FCP_Paint_Apparel_Power_Armor_T60_Helmet_Restore_Original</defName>
+        <label>Strip paint for T-60 power armor helmet</label>
+        <description>Strip paint and restore a T-60 power armor helmet to its original finish.</description>
+        <jobString>Restoring 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_T60_Hotrod_Flames_Power_Armor_Helmet</li>
+                        <li>FCP_Apparel_T60_Shark_Paint_Power_Armor_Helmet</li>
+                        <li>FCP_Apparel_T60_Hotrod_Pink_Power_Armor_Helmet</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <products>
+            <FCP_Apparel_Power_Armor_T60_Helmet>1</FCP_Apparel_Power_Armor_T60_Helmet>
+        </products>
+        <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
index fba4661..af8d4b8 100644
--- a/1.6/Defs/RecipeDefs/PowerArmor_Paintjob_Recipes.xml
+++ b/1.6/Defs/RecipeDefs/PowerArmor_Paintjob_Recipes.xml
@@ -2,8 +2,9 @@
 <Defs>
 
     <!-- T-51 Hotrodder Flame Job Power Armor -->
+
     <RecipeDef>
-        <defName>Make_FCP_Apparel_T51_Hotrod_Flames_Power_Armor</defName>
+        <defName>FCP_Paint_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>
@@ -35,8 +36,9 @@
     </RecipeDef>
 
     <!-- T-51 Hotrodder Shark Paint Power Armor -->
+
     <RecipeDef>
-        <defName>Make_FCP_Apparel_T51_Shark_Paint_Power_Armor</defName>
+        <defName>FCP_Paint_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>
@@ -68,8 +70,9 @@
     </RecipeDef>
 
     <!-- T-51 Hotrodder Hotpink Power Armor -->
+
     <RecipeDef>
-        <defName>Make_FCP_Apparel_T51_Hotrod_Pink_Power_Armor</defName>
+        <defName>FCP_Paint_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>
@@ -101,8 +104,9 @@
     </RecipeDef>
 
     <!-- T-51 Abraxo Power Armor -->
+
     <RecipeDef>
-        <defName>Make_FCP_Apparel_T51_Abraxo_Power_Armor</defName>
+        <defName>FCP_Paint_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>
@@ -134,8 +138,9 @@
     </RecipeDef>
 
     <!-- T-51 Sugar Bombs Power Armor -->
+
     <RecipeDef>
-        <defName>Make_FCP_Apparel_T51_Sugar_Bombs_Power_Armor</defName>
+        <defName>FCP_Paint_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>
@@ -167,8 +172,9 @@
     </RecipeDef>
 
     <!-- T-60 Hotrodder Flame Job Power Armor -->
+
     <RecipeDef>
-        <defName>Make_FCP_Apparel_T60_Hotrod_Flames_Power_Armor</defName>
+        <defName>FCP_Paint_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>
@@ -200,8 +206,9 @@
     </RecipeDef>
 
     <!-- T-60 Hotrodder Shark Paint Power Armor -->
+
     <RecipeDef>
-        <defName>Make_FCP_Apparel_T60_Shark_Paint_Power_Armor</defName>
+        <defName>FCP_Paint_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>
@@ -233,8 +240,9 @@
     </RecipeDef>
 
     <!-- T-60 Hotrodder Hotpink Power Armor -->
+
     <RecipeDef>
-        <defName>Make_FCP_Apparel_T60_Hotrod_Pink_Power_Armor</defName>
+        <defName>FCP_Paint_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>
@@ -265,4 +273,75 @@
         </recipeUsers>
     </RecipeDef>
 
+    <!-- Repaint to original -->
+
+    <RecipeDef>
+        <defName>FCP_Paint_Apparel_Power_Armor_T51Armor_Restore_Original</defName>
+        <label>Strip paint for T-51 power armor</label>
+        <description>Strip paint and restore a T-51 power armor to its original finish.</description>
+        <jobString>Restoring 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_T51_Hotrod_Flames_Power_Armor</li>
+                        <li>FCP_Apparel_T51_Shark_Paint_Power_Armor</li>
+                        <li>FCP_Apparel_T51_Hotrod_Pink_Power_Armor</li>
+                        <li>FCP_Apparel_T51_Abraxo_Power_Armor</li>
+                        <li>FCP_Apparel_T51_Sugar_Bombs_Power_Armor</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <products>
+            <FCP_Apparel_Power_Armor_T51Armor>1</FCP_Apparel_Power_Armor_T51Armor>
+        </products>
+        <recipeUsers>
+            <li>FCP_Production_Armor_Workbench</li>
+        </recipeUsers>
+    </RecipeDef>
+
+    <!-- Restore T-60 Power Armor To Original -->
+    <RecipeDef>
+        <defName>FCP_Paint_Apparel_Power_Armor_T60Armor_Restore_Original</defName>
+        <label>Strip paint for T-60 power armor</label>
+        <description>Strip paint and restore a T-60 power armor to its original finish.</description>
+        <jobString>Restoring 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_T60_Hotrod_Flames_Power_Armor</li>
+                        <li>FCP_Apparel_T60_Shark_Paint_Power_Armor</li>
+                        <li>FCP_Apparel_T60_Hotrod_Pink_Power_Armor</li>
+                    </thingDefs>
+                </filter>
+                <count>1</count>
+            </li>
+        </ingredients>
+        <products>
+            <FCP_Apparel_Power_Armor_T60Armor>1</FCP_Apparel_Power_Armor_T60Armor>
+        </products>
+        <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 b6b44d2..e43b223 100644
--- a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor.xml
+++ b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor.xml
@@ -76,6 +76,9 @@
 	</ThingDef>
 
 	<ThingDef ParentName="FCP_Apparel_Power_Armor_Frame_Base" Name="FCP_Apparel_Power_Armor_Base" Abstract="true">
+		<graphicData>
+			<drawSize>1.25</drawSize>
+		</graphicData>
 		<comps>
 			<li Class="FCP.Core.PowerArmor.CompProperties_ApparelRequirement">
 				<requiredApparels>
@@ -102,7 +105,7 @@
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/Power_Armor_Frame/FCP_Power_Armor_Frame</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
-			<drawSize>1</drawSize>
+			<drawSize>1.15</drawSize>
 		</graphicData>
 		<statBases>
 			<MarketValue>3000</MarketValue>
@@ -181,7 +184,6 @@
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T45/FCP_T45_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
-			<drawSize>1</drawSize>
 		</graphicData>
 		<statBases>
 			<MarketValue>3200</MarketValue>
@@ -220,7 +222,6 @@
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T51/FCP_T51_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
-			<drawSize>1</drawSize>
 		</graphicData>
 		<statBases>
 			<MarketValue>3400</MarketValue>
@@ -259,7 +260,6 @@
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T60/FCP_T60_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
-			<drawSize>1</drawSize>
 		</graphicData>
 		<statBases>
 			<MarketValue>3600</MarketValue>
@@ -298,7 +298,6 @@
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/X01/FCP_X01_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
-			<drawSize>1</drawSize>
 		</graphicData>
 		<statBases>
 			<MarketValue>3800</MarketValue>
@@ -369,7 +368,6 @@
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T51_Hotrod_Flames/FCP_T51_Hotrod_Flames_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
-			<drawSize>1</drawSize>
 		</graphicData>
 		<equippedStatOffsets>
 			<MoveSpeed>0.02</MoveSpeed>
@@ -390,7 +388,6 @@
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T51_Shark_Paint/FCP_T51_Shark_Paint_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
-			<drawSize>1</drawSize>
 		</graphicData>
 		<equippedStatOffsets>
 			<MeleeDodgeChance>0.03</MeleeDodgeChance>
@@ -411,7 +408,6 @@
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T51_Hotrod_Pink/FCP_T51_Hotrod_Pink_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
-			<drawSize>1</drawSize>
 		</graphicData>
 		<equippedStatOffsets>
 			<TradePriceImprovement>0.08</TradePriceImprovement>
@@ -432,7 +428,6 @@
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T51_Abraxo/FCP_T51_Abraxo_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
-			<drawSize>1</drawSize>
 		</graphicData>
 		<statBases>
 			<ToxicEnvironmentResistance>0.05</ToxicEnvironmentResistance>
@@ -457,7 +452,6 @@
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T51_Sugar_Bombs/FCP_T51_Sugar_Bombs_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
-			<drawSize>1</drawSize>
 		</graphicData>
 		<equippedStatOffsets>
 			<RestRateMultiplier>0.08</RestRateMultiplier>
@@ -508,7 +502,6 @@
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T60_Hotrod_Flames/FCP_T60_Hotrod_Flames_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
-			<drawSize>1</drawSize>
 		</graphicData>
 		<equippedStatOffsets>
 			<MoveSpeed>0.03</MoveSpeed>
@@ -529,7 +522,6 @@
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T60_Shark_Paint/FCP_T60_Shark_Paint_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
-			<drawSize>1</drawSize>
 		</graphicData>
 		<equippedStatOffsets>
 			<MeleeDodgeChance>0.05</MeleeDodgeChance>
@@ -551,7 +543,6 @@
 		<graphicData>
 			<texPath>Things/Apparel/Power_Armors/T60_Hotrod_Pink/FCP_T60_Hotrod_Pink_Power_Armor_Hulk_south</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
-			<drawSize>1</drawSize>
 		</graphicData>
 		<equippedStatOffsets>
 			<TradePriceImprovement>0.12</TradePriceImprovement>
@@ -564,3 +555,4 @@
 	</ThingDef>
 
 </Defs>
+
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 f66d7db..f51676c 100644
--- a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor_Headgear.xml
+++ b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Power_Armor_Headgear.xml
@@ -6,6 +6,9 @@
 	<ThingDef ParentName="HatBase" Name="FCP_Apparel_Power_Armor_Helmet_Base" Abstract="true">
 		<techLevel>Industrial</techLevel>
 		<generateCommonality>0.001</generateCommonality>
+		<graphicData>
+			<drawSize>1.25</drawSize>
+		</graphicData>
 		<apparel>
 			<canBeGeneratedToSatisfyWarmth>false</canBeGeneratedToSatisfyWarmth>
 			<canBeGeneratedToSatisfyVacuumResistance>false</canBeGeneratedToSatisfyVacuumResistance>
@@ -270,6 +273,9 @@
 		<generateCommonality>0</generateCommonality>
 		<techLevel>Industrial</techLevel>
 		<smeltable>false</smeltable>
+		<graphicData>
+			<drawSize>1.25</drawSize>
+		</graphicData>
 		<statBases>
 			<WorkToMake>1200</WorkToMake>
 			<MaxHitPoints>80</MaxHitPoints>
@@ -424,6 +430,9 @@
 		<generateCommonality>0</generateCommonality>
 		<techLevel>Industrial</techLevel>
 		<smeltable>false</smeltable>
+		<graphicData>
+			<drawSize>1.25</drawSize>
+		</graphicData>
 		<statBases>
 			<WorkToMake>1200</WorkToMake>
 			<MaxHitPoints>80</MaxHitPoints>
diff --git a/1.6/Defs/ThingDefs_Buildings/ThingDefs_PowerArmorStation.xml b/1.6/Defs/ThingDefs_Buildings/ThingDefs_PowerArmorStation.xml
index 56915e3..2e14a1e 100644
--- a/1.6/Defs/ThingDefs_Buildings/ThingDefs_PowerArmorStation.xml
+++ b/1.6/Defs/ThingDefs_Buildings/ThingDefs_PowerArmorStation.xml
@@ -38,23 +38,28 @@
 		<surfaceType>Item</surfaceType>
 		<recipes>
 			<!-- Power Armor Paintjobs -->
-			<li>Make_FCP_Apparel_T51_Hotrod_Flames_Power_Armor</li>
-			<li>Make_FCP_Apparel_T51_Shark_Paint_Power_Armor</li>
-			<li>Make_FCP_Apparel_T51_Hotrod_Pink_Power_Armor</li>
-			<li>Make_FCP_Apparel_T51_Abraxo_Power_Armor</li>
-			<li>Make_FCP_Apparel_T51_Sugar_Bombs_Power_Armor</li>
-			<li>Make_FCP_Apparel_T60_Hotrod_Flames_Power_Armor</li>
-			<li>Make_FCP_Apparel_T60_Shark_Paint_Power_Armor</li>
-			<li>Make_FCP_Apparel_T60_Hotrod_Pink_Power_Armor</li>
+			<li>FCP_Paint_Apparel_T51_Hotrod_Flames_Power_Armor</li>
+			<li>FCP_Paint_Apparel_T51_Shark_Paint_Power_Armor</li>
+			<li>FCP_Paint_Apparel_T51_Hotrod_Pink_Power_Armor</li>
+			<li>FCP_Paint_Apparel_T51_Abraxo_Power_Armor</li>
+			<li>FCP_Paint_Apparel_T51_Sugar_Bombs_Power_Armor</li>
+			<li>FCP_Paint_Apparel_T60_Hotrod_Flames_Power_Armor</li>
+			<li>FCP_Paint_Apparel_T60_Shark_Paint_Power_Armor</li>
+			<li>FCP_Paint_Apparel_T60_Hotrod_Pink_Power_Armor</li>
 			<!-- Helmet Paintjobs -->
-			<li>Make_FCP_Apparel_T51_Hotrod_Flames_Power_Armor_Helmet</li>
-			<li>Make_FCP_Apparel_T51_Shark_Paint_Power_Armor_Helmet</li>
-			<li>Make_FCP_Apparel_T51_Hotrod_Pink_Power_Armor_Helmet</li>
-			<li>Make_FCP_Apparel_T51_Abraxo_Power_Armor_Helmet</li>
-			<li>Make_FCP_Apparel_T51_Sugar_Bombs_Power_Armor_Helmet</li>
-			<li>Make_FCP_Apparel_T60_Hotrod_Flames_Power_Armor_Helmet</li>
-			<li>Make_FCP_Apparel_T60_Shark_Paint_Power_Armor_Helmet</li>
-			<li>Make_FCP_Apparel_T60_Hotrod_Pink_Power_Armor_Helmet</li>
+			<li>FCP_Paint_Apparel_T51_Hotrod_Flames_Power_Armor_Helmet</li>
+			<li>FCP_Paint_Apparel_T51_Shark_Paint_Power_Armor_Helmet</li>
+			<li>FCP_Paint_Apparel_T51_Hotrod_Pink_Power_Armor_Helmet</li>
+			<li>FCP_Paint_Apparel_T51_Abraxo_Power_Armor_Helmet</li>
+			<li>FCP_Paint_Apparel_T51_Sugar_Bombs_Power_Armor_Helmet</li>
+			<li>FCP_Paint_Apparel_T60_Hotrod_Flames_Power_Armor_Helmet</li>
+			<li>FCP_Paint_Apparel_T60_Shark_Paint_Power_Armor_Helmet</li>
+			<li>FCP_Paint_Apparel_T60_Hotrod_Pink_Power_Armor_Helmet</li>
+			<!-- Strip Power Armor Paint -->
+			<li>FCP_Paint_Apparel_Power_Armor_T51Armor_Restore_Original</li>
+			<li>FCP_Paint_Apparel_Power_Armor_T60Armor_Restore_Original</li>
+			<li>FCP_Paint_Apparel_Power_Armor_T51_Helmet_Restore_Original</li>
+			<li>FCP_Paint_Apparel_Power_Armor_T60_Helmet_Restore_Original</li>
 		</recipes>
 		<comps>
 			<li Class="FCP.Core.PowerArmor.CompProperties_PowerArmorStation">
diff --git a/1.6/Patches/PowerArmorStation_RecipeUsers.xml b/1.6/Patches/PowerArmorStation_RecipeUsers.xml
index 1afc4f1..3675c95 100644
--- a/1.6/Patches/PowerArmorStation_RecipeUsers.xml
+++ b/1.6/Patches/PowerArmorStation_RecipeUsers.xml
@@ -2,24 +2,12 @@
 <Patch>
 
 	<!-- Add Power Armor Station as a recipe user for all power armor paintjob recipes -->
-	
-	<Operation Class="PatchOperationFindMod">
-		<mods>
-			<li>Fallout Core - Power Armor</li>
-		</mods>
-		<match Class="PatchOperationSequence">
-			<operations>
-				
-				<!-- Add station to all existing paintjob recipes -->
-				<li Class="PatchOperationAdd">
-					<xpath>/Defs/RecipeDef[recipeUsers/li[text()="FCP_Production_Armor_Workbench"]]/recipeUsers</xpath>
-					<value>
-						<li>FCP_Building_PowerArmorStation</li>
-					</value>
-				</li>
-				
-			</operations>
-		</match>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>/Defs/RecipeDef[recipeUsers/li[text()="FCP_Production_Armor_Workbench"]]/recipeUsers</xpath>
+		<value>
+			<li>FCP_Building_PowerArmorStation</li>
+		</value>
 	</Operation>
 
 </Patch>