diff --git a/1.4/Defs/ThingDef/ThingDef_Weapons_Industrial.xml b/1.4/Defs/ThingDef/ThingDef_Weapons_Industrial.xml
index e257ee7..00e8f60 100644
--- a/1.4/Defs/ThingDef/ThingDef_Weapons_Industrial.xml
+++ b/1.4/Defs/ThingDef/ThingDef_Weapons_Industrial.xml
@@ -478,7 +478,13 @@
       </li>
       <li Class="PN_ItemFormChange.CompPropertiesFormChange">
         <sharedComps>
-          <li>CompQuality</li>
+          <li>RimWorld.CompProperties_Styleable</li>
+          <li>RimWorld.CompStyleable</li>
+          <li>RimWorld.CompProperties_Biocodable</li>
+          <li>RimWorld.CompBiocodable</li>
+          <li>RimWorld.CompQuality</li>
+          <li>RimWorld.CompProperties_Art</li>
+          <li>RimWorld.CompArt</li>
         </sharedComps>
         <transformData>
           <li>
@@ -589,7 +595,13 @@
       </li>
       <li Class="PN_ItemFormChange.CompPropertiesFormChange">
         <sharedComps>
-          <li>CompQuality</li>
+          <li>RimWorld.CompProperties_Styleable</li>
+          <li>RimWorld.CompStyleable</li>
+          <li>RimWorld.CompProperties_Biocodable</li>
+          <li>RimWorld.CompBiocodable</li>
+          <li>RimWorld.CompQuality</li>
+          <li>RimWorld.CompProperties_Art</li>
+          <li>RimWorld.CompArt</li>
         </sharedComps>
         <transformData>
           <li>
@@ -717,7 +729,13 @@
       </li>
       <li Class="PN_ItemFormChange.CompPropertiesFormChange">
         <sharedComps>
-          <li>CompQuality</li>
+          <li>RimWorld.CompProperties_Styleable</li>
+          <li>RimWorld.CompStyleable</li>
+          <li>RimWorld.CompProperties_Biocodable</li>
+          <li>RimWorld.CompBiocodable</li>
+          <li>RimWorld.CompQuality</li>
+          <li>RimWorld.CompProperties_Art</li>
+          <li>RimWorld.CompArt</li>
         </sharedComps>
         <transformData>
           <li>
@@ -829,7 +847,13 @@
       </li>
       <li Class="PN_ItemFormChange.CompPropertiesFormChange">
         <sharedComps>
-          <li>CompQuality</li>
+          <li>RimWorld.CompProperties_Styleable</li>
+          <li>RimWorld.CompStyleable</li>
+          <li>RimWorld.CompProperties_Biocodable</li>
+          <li>RimWorld.CompBiocodable</li>
+          <li>RimWorld.CompQuality</li>
+          <li>RimWorld.CompProperties_Art</li>
+          <li>RimWorld.CompArt</li>
         </sharedComps>
         <revertData>
           <label>overheating</label>
@@ -965,7 +989,13 @@
       </li>
       <li Class="PN_ItemFormChange.CompPropertiesFormChange">
         <sharedComps>
-          <li>CompQuality</li>
+          <li>RimWorld.CompProperties_Styleable</li>
+          <li>RimWorld.CompStyleable</li>
+          <li>RimWorld.CompProperties_Biocodable</li>
+          <li>RimWorld.CompBiocodable</li>
+          <li>RimWorld.CompQuality</li>
+          <li>RimWorld.CompProperties_Art</li>
+          <li>RimWorld.CompArt</li>
         </sharedComps>
         <transformData>
           <li>
@@ -1072,7 +1102,13 @@
       </li>
       <li Class="PN_ItemFormChange.CompPropertiesFormChange">
         <sharedComps>
-          <li>CompQuality</li>
+          <li>RimWorld.CompProperties_Styleable</li>
+          <li>RimWorld.CompStyleable</li>
+          <li>RimWorld.CompProperties_Biocodable</li>
+          <li>RimWorld.CompBiocodable</li>
+          <li>RimWorld.CompQuality</li>
+          <li>RimWorld.CompProperties_Art</li>
+          <li>RimWorld.CompArt</li>
         </sharedComps>
         <transformData>
           <li>
diff --git a/1.4/Defs/ThingDef/ThingDef_Weapons_Royal.xml b/1.4/Defs/ThingDef/ThingDef_Weapons_Royal.xml
index 43aad2f..f9de656 100644
--- a/1.4/Defs/ThingDef/ThingDef_Weapons_Royal.xml
+++ b/1.4/Defs/ThingDef/ThingDef_Weapons_Royal.xml
@@ -316,7 +316,13 @@
       </li>
       <li Class="PN_ItemFormChange.CompPropertiesFormChange">
         <sharedComps>
-          <li>CompQuality</li>
+          <li>RimWorld.CompProperties_Styleable</li>
+          <li>RimWorld.CompStyleable</li>
+          <li>RimWorld.CompProperties_Biocodable</li>
+          <li>RimWorld.CompBiocodable</li>
+          <li>RimWorld.CompQuality</li>
+          <li>RimWorld.CompProperties_Art</li>
+          <li>RimWorld.CompArt</li>
         </sharedComps>
         <transformData>
           <li>
