diff --git a/Patches/K4G Rimworld War 2/TraderKinds_Defs/TraderKinds_Defs.xml b/Patches/K4G Rimworld War 2/TraderKinds_Defs/TraderKinds_Defs.xml
index c25d389975..ec416749c1 100644
--- a/Patches/K4G Rimworld War 2/TraderKinds_Defs/TraderKinds_Defs.xml	
+++ b/Patches/K4G Rimworld War 2/TraderKinds_Defs/TraderKinds_Defs.xml	
@@ -8,344 +8,240 @@
 		<match Class="PatchOperationSequence">
 			<operations>
 
+				<!-- ======= Remove Vanilla Mortar Shells. =======-->
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/TraderKindDef[@Name="WW2BaseTrader"]/stockGenerators/li[thingDef="Shell_HighExplosive"]</xpath>
+				</li>
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/TraderKindDef[@Name="WW2BaseTrader"]/stockGenerators/li[thingDef="Shell_Incendiary"]</xpath>
+				</li>
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/TraderKindDef[@Name="WW2BaseTrader"]/stockGenerators/li[thingDef="Shell_Smoke"]</xpath>
+				</li>
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/TraderKindDef[@Name="WW2CaravanTrader"]/stockGenerators/li[thingDef="Shell_HighExplosive"]</xpath>
+				</li>
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/TraderKindDef[@Name="WW2CaravanTrader"]/stockGenerators/li[thingDef="Shell_Incendiary"]</xpath>
+				</li>
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/TraderKindDef[@Name="WW2CaravanTrader"]/stockGenerators/li[thingDef="Shell_Smoke"]</xpath>
+				</li>
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/TraderKindDef[@Name="WW2VisitorTrader"]/stockGenerators/li[thingDef="Shell_HighExplosive"]</xpath>
+				</li>
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/TraderKindDef[@Name="WW2VisitorTrader"]/stockGenerators/li[thingDef="Shell_Incendiary"]</xpath>
+				</li>
+
+				<li Class="PatchOperationRemove">
+					<xpath>Defs/TraderKindDef[@Name="WW2VisitorTrader"]/stockGenerators/li[thingDef="Shell_Smoke"]</xpath>
+				</li>
+
 				<!-- ======= Trader Base =======-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraderKindDef[ @Name="WW2BaseTrader"]/stockGenerators</xpath>
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/TraderKindDef[@Name="WW2BaseTrader"]/stockGenerators</xpath>
 					<value>
