diff --git a/1.6/Core/Assemblies/ItemFormChange_Maru.dll b/1.6/Core/Assemblies/ItemFormChange_Maru.dll
new file mode 100644
index 0000000..4661a32
Binary files /dev/null and b/1.6/Core/Assemblies/ItemFormChange_Maru.dll differ
diff --git a/1.6/Core/Assemblies/ItemFormChange_Roo.dll b/1.6/Core/Assemblies/ItemFormChange_Roo.dll
deleted file mode 100644
index 33b4adb..0000000
Binary files a/1.6/Core/Assemblies/ItemFormChange_Roo.dll and /dev/null differ
diff --git a/1.6/Core/Defs/ThingDefs/ThingDef_Weapons_Industrial.xml b/1.6/Core/Defs/ThingDefs/ThingDef_Weapons_Industrial.xml
index 7a6d15a..bdec9d6 100644
--- a/1.6/Core/Defs/ThingDefs/ThingDef_Weapons_Industrial.xml
+++ b/1.6/Core/Defs/ThingDefs/ThingDef_Weapons_Industrial.xml
@@ -477,7 +477,7 @@
           <angle>30</angle>
         </westOffset>
       </li>
-      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Maru.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -495,8 +495,6 @@
             <thingDef>PN_Rifle_Point</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/Snipe</iconPath>
-            <iconSize>1</iconSize>
           </li>
         </transformData>
       </li>
@@ -596,7 +594,7 @@
           <angle>30</angle>
         </westOffset>
       </li>
-      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Maru.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -614,8 +612,6 @@
             <thingDef>PN_Rifle</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/Pew</iconPath>
-            <iconSize>1</iconSize>
           </li>
         </transformData>
       </li>
@@ -733,7 +729,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Maru.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -751,8 +747,6 @@
             <thingDef>PN_Machinegun_Mount</thingDef>
             <transformCooldown>120</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/MG_Mount</iconPath>
-            <iconSize>1</iconSize>
           </li>
         </transformData>
       </li>
@@ -851,7 +845,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Maru.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -868,8 +862,6 @@
           <thingDef>PN_Machinegun_Overheated</thingDef>
           <revertAfterTicks>800</revertAfterTicks>
           <transformCooldown>2000</transformCooldown>
-          <iconPath>UI/Commands/MG_overheat</iconPath>
-          <iconSize>1</iconSize>
         </revertData>
         <transformData>
           <li>
@@ -878,8 +870,6 @@
             <thingDef>PN_Machinegun_Overheated</thingDef>
             <transformCooldown>2000</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/MG_withdrawal</iconPath>
-            <iconSize>1</iconSize>
           </li>
         </transformData>
       </li>
@@ -978,7 +968,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Maru.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -995,8 +985,6 @@
           <thingDef>PN_Machinegun</thingDef>
           <revertAfterTicks>1700</revertAfterTicks>
           <transformCooldown>2500</transformCooldown>
-          <iconPath>UI/Commands/MG_cooling</iconPath>
-          <iconSize>1</iconSize>
         </revertData>
       </li>
     </comps>
@@ -1111,7 +1099,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Maru.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -1129,8 +1117,6 @@
             <thingDef>PN_Cannon_HE</thingDef>
             <transformCooldown>120</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/HE</iconPath>
-            <iconSize>1</iconSize>
           </li>
         </transformData>
       </li>
@@ -1229,7 +1215,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Maru.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -1247,8 +1233,6 @@
             <thingDef>PN_Cannon</thingDef>
             <transformCooldown>120</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/AP</iconPath>
-            <iconSize>1</iconSize>
           </li>
         </transformData>
       </li>
diff --git a/1.6/Core/Defs/ThingDefs/ThingDef_Weapons_Royal.xml b/1.6/Core/Defs/ThingDefs/ThingDef_Weapons_Royal.xml
index dcfa4a7..417ca4e 100644
--- a/1.6/Core/Defs/ThingDefs/ThingDef_Weapons_Royal.xml
+++ b/1.6/Core/Defs/ThingDefs/ThingDef_Weapons_Royal.xml
@@ -314,7 +314,7 @@
           <angle>30</angle>
         </westOffset>
       </li>
-      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Maru.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -332,8 +332,6 @@
             <thingDef>PN_RoyalRifle_Point</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/Snipe</iconPath>
-            <iconSize>1</iconSize>
           </li>
         </transformData>
       </li>
@@ -440,7 +438,7 @@
           <angle>30</angle>
         </westOffset>
       </li>
-      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Maru.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -458,8 +456,6 @@
             <thingDef>PN_RoyalRifle</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/Pew</iconPath>
-            <iconSize>1</iconSize>
           </li>
         </transformData>
       </li>
@@ -706,7 +702,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Maru.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -724,8 +720,6 @@
             <thingDef>PN_RoyalMachinegun_Mount</thingDef>
             <transformCooldown>120</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/MG_Mount</iconPath>
-            <iconSize>1</iconSize>
           </li>
         </transformData>
       </li>
@@ -828,7 +822,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Maru.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -845,8 +839,6 @@
           <thingDef>PN_RoyalMachinegun_Overheated</thingDef>
           <revertAfterTicks>800</revertAfterTicks>
           <transformCooldown>2000</transformCooldown>
-          <iconPath>UI/Commands/MG_overheat</iconPath>
-          <iconSize>1</iconSize>
         </revertData>
         <transformData>
           <li>
@@ -855,8 +847,6 @@
             <thingDef>PN_RoyalMachinegun_Overheated</thingDef>
             <transformCooldown>2000</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/MG_withdrawal</iconPath>
-            <iconSize>1</iconSize>
           </li>
         </transformData>
       </li>
