diff --git a/1.6/Defs/PawnkindDefs/PawnkindDefs.xml b/1.6/Defs/PawnkindDefs/PawnkindDefs.xml
index d998f7e..12fdf9f 100644
--- a/1.6/Defs/PawnkindDefs/PawnkindDefs.xml
+++ b/1.6/Defs/PawnkindDefs/PawnkindDefs.xml
@@ -59,7 +59,11 @@
         <combatPower>30</combatPower>
         <itemQuality>Poor</itemQuality>
         <gearHealthRange>0.5~1.8</gearHealthRange>
-        <apparelMoney>600~1000</apparelMoney>
+        <apparelMoney>200~400</apparelMoney>
+        <apparelAllowHeadgearChance>0.15</apparelAllowHeadgearChance>
+        <apparelTags>
+            <li>FCP_Wastelander_Apparel</li>
+        </apparelTags>
         <weaponMoney>600</weaponMoney>
         <weaponTags>
             <li>Gun</li>
@@ -266,7 +270,7 @@
     <PawnKindDef ParentName="FCP_WastelanderkindBase" MayRequire="Rick.FCP.Wastelanders">
         <defName>FCP_Pawnkind_Rivet_City_Security</defName>
         <label>Rivet City Security Officer</label>
-        <apparelAllowHeadgearChance>0</apparelAllowHeadgearChance>
+        <apparelAllowHeadgearChance>1</apparelAllowHeadgearChance>
         <combatPower>50</combatPower>
         <gearHealthRange>1~1.8</gearHealthRange>
         <apparelMoney>1000~2000</apparelMoney>
@@ -309,7 +313,8 @@
         <combatPower>65</combatPower>
         <itemQuality>Normal</itemQuality>
         <gearHealthRange>0.7~1.8</gearHealthRange>
-        <apparelMoney>800~1500</apparelMoney>
+        <apparelMoney>400~600</apparelMoney>
+        <apparelAllowHeadgearChance>0.15</apparelAllowHeadgearChance>
         <weaponMoney>700</weaponMoney>
         <weaponTags>
             <li>Gun</li>
@@ -345,7 +350,7 @@
         <combatPower>30</combatPower>
         <itemQuality>Poor</itemQuality>
         <gearHealthRange>0.5~1.8</gearHealthRange>
-        <apparelMoney>600~1000</apparelMoney>
+        <apparelMoney>200~400</apparelMoney>
         <weaponMoney>600</weaponMoney>
         <weaponTags>
             <li>Gun</li>
diff --git a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Wastelander_Apparel.xml b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Wastelander_Apparel.xml
index 017e665..445a727 100644
--- a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Wastelander_Apparel.xml
+++ b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Wastelander_Apparel.xml
@@ -3068,6 +3068,7 @@
 			<layers>
 				<li>Shell</li>
 				<li>Middle</li>
+				<li>OnSkin</li>
 			</layers>
 			<tags>
 				<li>FCP_Wastelander_Apparel</li>
@@ -3136,7 +3137,6 @@
 			</layers>
 			<tags>
 				<li>FCP_Wastelander_Apparel</li>
-				<li>FCP_Raider_Apparel</li>
 			</tags>
 			<defaultOutfitTags>
 				<li>FCP_Wastelander_Outfit</li>
diff --git a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Wastelander_Headgear.xml b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Wastelander_Headgear.xml
index e192110..2d0fd9f 100644
--- a/1.6/Defs/ThingDefs_Apparel/ThingDefs_Wastelander_Headgear.xml
+++ b/1.6/Defs/ThingDefs_Apparel/ThingDefs_Wastelander_Headgear.xml
@@ -583,10 +583,11 @@
             </bodyPartGroups>
             <wornGraphicPath>Things/Apparel/Wasteland_Apparel/Gas_Mask_With_Goggles/FCP_Gas_Mask_With_Goggles</wornGraphicPath>
             <layers>
-                <li>OnSkin</li>
+                <li>Overhead</li>
             </layers>
             <tags>
                 <li>FCP_Raider_Armor</li>
+                <li>FCP_Wastelander_Apparel</li>
             </tags>
         </apparel>
         <comps>
@@ -644,10 +645,11 @@
             </bodyPartGroups>
             <wornGraphicPath>Things/Apparel/Wasteland_Apparel/Assault_Gas_Mask/FCP_Assault_Gas_Mask</wornGraphicPath>
             <layers>
-                <li>OnSkin</li>
+                <li>Overhead</li>
             </layers>
             <tags>
                 <li>FCP_Raider_Armor</li>
+                <li>FCP_Wastelander_Apparel</li>
             </tags>
         </apparel>
         <comps>