-						<stockGenerators>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>Silver</thingDef>
-								<countRange>800~3000</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>ComponentIndustrial</thingDef>
-								<countRange>20~60</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>Steel</thingDef>
-								<countRange>400~800</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>WoodLog</thingDef>
-								<countRange>200~400</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>Cloth</thingDef>
-								<countRange>200~400</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>Neutroamine</thingDef>
-								<countRange>50~250</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>Chemfuel</thingDef>
-								<countRange>300~500</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>MedicineIndustrial</thingDef>
-								<countRange>20~60</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>Chocolate</thingDef>
-								<countRange>-30~30</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>Beer</thingDef>
-								<countRange>-40~30</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>MealSurvivalPack</thingDef>
-								<countRange>20~60</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>FSX</thingDef>
-								<countRange>
-									<min>15</min>
-									<max>40</max>
-								</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>Prometheum</thingDef>
-								<countRange>
-									<min>15</min>
-									<max>40</max>
-								</countRange>
-							</li>
-							<li Class="StockGenerator_Tag">
-								<tradeTag>CE_Ammo</tradeTag>
-								<countRange>
-									<min>400</min>
-									<max>1000</max>
-								</countRange>
-								<price>Cheap</price>
-								<thingDefCountRange>
-									<min>3</min>
-									<max>8</max>
-								</thingDefCountRange>
-							</li>
-							<li Class="StockGenerator_Tag">
-								<tradeTag>CE_HeavyAmmo</tradeTag>
-								<countRange>
-									<min>10</min>
-									<max>50</max>
-								</countRange>
-								<thingDefCountRange>
-									<min>2</min>
-									<max>5</max>
-								</thingDefCountRange>
-							</li>
-							<li Class="StockGenerator_Category">
-								<categoryDef>Ammo</categoryDef>
-								<thingDefCountRange>
-									<min>0</min>
-									<max>0</max>
-								</thingDefCountRange>
-							</li>
-							<li Class="StockGenerator_Tag">
-								<tradeTag>CE_Turret</tradeTag>
-								<thingDefCountRange>
-									<min>-4</min>
-									<max>2</max>
-								</thingDefCountRange>
-								<countRange>
-									<min>1</min>
-									<max>1</max>
-								</countRange>
-							</li>
-							<li Class="StockGenerator_Category">
-								<categoryDef>WeaponsTurrets</categoryDef>
-								<thingDefCountRange>
-									<min>0</min>
-									<max>0</max>
-								</thingDefCountRange>
-							</li>
-							<li Class="StockGenerator_Animals">
-								<tradeTagsSell>
-									<li>CE_AnimalBoom</li>
-								</tradeTagsSell>
-								<tradeTagsBuy>
-									<li>CE_AnimalBoom</li>
-								</tradeTagsBuy>
-								<kindCountRange>
-									<min>1</min>
-									<max>1</max>
-								</kindCountRange>
-								<countRange>
-									<min>-1</min>
-									<max>2</max>
-								</countRange>
-							</li>
-						</stockGenerators>
+						<li Class="StockGenerator_SingleDef">
+							<thingDef>FSX</thingDef>
+							<countRange>
+								<min>15</min>
+								<max>40</max>
+							</countRange>
+						</li>
+						<li Class="StockGenerator_SingleDef">
+							<thingDef>Prometheum</thingDef>
+							<countRange>
+								<min>15</min>
+								<max>40</max>
+							</countRange>
+						</li>
+						<li Class="StockGenerator_Tag">
+							<tradeTag>CE_Ammo</tradeTag>
+							<countRange>
+								<min>400</min>
+								<max>1000</max>
+							</countRange>
+							<price>Cheap</price>
+							<thingDefCountRange>
+								<min>3</min>
+								<max>8</max>
+							</thingDefCountRange>
+						</li>
+						<li Class="StockGenerator_Tag">
+							<tradeTag>CE_MediumAmmo</tradeTag>
+							<countRange>
+								<min>400</min>
+								<max>1000</max>
+							</countRange>
+							<price>Cheap</price>
+							<thingDefCountRange>
+								<min>3</min>
+								<max>8</max>
+							</thingDefCountRange>
+						</li>							
+						<li Class="StockGenerator_Tag">
+							<tradeTag>CE_HeavyAmmo</tradeTag>
+							<countRange>
+								<min>10</min>
+								<max>50</max>
+							</countRange>
+							<thingDefCountRange>
+								<min>2</min>
+								<max>5</max>
+							</thingDefCountRange>
+						</li>
+						<li Class="StockGenerator_Category">
+							<categoryDef>Ammo</categoryDef>
+							<thingDefCountRange>
+								<min>0</min>
+								<max>0</max>
+							</thingDefCountRange>
+						</li>
 					</value>
 				</li>
 
 				<!-- ======= Trader Caravan Base =======-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraderKindDef[ @Name="WW2CaravanTrader"]/stockGenerators</xpath>
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/TraderKindDef[@Name="WW2CaravanTrader"]/stockGenerators</xpath>
 					<value>
