diff --git a/1.6/Defs/ThingDefs_Buildings/ThingDefs_PowerArmorStation.xml b/1.6/Defs/ThingDefs_Buildings/ThingDefs_PowerArmorStation.xml
index 2f78ae5..38a767e 100644
--- a/1.6/Defs/ThingDefs_Buildings/ThingDefs_PowerArmorStation.xml
+++ b/1.6/Defs/ThingDefs_Buildings/ThingDefs_PowerArmorStation.xml
@@ -5,6 +5,7 @@
 		<defName>FCP_Building_PowerArmorStation</defName>
 		<label>power armor station</label>
 		<description>A specialized station for storing and displaying power armor sets. Allows quick swapping of armor pieces between storage and use.</description>
+		<thingClass>Building_WorkTable</thingClass>
 		<graphicData>
 			<graphicClass>Graphic_Multi</graphicClass>
 			<texPath>Things/Buildings/FCP_Power_Armor_Station</texPath>
@@ -28,10 +29,33 @@
 			<WorkToBuild>2000</WorkToBuild>
 			<Flammability>1.0</Flammability>
 			<Beauty>2</Beauty>
+			<WorkTableWorkSpeedFactor>1.0</WorkTableWorkSpeedFactor>
 		</statBases>
 		<inspectorTabs>
+			<li>ITab_Bills</li>
 			<li>RangerRick_PowerArmor.ITab_ContentsPowerArmorStation</li>
 		</inspectorTabs>
+		<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>
+			<!-- 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>
+		</recipes>
 		<comps>
 			<li Class="RangerRick_PowerArmor.CompProperties_PowerArmorStation">
 				<armorDrawOffset>(0, 0, 1)</armorDrawOffset>
diff --git a/1.6/Patches/PowerArmorStation_RecipeUsers.xml b/1.6/Patches/PowerArmorStation_RecipeUsers.xml
new file mode 100644
index 0000000..1afc4f1
--- /dev/null
+++ b/1.6/Patches/PowerArmorStation_RecipeUsers.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<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>
+
+</Patch>