@@ -959,7 +949,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Maru.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -976,8 +966,6 @@
           <thingDef>PN_RoyalMachinegun</thingDef>
           <revertAfterTicks>1700</revertAfterTicks>
           <transformCooldown>2500</transformCooldown>
-          <iconPath>UI/Commands/MG_cooling</iconPath>
-          <iconSize>1</iconSize>
         </revertData>
       </li>
     </comps>
@@ -1093,7 +1081,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Maru.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -1111,8 +1099,6 @@
             <thingDef>PN_RoyalLSW_IE</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/Flame</iconPath>
-            <iconSize>1</iconSize>
           </li>
           <li>
             <label>change EMP shell</label>
@@ -1120,8 +1106,6 @@
             <thingDef>PN_RoyalLSW_EMP</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/EMP</iconPath>
-            <iconSize>1</iconSize>
           </li>
           <li>
             <label>change Smoke shell</label>
@@ -1129,8 +1113,6 @@
             <thingDef>PN_RoyalLSW_Smoke</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/Smoke</iconPath>
-            <iconSize>1</iconSize>
           </li>
           <li>
             <label>change Firefoam shell</label>
@@ -1138,8 +1120,6 @@
             <thingDef>PN_RoyalLSW_FF</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/FF</iconPath>
-            <iconSize>1</iconSize>
           </li>
         </transformData>
       </li>
@@ -1244,7 +1224,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Maru.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -1262,8 +1242,6 @@
             <thingDef>PN_RoyalLSW</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/HE</iconPath>
-            <iconSize>1</iconSize>
           </li>
           <li>
             <label>change EMP shell</label>
@@ -1271,8 +1249,6 @@
             <thingDef>PN_RoyalLSW_EMP</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/EMP</iconPath>
-            <iconSize>1</iconSize>
           </li>
           <li>
             <label>change Smoke shell</label>
@@ -1280,8 +1256,6 @@
             <thingDef>PN_RoyalLSW_Smoke</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/Smoke</iconPath>
-            <iconSize>1</iconSize>
           </li>
           <li>
             <label>change Firefoam shell</label>
@@ -1289,8 +1263,6 @@
             <thingDef>PN_RoyalLSW_FF</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/FF</iconPath>
-            <iconSize>1</iconSize>
           </li>
         </transformData>
       </li>
@@ -1395,7 +1367,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Maru.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -1413,8 +1385,6 @@
             <thingDef>PN_RoyalLSW</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/HE</iconPath>
-            <iconSize>1</iconSize>
           </li>
           <li>
             <label>change Incendiary shell</label>
@@ -1422,8 +1392,6 @@
             <thingDef>PN_RoyalLSW_IE</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/Flame</iconPath>
-            <iconSize>1</iconSize>
           </li>
           <li>
             <label>change Smoke shell</label>
@@ -1431,8 +1399,6 @@
             <thingDef>PN_RoyalLSW_Smoke</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/Smoke</iconPath>
-            <iconSize>1</iconSize>
           </li>
           <li>
             <label>change Firefoam shell</label>
@@ -1440,8 +1406,6 @@
             <thingDef>PN_RoyalLSW_FF</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/FF</iconPath>
-            <iconSize>1</iconSize>
           </li>
         </transformData>
       </li>
@@ -1546,7 +1510,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Maru.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -1564,8 +1528,6 @@
             <thingDef>PN_RoyalLSW</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/HE</iconPath>
-            <iconSize>1</iconSize>
           </li>
           <li>
             <label>change Incendiary shell</label>
@@ -1573,8 +1535,6 @@
             <thingDef>PN_RoyalLSW_IE</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/Flame</iconPath>
-            <iconSize>1</iconSize>
           </li>
           <li>
             <label>change EMP shell</label>
@@ -1582,8 +1542,6 @@
             <thingDef>PN_RoyalLSW_EMP</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/EMP</iconPath>
-            <iconSize>1</iconSize>
           </li>
           <li>
             <label>change Firefoam shell</label>
@@ -1591,8 +1549,6 @@
             <thingDef>PN_RoyalLSW_FF</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/FF</iconPath>
-            <iconSize>1</iconSize>
           </li>
         </transformData>
       </li>
@@ -1697,7 +1653,7 @@
           <angle>-70</angle>
         </westOffset>
       </li>
-      <li Class="ItemFormChange_Roo.CompPropertiesFormChange">
+      <li Class="ItemFormChange_Maru.CompPropertiesFormChange">
         <sharedComps>
           <li>RimWorld.CompProperties_Styleable</li>
           <li>RimWorld.CompStyleable</li>
@@ -1715,8 +1671,6 @@
             <thingDef>PN_RoyalLSW</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/HE</iconPath>
-            <iconSize>1</iconSize>
           </li>
           <li>
             <label>change Incendiary shell</label>
@@ -1724,8 +1678,6 @@
             <thingDef>PN_RoyalLSW_IE</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/Flame</iconPath>
-            <iconSize>1</iconSize>
           </li>
           <li>
             <label>change EMP shell</label>
@@ -1733,8 +1685,6 @@
             <thingDef>PN_RoyalLSW_EMP</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/EMP</iconPath>
-            <iconSize>1</iconSize>
           </li>
           <li>
             <label>change Smoke shell</label>
@@ -1742,8 +1692,6 @@
             <thingDef>PN_RoyalLSW_Smoke</thingDef>
             <transformCooldown>30</transformCooldown>
             <soundOnTransform>Interact_Rifle</soundOnTransform>
-            <iconPath>UI/Commands/Smoke</iconPath>
-            <iconSize>1</iconSize>
           </li>
         </transformData>
       </li>