-						<stockGenerators>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>Silver</thingDef>
-								<countRange>750~1200</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>ComponentIndustrial</thingDef>
-								<countRange>5~20</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>Steel</thingDef>
-								<countRange>200~400</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>WoodLog</thingDef>
-								<countRange>100~200</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>Cloth</thingDef>
-								<countRange>200~400</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>Neutroamine</thingDef>
-								<countRange>50~100</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>Chemfuel</thingDef>
-								<countRange>50~150</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>MedicineIndustrial</thingDef>
-								<countRange>10~20</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>Chocolate</thingDef>
-								<countRange>-20~10</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>Beer</thingDef>
-								<countRange>-20~10</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>MealSurvivalPack</thingDef>
-								<countRange>5~20</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>FSX</thingDef>
-								<countRange>
-									<min>15</min>
-									<max>40</max>
-								</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>Prometheum</thingDef>
-								<countRange>
-									<min>15</min>
-									<max>40</max>
-								</countRange>
-							</li>
-							<li Class="StockGenerator_Tag">
-								<tradeTag>CE_Ammo</tradeTag>
-								<countRange>
-									<min>400</min>
-									<max>1000</max>
-								</countRange>
-								<price>Cheap</price>
-								<thingDefCountRange>
-									<min>3</min>
-									<max>8</max>
-								</thingDefCountRange>
-							</li>
-							<li Class="StockGenerator_Tag">
-								<tradeTag>CE_HeavyAmmo</tradeTag>
-								<countRange>
-									<min>10</min>
-									<max>50</max>
-								</countRange>
-								<thingDefCountRange>
-									<min>2</min>
-									<max>5</max>
-								</thingDefCountRange>
-							</li>
-							<li Class="StockGenerator_Category">
-								<categoryDef>Ammo</categoryDef>
-								<thingDefCountRange>
-									<min>0</min>
-									<max>0</max>
-								</thingDefCountRange>
-							</li>
-							<li Class="StockGenerator_Tag">
-								<tradeTag>CE_Turret</tradeTag>
-								<thingDefCountRange>
-									<min>-4</min>
-									<max>2</max>
-								</thingDefCountRange>
-								<countRange>
-									<min>1</min>
-									<max>1</max>
-								</countRange>
-							</li>
-							<li Class="StockGenerator_Category">
-								<categoryDef>WeaponsTurrets</categoryDef>
-								<thingDefCountRange>
-									<min>0</min>
-									<max>0</max>
-								</thingDefCountRange>
-							</li>
-							<li Class="StockGenerator_Animals">
-								<tradeTagsSell>
-									<li>CE_AnimalBoom</li>
-								</tradeTagsSell>
-								<tradeTagsBuy>
-									<li>CE_AnimalBoom</li>
-								</tradeTagsBuy>
-								<kindCountRange>
-									<min>1</min>
-									<max>1</max>
-								</kindCountRange>
-								<countRange>
-									<min>-1</min>
-									<max>2</max>
-								</countRange>
-							</li>
-						</stockGenerators>
-					</value>
-				</li>
+						<li Class="StockGenerator_SingleDef">
+							<thingDef>FSX</thingDef>
+							<countRange>
+								<min>15</min>
+								<max>40</max>
+							</countRange>
+						</li>
+						<li Class="StockGenerator_SingleDef">
+							<thingDef>Prometheum</thingDef>
+							<countRange>
+								<min>15</min>
+								<max>40</max>
+							</countRange>
+						</li>
+						<li Class="StockGenerator_Tag">
+							<tradeTag>CE_Ammo</tradeTag>
+							<countRange>
+								<min>400</min>
+								<max>1000</max>
+							</countRange>
+							<price>Cheap</price>
+							<thingDefCountRange>
+								<min>3</min>
+								<max>8</max>
+							</thingDefCountRange>
+						</li>
+						<li Class="StockGenerator_Tag">
+							<tradeTag>CE_MediumAmmo</tradeTag>
+							<countRange>
+								<min>10</min>
+								<max>50</max>
+							</countRange>
+							<thingDefCountRange>
+								<min>2</min>
+								<max>4</max>
+							</thingDefCountRange>
+						</li>
+						<li Class="StockGenerator_Tag">
+							<tradeTag>CE_HeavyAmmo</tradeTag>
+							<countRange>
+								<min>5</min>
+								<max>30</max>
+							</countRange>
+							<thingDefCountRange>
+								<min>2</min>
+								<max>6</max>
+							</thingDefCountRange>
+						</li>
+						<li Class="StockGenerator_Category">
+							<categoryDef>Ammo</categoryDef>
+							<thingDefCountRange>
+								<min>0</min>
+								<max>0</max>
+							</thingDefCountRange>
+						</li>
+						<li Class="StockGenerator_Tag">
+							<tradeTag>CE_Turret</tradeTag>
+							<thingDefCountRange>
+								<min>-4</min>
+								<max>2</max>
+							</thingDefCountRange>
+							<countRange>
+								<min>1</min>
+								<max>1</max>
+							</countRange>
+						</li>
+						<li Class="StockGenerator_Category">
+							<categoryDef>WeaponsTurrets</categoryDef>
+							<thingDefCountRange>
+								<min>0</min>
+								<max>0</max>
+							</thingDefCountRange>
+						</li>
+						<li Class="StockGenerator_Animals">
+							<tradeTagsSell>
+								<li>CE_AnimalBoom</li>
+							</tradeTagsSell>
+							<tradeTagsBuy>
+								<li>CE_AnimalBoom</li>
+							</tradeTagsBuy>
+							<kindCountRange>
+								<min>0</min>
+								<max>1</max>
+							</kindCountRange>
+							<countRange>
+								<min>-1</min>
+								<max>2</max>
+							</countRange>
+						</li>
+				</value>
+			</li>
 