@@ -433,7 +439,13 @@
       </li>
       <li Class="PN_ItemFormChange.CompPropertiesFormChange">
         <sharedComps>
-          <li>CompQuality</li>
+          <li>RimWorld.CompProperties_Styleable</li>
+          <li>RimWorld.CompStyleable</li>
+          <li>RimWorld.CompProperties_Biocodable</li>
+          <li>RimWorld.CompBiocodable</li>
+          <li>RimWorld.CompQuality</li>
+          <li>RimWorld.CompProperties_Art</li>
+          <li>RimWorld.CompArt</li>
         </sharedComps>
         <transformData>
           <li>
@@ -690,7 +702,13 @@
       </li>
       <li Class="PN_ItemFormChange.CompPropertiesFormChange">
         <sharedComps>
-          <li>CompQuality</li>
+          <li>RimWorld.CompProperties_Styleable</li>
+          <li>RimWorld.CompStyleable</li>
+          <li>RimWorld.CompProperties_Biocodable</li>
+          <li>RimWorld.CompBiocodable</li>
+          <li>RimWorld.CompQuality</li>
+          <li>RimWorld.CompProperties_Art</li>
+          <li>RimWorld.CompArt</li>
         </sharedComps>
         <transformData>
           <li>
@@ -806,7 +824,13 @@
       </li>
       <li Class="PN_ItemFormChange.CompPropertiesFormChange">
         <sharedComps>
-          <li>CompQuality</li>
+          <li>RimWorld.CompProperties_Styleable</li>
+          <li>RimWorld.CompStyleable</li>
+          <li>RimWorld.CompProperties_Biocodable</li>
+          <li>RimWorld.CompBiocodable</li>
+          <li>RimWorld.CompQuality</li>
+          <li>RimWorld.CompProperties_Art</li>
+          <li>RimWorld.CompArt</li>
         </sharedComps>
         <revertData>
           <label>overheating</label>
@@ -943,7 +967,13 @@
       </li>
       <li Class="PN_ItemFormChange.CompPropertiesFormChange">
         <sharedComps>
-          <li>CompQuality</li>
+          <li>RimWorld.CompProperties_Styleable</li>
+          <li>RimWorld.CompStyleable</li>
+          <li>RimWorld.CompProperties_Biocodable</li>
+          <li>RimWorld.CompBiocodable</li>
+          <li>RimWorld.CompQuality</li>
+          <li>RimWorld.CompProperties_Art</li>
+          <li>RimWorld.CompArt</li>
         </sharedComps>
         <transformData>
           <li>
@@ -1079,7 +1109,13 @@
       </li>
       <li Class="PN_ItemFormChange.CompPropertiesFormChange">
         <sharedComps>
-          <li>CompQuality</li>
+          <li>RimWorld.CompProperties_Styleable</li>
+          <li>RimWorld.CompStyleable</li>
+          <li>RimWorld.CompProperties_Biocodable</li>
+          <li>RimWorld.CompBiocodable</li>
+          <li>RimWorld.CompQuality</li>
+          <li>RimWorld.CompProperties_Art</li>
+          <li>RimWorld.CompArt</li>
         </sharedComps>
         <transformData>
           <li>
@@ -1215,7 +1251,13 @@
       </li>
       <li Class="PN_ItemFormChange.CompPropertiesFormChange">
         <sharedComps>
-          <li>CompQuality</li>
+          <li>RimWorld.CompProperties_Styleable</li>
+          <li>RimWorld.CompStyleable</li>
+          <li>RimWorld.CompProperties_Biocodable</li>
+          <li>RimWorld.CompBiocodable</li>
+          <li>RimWorld.CompQuality</li>
+          <li>RimWorld.CompProperties_Art</li>
+          <li>RimWorld.CompArt</li>
         </sharedComps>
         <transformData>
           <li>
@@ -1351,7 +1393,13 @@
       </li>
       <li Class="PN_ItemFormChange.CompPropertiesFormChange">
         <sharedComps>
-          <li>CompQuality</li>
+          <li>RimWorld.CompProperties_Styleable</li>
+          <li>RimWorld.CompStyleable</li>
+          <li>RimWorld.CompProperties_Biocodable</li>
+          <li>RimWorld.CompBiocodable</li>
+          <li>RimWorld.CompQuality</li>
+          <li>RimWorld.CompProperties_Art</li>
+          <li>RimWorld.CompArt</li>
         </sharedComps>
         <transformData>
           <li>
@@ -1487,7 +1535,13 @@
       </li>
       <li Class="PN_ItemFormChange.CompPropertiesFormChange">
         <sharedComps>
-          <li>CompQuality</li>
+          <li>RimWorld.CompProperties_Styleable</li>
+          <li>RimWorld.CompStyleable</li>
+          <li>RimWorld.CompProperties_Biocodable</li>
+          <li>RimWorld.CompBiocodable</li>
+          <li>RimWorld.CompQuality</li>
+          <li>RimWorld.CompProperties_Art</li>
+          <li>RimWorld.CompArt</li>
         </sharedComps>
         <transformData>
           <li>