-				<!-- ======= Trader Visitor Base =======-->
-				<li Class="PatchOperationReplace">
-					<xpath>Defs/TraderKindDef[ @Name="WW2VisitorTrader"]/stockGenerators</xpath>
-					<value>
-						<stockGenerators>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>Silver</thingDef>
-								<countRange>50~250</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>ComponentIndustrial</thingDef>
-								<countRange>2~5</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>MedicineIndustrial</thingDef>
-								<countRange>1~6</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>Chocolate</thingDef>
-								<countRange>-10~5</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>Beer</thingDef>
-								<countRange>-10~5</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>MealSurvivalPack</thingDef>
-								<countRange>3~6</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>FSX</thingDef>
-								<countRange>
-									<min>5</min>
-									<max>15</max>
-								</countRange>
-							</li>
-							<li Class="StockGenerator_SingleDef">
-								<thingDef>Prometheum</thingDef>
-								<countRange>
-									<min>5</min>
-									<max>15</max>
-								</countRange>
-							</li>
-							<li Class="StockGenerator_Tag">
-								<tradeTag>CE_Ammo</tradeTag>
-								<countRange>
-									<min>100</min>
-									<max>250</max>
-								</countRange>
-								<price>Cheap</price>
-								<thingDefCountRange>
-									<min>3</min>
-									<max>8</max>
-								</thingDefCountRange>
-							</li>
-							<li Class="StockGenerator_Tag">
-								<tradeTag>CE_HeavyAmmo</tradeTag>
-								<countRange>
-									<min>-5</min>
-									<max>2</max>
-								</countRange>
-								<thingDefCountRange>
-									<min>1</min>
-									<max>3</max>
-								</thingDefCountRange>
-							</li>
-							<li Class="StockGenerator_Category">
-								<categoryDef>Ammo</categoryDef>
-								<thingDefCountRange>
-									<min>0</min>
-									<max>0</max>
-								</thingDefCountRange>
-							</li>
-						</stockGenerators>
-					</value>
-				</li>
+			<!-- ======= Trader Visitor Base =======-->
+			<li Class="PatchOperationAdd">
+				<xpath>Defs/TraderKindDef[@Name="WW2VisitorTrader"]/stockGenerators</xpath>
+				<value>
+					<li Class="StockGenerator_SingleDef">
+						<thingDef>FSX</thingDef>
+						<countRange>
+							<min>0</min>
+							<max>15</max>
+						</countRange>
+					</li>
+					<li Class="StockGenerator_SingleDef">
+						<thingDef>Prometheum</thingDef>
+						<countRange>
+							<min>0</min>
+							<max>15</max>
+						</countRange>
+					</li>
+					<li Class="StockGenerator_Tag">
+						<tradeTag>CE_Ammo</tradeTag>
+						<countRange>
+							<min>100</min>
+							<max>250</max>
+						</countRange>
+						<thingDefCountRange>
+							<min>0</min>
+							<max>4</max>
+						</thingDefCountRange>
+					</li>
+					<li Class="StockGenerator_Category">
+						<categoryDef>Ammo</categoryDef>
+						<thingDefCountRange>
+							<min>0</min>
+							<max>0</max>
+						</thingDefCountRange>
+					</li>
+				</value>
+			</li>
 
 			</operations>
 		</match>