diff --git a/Defs/Ammo/AmmoBases.xml b/Defs/Ammo/AmmoBases.xml
index 0de1915bb4..bb21b09870 100644
--- a/Defs/Ammo/AmmoBases.xml
+++ b/Defs/Ammo/AmmoBases.xml
@@ -129,6 +129,13 @@
 		</skillRequirements>
 	</RecipeDef>
 
+	<RecipeDef Name="ArtilleryAmmoRecipeBase" ParentName="AmmoRecipeBase" Abstract="true">
+		<researchPrerequisite>Mortars</researchPrerequisite>
+		<skillRequirements>
+			<Crafting>4</Crafting>
+		</skillRequirements>
+	</RecipeDef>
+
 	<RecipeDef Name="LauncherAmmoRecipeBase" ParentName="AmmoRecipeBase" Abstract="true">
 		<researchPrerequisite>CE_Launchers</researchPrerequisite>
 		<skillRequirements>
@@ -136,6 +143,13 @@
 		</skillRequirements>
 	</RecipeDef>
 
+	<RecipeDef Name="CannonAmmoRecipeBase" ParentName="AmmoRecipeBase" Abstract="true">
+		<researchPrerequisite>CE_TurretHeavyWeapons</researchPrerequisite>
+		<skillRequirements>
+			<Crafting>4</Crafting>
+		</skillRequirements>
+	</RecipeDef>
+
 	<RecipeDef Name="ChargeAmmoRecipeBase" ParentName="AmmoRecipeBase" Abstract="true">
 		<researchPrerequisite>ChargedShot</researchPrerequisite>
 		<skillRequirements>
diff --git a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_General.xml b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_General.xml
index eb461b6361..06f9f8b75a 100644
--- a/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_General.xml
+++ b/Defs/Ammo/AmmoCategoryDefs/AmmoCategories_General.xml
@@ -27,6 +27,7 @@
 		<label>armor-piercing discarding sabot</label>
 		<labelShort>Sabot</labelShort>
 		<description>Uses a discarding sabot to fire an undersized projectile at higher muzzle velocities, greatly improving armor penetration.</description>
+		<advanced>true</advanced>
 	</CombatExtended.AmmoCategoryDef>
 
 	<CombatExtended.AmmoCategoryDef>
@@ -34,6 +35,7 @@
 		<label>armor-piercing incendiary</label>
 		<labelShort>AP-I</labelShort>
 		<description>Filled with an incendiary compound that ignites on impact, doing additional damage and increasing armor penetration.</description>
+		<advanced>true</advanced>
 	</CombatExtended.AmmoCategoryDef>
 
 	<CombatExtended.AmmoCategoryDef>
@@ -44,6 +46,14 @@
 		<advanced>true</advanced>
 	</CombatExtended.AmmoCategoryDef>
 
+	<CombatExtended.AmmoCategoryDef>
+		<defName>CompositeRigidAP</defName>
+		<label>armor-piercing composite-rigid</label>
+		<labelShort>APCR</labelShort>
+		<description>Featuring a core of high-density hard material surrounded by a full-bore shell of a lighter material to reach higher muzzle velocities, greatly increasing armor penetration.</description>
+		<advanced>true</advanced>
+	</CombatExtended.AmmoCategoryDef>
+
 	<CombatExtended.AmmoCategoryDef>
 		<defName>TranqNonLethal</defName>
 		<label>tranquilizer</label>
diff --git a/Defs/Ammo/Generic/Shell_Cannon.xml b/Defs/Ammo/Generic/Shell_Cannon.xml
index 99e41f277b..d7fc745972 100644
--- a/Defs/Ammo/Generic/Shell_Cannon.xml
+++ b/Defs/Ammo/Generic/Shell_Cannon.xml
@@ -40,7 +40,9 @@
 		<ammoTypes>
 			<Ammo_HeavyCannonShell_HEAT>Bullet_90mmCannonShell_HEAT</Ammo_HeavyCannonShell_HEAT>
 			<Ammo_HeavyCannonShell_HE>Bullet_90mmCannonShell_HE</Ammo_HeavyCannonShell_HE>
+			<Ammo_HeavyCannonShell_AP>Bullet_90mmCannonShell_AP</Ammo_HeavyCannonShell_AP>
 			<Ammo_HeavyCannonShell_HE_TFuzed>Bullet_90mmCannonShell_HE_TFuzed</Ammo_HeavyCannonShell_HE_TFuzed>
+			<Ammo_HeavyCannonShell_APCR>Bullet_90mmCannonShell_APCR</Ammo_HeavyCannonShell_APCR>
 			<Ammo_HeavyCannonShell_EMP>Bullet_90mmCannonShell_EMP</Ammo_HeavyCannonShell_EMP>
 		</ammoTypes>
 	</CombatExtended.AmmoSetDef>
@@ -136,7 +138,7 @@
 		</tradeTags>
 		<statBases>
 			<MaxHitPoints>200</MaxHitPoints>
-			<Mass>19</Mass>
+			<Mass>18</Mass>
 			<Bulk>22.41</Bulk>
 		</statBases>
 		<cookOffFlashScale>30</cookOffFlashScale>
@@ -152,14 +154,28 @@
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
-			<Mass>15.8</Mass>
-			<MarketValue>89</MarketValue>
+			<Mass>19.5</Mass>
+			<MarketValue>103.28</MarketValue>
 		</statBases>
 		<ammoClass>RocketHEAT</ammoClass>
 		<detonateProjectile>Bullet_90mmCannonShell_HEAT</detonateProjectile>
 	</ThingDef>
 
-	<ThingDef Class="CombatExtended.AmmoDef" ParentName="HeavyCannonShellBase">
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="90mmCannonShellBase">
+		<defName>Ammo_HeavyCannonShell_AP</defName>
+		<label>heavy cannon shell (AP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Cannon/Tank/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>72</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<detonateProjectile>Bullet_90mmCannonShell_AP</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="90mmCannonShellBase">
 		<defName>Ammo_HeavyCannonShell_HE</defName>
 		<label>heavy cannon shell (HE)</label>
 		<graphicData>
@@ -167,13 +183,13 @@
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>104.83</MarketValue>
+			<MarketValue>100.07</MarketValue>
 		</statBases>
 		<ammoClass>GrenadeHE</ammoClass>
 		<detonateProjectile>Bullet_90mmCannonShell_HE</detonateProjectile>
 	</ThingDef>
 
-	<ThingDef Class="CombatExtended.AmmoDef" ParentName="HeavyCannonShellBase">
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="90mmCannonShellBase">
 		<defName>Ammo_HeavyCannonShell_HE_TFuzed</defName>
 		<label>heavy cannon shell (HE Time-Fuzed)</label>
 		<graphicData>
@@ -181,13 +197,28 @@
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>124.33</MarketValue>
+			<MarketValue>119.57</MarketValue>
 		</statBases>
 		<ammoClass>GrenadeHETF</ammoClass>
 		<detonateProjectile>Bullet_90mmCannonShell_HE</detonateProjectile>
 	</ThingDef>
 
-	<ThingDef Class="CombatExtended.AmmoDef" ParentName="HeavyCannonShellBase">
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="90mmCannonShellBase">
+		<defName>Ammo_HeavyCannonShell_APCR</defName>
+		<label>heavy cannon shell (APCR)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Cannon/Tank/APCR</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<Mass>13.3</Mass>
+			<MarketValue>84.09</MarketValue>
+		</statBases>
+		<ammoClass>Sabot</ammoClass>
+		<detonateProjectile>Bullet_90mmCannonShell_APCR</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="90mmCannonShellBase">
 		<defName>Ammo_HeavyCannonShell_EMP</defName>
 		<label>heavy cannon shell (EMP)</label>
 		<graphicData>
@@ -195,7 +226,7 @@
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>160.66</MarketValue>
+			<MarketValue>155.9</MarketValue>
 		</statBases>
 		<ammoClass>GrenadeEMP</ammoClass>
 		<detonateProjectile>Bullet_90mmCannonShell_EMP</detonateProjectile>
@@ -205,11 +236,12 @@
 
 	<!-- Light Shells -->
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_LightCannonShell_AP</defName>
 		<label>make light cannon (AP) shell x25</label>
 		<description>Craft 25 light cannon (AP) shells.</description>
 		<jobString>Making light cannon (AP) shells.</jobString>
+		<workAmount>15120</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -228,17 +260,14 @@
 		<products>
 			<Ammo_LightCannonShell_AP>25</Ammo_LightCannonShell_AP>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>15120</workAmount>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_LightCannonShell_HE</defName>
 		<label>make light cannon (HE) shell x25</label>
 		<description>Craft 25 light cannon (HE) shells.</description>
 		<jobString>Making light cannon (HE) shells.</jobString>
+		<workAmount>18600</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -275,18 +304,19 @@
 		<products>
 			<Ammo_LightCannonShell_HE>25</Ammo_LightCannonShell_HE>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>18600</workAmount>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_LightCannonShell_HE_TFuzed</defName>
-		<label>make light cannon Time-Fuzed shell x25</label>
-		<description>Craft 25 light cannon Time-Fuzed shells.</description>
-		<jobString>Making light cannon Time-Fuzed shells.</jobString>
-		<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
+		<label>make light cannon (Time-Fuzed) shell x25</label>
+		<description>Craft 25 light cannon (Time-Fuzed) shells.</description>
+		<jobString>Making light cannon (Time-Fuzed) shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>CE_AdvancedLaunchers</li>
+		</researchPrerequisites>
+		<workAmount>20400</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -323,17 +353,19 @@
 		<products>
 			<Ammo_LightCannonShell_HE_TFuzed>25</Ammo_LightCannonShell_HE_TFuzed>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>20400</workAmount>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_LightCannonShell_Sabot</defName>
 		<label>make light cannon (Sabot) shell x25</label>
 		<description>Craft 25 light cannon (Sabot) shells.</description>
 		<jobString>Making light cannon (Sabot) shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>CE_AdvancedAmmo</li>
+		</researchPrerequisites>
+		<workAmount>16200</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -370,20 +402,21 @@
 		<products>
 			<Ammo_LightCannonShell_Sabot>25</Ammo_LightCannonShell_Sabot>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>16200</workAmount>
 	</RecipeDef>
 
 	<!-- Heavy Shells -->
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_HeavyCannonShell_HEAT</defName>
-		<label>make heavy HEAT cannon shells x5</label>
-		<description>Craft 5 heavy HEAT cannon shells.</description>
-		<jobString>Making heavy HEAT cannon shells.</jobString>
-		<workAmount>20400</workAmount>
+		<label>make heavy (HEAT) cannon shells x5</label>
+		<description>Craft 5 heavy (HEAT) cannon shells.</description>
+		<jobString>Making heavy (HEAT) cannon shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>CE_Launchers</li>
+		</researchPrerequisites>
+		<workAmount>24000</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -391,7 +424,7 @@
 						<li>Steel</li>
 					</thingDefs>
 				</filter>
-				<count>160</count>
+				<count>196</count>
 			</li>
 			<li>
 				<filter>
@@ -420,17 +453,40 @@
 		<products>
 			<Ammo_HeavyCannonShell_HEAT>5</Ammo_HeavyCannonShell_HEAT>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
+		<defName>MakeAmmo_HeavyCannonShell_AP</defName>
+		<label>make heavy (AP) cannon shells x5</label>
+		<description>Craft 5 heavy (AP) cannon shells.</description>
+		<jobString>Making heavy (AP) cannon shells.</jobString>
+		<workAmount>21600</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>180</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_HeavyCannonShell_AP>5</Ammo_HeavyCannonShell_AP>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_HeavyCannonShell_HE</defName>
-		<label>make heavy HE cannon shells x5</label>
-		<description>Craft 5 heavy HE cannon shells.</description>
-		<jobString>Making heavy HE cannon shells.</jobString>
-		<workAmount>24400</workAmount>
+		<label>make heavy (HE) cannon shells x5</label>
+		<description>Craft 5 heavy (HE) cannon shells.</description>
+		<jobString>Making heavy (HE) cannon shells.</jobString>
+		<workAmount>23200</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -438,7 +494,7 @@
 						<li>Steel</li>
 					</thingDefs>
 				</filter>
-				<count>192</count>
+				<count>180</count>
 			</li>
 			<li>
 				<filter>
@@ -467,18 +523,19 @@
 		<products>
 			<Ammo_HeavyCannonShell_HE>5</Ammo_HeavyCannonShell_HE>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_HeavyCannonShell_HE_TFuzed</defName>
-		<label>make heavy HE Time-Fuzed cannon shells x5</label>
-		<description>Craft 5 heavy HE Time-Fuzed cannon shells.</description>
-		<jobString>Making heavy HE Time-Fuzed cannon shells.</jobString>
-		<workAmount>26400</workAmount>
-		<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
+		<label>make heavy (Time-Fuzed) cannon shells x5</label>
+		<description>Craft 5 heavy (Time-Fuzed) cannon shells.</description>
+		<jobString>Making heavy (Time-Fuzed) cannon shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>CE_AdvancedLaunchers</li>
+		</researchPrerequisites>
+		<workAmount>25000</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -486,7 +543,7 @@
 						<li>Steel</li>
 					</thingDefs>
 				</filter>
-				<count>192</count>
+				<count>180</count>
 			</li>
 			<li>
 				<filter>
@@ -515,18 +572,68 @@
 		<products>
 			<Ammo_HeavyCannonShell_HE_TFuzed>5</Ammo_HeavyCannonShell_HE_TFuzed>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
+		<defName>MakeAmmo_HeavyCannonShell_APCR</defName>
+		<label>make heavy (APCR) cannon shells x5</label>
+		<description>Craft 5 heavy (APCR) cannon shells.</description>
+		<jobString>Making heavy (APCR) cannon shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>CE_AdvancedAmmo</li>
+		</researchPrerequisites>
+		<workAmount>26200</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>70</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>32</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>32</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+				<li>Chemfuel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_HeavyCannonShell_APCR>5</Ammo_HeavyCannonShell_APCR>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_HeavyCannonShell_EMP</defName>
 		<label>make heavy EMP cannon shells x5</label>
 		<description>Craft 5 heavy EMP cannon shells.</description>
 		<jobString>Making heavy EMP cannon shells.</jobString>
-		<researchPrerequisite>MicroelectronicsBasics</researchPrerequisite>
-		<workAmount>27000</workAmount>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>MicroelectronicsBasics</li>
+		</researchPrerequisites>
+		<workAmount>25800</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -534,7 +641,7 @@
 						<li>Steel</li>
 					</thingDefs>
 				</filter>
-				<count>192</count>
+				<count>180</count>
 			</li>
 			<li>
 				<filter>
@@ -554,9 +661,6 @@
 		<products>
 			<Ammo_HeavyCannonShell_EMP>5</Ammo_HeavyCannonShell_EMP>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
 </Defs>
\ No newline at end of file
diff --git a/Defs/Ammo/Medieval/CannonBall.xml b/Defs/Ammo/Medieval/CannonBall.xml
index dad97c29cd..99c44fba0a 100644
--- a/Defs/Ammo/Medieval/CannonBall.xml
+++ b/Defs/Ammo/Medieval/CannonBall.xml
@@ -110,6 +110,21 @@
 			<MarketValue>26.18</MarketValue>
 		</statBases>
 		<ammoClass>Grapeshot</ammoClass>
+		<comps>
+			<li Class="CompProperties_Explosive">
+				<damageAmountBase>25</damageAmountBase>
+				<explosiveRadius>1.0</explosiveRadius>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveExpandPerStackcount>0.033</explosiveExpandPerStackcount>
+				<startWickOnDamageTaken>
+					<li>Bomb</li>
+				</startWickOnDamageTaken>
+				<startWickHitPointsPercent>0.5</startWickHitPointsPercent>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<explodeOnKilled>True</explodeOnKilled>
+				<wickTicks>90~120</wickTicks>
+			</li>
+		</comps>
 	</ThingDef>
 
 	<!-- ================== Projectiles ================== -->
@@ -180,20 +195,20 @@
 		</projectile>
 	</ThingDef>
 
-	<!-- Different parent, because it doesn't work with 'BaseCannonBall' for some reason. -->
-	<ThingDef ParentName="Base12GaugeChargedBullet">
+	<ThingDef ParentName="BaseBulletCE">
 		<defName>Bullet_CannonBall_Grape</defName>
 		<label>grape shot</label>
 		<graphicData>
 			<texPath>Things/Projectile/Bullet_Big</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
-			<drawSize>1,1</drawSize>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>99</speed>
 			<damageAmountBase>63</damageAmountBase>
+			<pelletCount>27</pelletCount>
 			<armorPenetrationSharp>8.5</armorPenetrationSharp>
 			<armorPenetrationBlunt>420.68</armorPenetrationBlunt>
-			<pelletCount>27</pelletCount>
 			<spreadMult>26.7</spreadMult>
 		</projectile>
 	</ThingDef>
diff --git a/Defs/Ammo/Medieval/MiniCannonBall.xml b/Defs/Ammo/Medieval/MiniCannonBall.xml
index b1404a403d..5c7a36b9bc 100644
--- a/Defs/Ammo/Medieval/MiniCannonBall.xml
+++ b/Defs/Ammo/Medieval/MiniCannonBall.xml
@@ -68,6 +68,21 @@
 			<MarketValue>1.12</MarketValue>
 		</statBases>
 		<ammoClass>Grapeshot</ammoClass>
+		<comps>
+			<li Class="CompProperties_Explosive">
+				<damageAmountBase>15</damageAmountBase>
+				<explosiveRadius>0.9</explosiveRadius>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveExpandPerStackcount>0.033</explosiveExpandPerStackcount>
+				<startWickOnDamageTaken>
+					<li>Bomb</li>
+				</startWickOnDamageTaken>
+				<startWickHitPointsPercent>0.5</startWickHitPointsPercent>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<explodeOnKilled>True</explodeOnKilled>
+				<wickTicks>90~120</wickTicks>
+			</li>
+		</comps>
 	</ThingDef>
 
 	<!-- ================== Projectiles ================== -->
@@ -99,19 +114,20 @@
 		</projectile>
 	</ThingDef>
 
-	<ThingDef ParentName="Base12GaugeChargedBullet">
+	<ThingDef ParentName="BaseBulletCE">
 		<defName>Bullet_MiniCannonBall_Grape</defName>
 		<label>mini grape shot</label>
 		<graphicData>
-			<texPath>Things/Projectile/Bullet_Big</texPath>
+			<texPath>Things/Projectile/Bullet_Small</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
-			<drawSize>1,1</drawSize>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<speed>73</speed>
 			<damageAmountBase>15</damageAmountBase>
+			<pelletCount>10</pelletCount>
 			<armorPenetrationSharp>3</armorPenetrationSharp>
 			<armorPenetrationBlunt>20.7</armorPenetrationBlunt>
-			<pelletCount>10</pelletCount>
 			<spreadMult>17.8</spreadMult>
 		</projectile>
 	</ThingDef>
diff --git a/Defs/Ammo/Rocket/130mmType63.xml b/Defs/Ammo/Rocket/130mmType63.xml
index 7542b85279..04731b0a57 100644
--- a/Defs/Ammo/Rocket/130mmType63.xml
+++ b/Defs/Ammo/Rocket/130mmType63.xml
@@ -133,9 +133,9 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_130mmType63_HE</defName>
-		<label>make 130mm Type63 HE rockets x5</label>
-		<description>Craft 5 130mm Type63 HE rockets.</description>
-		<jobString>Making 130mm Type63 HE rockets.</jobString>
+		<label>make 130mm Type63 (HE) rockets x5</label>
+		<description>Craft 5 130mm Type63 (HE) rockets.</description>
+		<jobString>Making 130mm Type63 (HE) rockets.</jobString>
 		<workAmount>44600</workAmount>
 		<ingredients>
 			<li>
diff --git a/Defs/Ammo/Rocket/132mmM13.xml b/Defs/Ammo/Rocket/132mmM13.xml
index bbb12c0f6f..92265a04c5 100644
--- a/Defs/Ammo/Rocket/132mmM13.xml
+++ b/Defs/Ammo/Rocket/132mmM13.xml
@@ -118,9 +118,9 @@
 
 	<RecipeDef ParentName="AmmoRecipeBase">
 		<defName>MakeAmmo_132mmM13_HE</defName>
-		<label>make 4x 132mm M13 HE rocket</label>
-		<description>Craft 4x 132mm M13 HE rockets.</description>
-		<jobString>Making 132mm M13 HE rockets.</jobString>
+		<label>make 4x 132mm M13 (HE) rocket</label>
+		<description>Craft 4x 132mm M13 (HE) rockets.</description>
+		<jobString>Making 132mm M13 (HE) rockets.</jobString>
 		<workAmount>48400</workAmount>
 		<ingredients>
 			<li>
diff --git a/Defs/Ammo/Rocket/20mmFliegerfaust.xml b/Defs/Ammo/Rocket/20mmFliegerfaust.xml
index 2abc9a605d..0e14321f7a 100644
--- a/Defs/Ammo/Rocket/20mmFliegerfaust.xml
+++ b/Defs/Ammo/Rocket/20mmFliegerfaust.xml
@@ -120,9 +120,9 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_20mmFliegerfaust_HE</defName>
-		<label>make 20mmFliegerfaust HE rockets x10</label>
-		<description>Craft 10 20mmFliegerfaust HE rockets.</description>
-		<jobString>Making 20mmFliegerfaust HE rockets.</jobString>
+		<label>make 20mmFliegerfaust (HE) rockets x10</label>
+		<description>Craft 10 20mmFliegerfaust (HE) rockets.</description>
+		<jobString>Making 20mmFliegerfaust (HE) rockets.</jobString>
 		<workAmount>3200</workAmount>
 		<ingredients>
 			<li>
diff --git a/Defs/Ammo/Rocket/50mmRocket.xml b/Defs/Ammo/Rocket/50mmRocket.xml
index 053669864f..628834768a 100644
--- a/Defs/Ammo/Rocket/50mmRocket.xml
+++ b/Defs/Ammo/Rocket/50mmRocket.xml
@@ -126,9 +126,9 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_50mmRocket_HE</defName>
-		<label>make 50mm HE rockets x10</label>
-		<description>Craft 10 50mm HE rockets.</description>
-		<jobString>Making 50mm HE rockets.</jobString>
+		<label>make 50mm (HE) rockets x10</label>
+		<description>Craft 10 50mm (HE) rockets.</description>
+		<jobString>Making 50mm (HE) rockets.</jobString>
 		<workAmount>11000</workAmount>
 		<ingredients>
 			<li>
diff --git a/Defs/Ammo/Rocket/57mmS5Rocket.xml b/Defs/Ammo/Rocket/57mmS5Rocket.xml
index beb399071a..920fe07dfd 100644
--- a/Defs/Ammo/Rocket/57mmS5Rocket.xml
+++ b/Defs/Ammo/Rocket/57mmS5Rocket.xml
@@ -327,9 +327,10 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_57mmRocket_HE</defName>
-		<label>make 57mm HE rockets x5</label>
-		<description>Craft 5 57mm HE rockets.</description>
-		<jobString>Making 57mm HE rockets.</jobString>
+		<label>make 57mm (HE) rockets x5</label>
+		<description>Craft 5 57mm (HE) rockets.</description>
+		<jobString>Making 57mm (HE) rockets.</jobString>
+		<workAmount>13000</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -366,14 +367,14 @@
 		<products>
 			<Ammo_57mmRocket_HE>5</Ammo_57mmRocket_HE>
 		</products>
-		<workAmount>13000</workAmount>
 	</RecipeDef>
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_57mmRocket_HEAT</defName>
-		<label>make 57mm HEAT rockets x5</label>
-		<description>Craft 5 57mm HEAT rockets.</description>
-		<jobString>Making 57mm HEAT rockets.</jobString>
+		<label>make 57mm (HEAT) rockets x5</label>
+		<description>Craft 5 57mm (HEAT) rockets.</description>
+		<jobString>Making 57mm (HEAT) rockets.</jobString>
+		<workAmount>8600</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -410,14 +411,14 @@
 		<products>
 			<Ammo_57mmRocket_HEAT>5</Ammo_57mmRocket_HEAT>
 		</products>
-		<workAmount>8600</workAmount>
 	</RecipeDef>
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_57mmRocket_Thermobaric</defName>
-		<label>make 57mm thermobaric rockets x5</label>
-		<description>Craft 5 57mm thermobaric rockets.</description>
-		<jobString>Making 57mm thermobaric rockets.</jobString>
+		<label>make 57mm (Thermobaric) rockets x5</label>
+		<description>Craft 5 57mm (Thermobaric) rockets.</description>
+		<jobString>Making 57mm (Thermobaric) rockets.</jobString>
+		<workAmount>14000</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -454,7 +455,6 @@
 		<products>
 			<Ammo_57mmRocket_Thermobaric>5</Ammo_57mmRocket_Thermobaric>
 		</products>
-		<workAmount>14000</workAmount>
 	</RecipeDef>
 
 </Defs>
\ No newline at end of file
diff --git a/Defs/Ammo/Rocket/70mmAPKWS.xml b/Defs/Ammo/Rocket/70mmAPKWS.xml
index 29aa00f2a2..7925231294 100644
--- a/Defs/Ammo/Rocket/70mmAPKWS.xml
+++ b/Defs/Ammo/Rocket/70mmAPKWS.xml
@@ -134,9 +134,9 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_70mmAPKWS_HEAT</defName>
-		<label>make 70mm APKWS HEAT rockets x5</label>
-		<description>Craft 70mm APKWS HEAT rockets.</description>
-		<jobString>Making 70mm APKWS HEAT rockets.</jobString>
+		<label>make 70mm APKWS (HEAT) rockets x5</label>
+		<description>Craft 70mm APKWS (HEAT) rockets.</description>
+		<jobString>Making 70mm APKWS (HEAT) rockets.</jobString>
 		<workAmount>21400</workAmount>
 		<ingredients>
 			<li>
diff --git a/Defs/Ammo/Rocket/83mmSMAW.xml b/Defs/Ammo/Rocket/83mmSMAW.xml
index b92310dc98..4c5b7e0871 100644
--- a/Defs/Ammo/Rocket/83mmSMAW.xml
+++ b/Defs/Ammo/Rocket/83mmSMAW.xml
@@ -201,9 +201,9 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_83mmSMAW_HEAT</defName>
-		<label>make 83mm SMAW HEAT rockets x5</label>
-		<description>Craft 5 83mm SMAW HEAT rockets.</description>
-		<jobString>Making 83mm SMAW HEAT rockets.</jobString>
+		<label>make 83mm SMAW (HEAT) rockets x5</label>
+		<description>Craft 5 83mm SMAW (HEAT) rockets.</description>
+		<jobString>Making 83mm SMAW (HEAT) rockets.</jobString>
 		<workAmount>12000</workAmount>
 		<ingredients>
 			<li>
@@ -245,9 +245,9 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_83mmSMAW_HE</defName>
-		<label>make 83mm SMAW HE rockets x5</label>
-		<description>Craft 5 83mm SMAW HE rockets.</description>
-		<jobString>Making 83mm SMAW HE rockets.</jobString>
+		<label>make 83mm SMAW (HE) rockets x5</label>
+		<description>Craft 5 83mm SMAW (HE) rockets.</description>
+		<jobString>Making 83mm SMAW (HE) rockets.</jobString>
 		<workAmount>12400</workAmount>
 		<ingredients>
 			<li>
@@ -289,9 +289,9 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_83mmSMAW_Thermobaric</defName>
-		<label>make 83mm SMAW Thermobaric rockets x5</label>
-		<description>Craft 5 83mm SMAW Thermobaric rockets.</description>
-		<jobString>Making 83mm SMAW Thermobaric rockets.</jobString>
+		<label>make 83mm SMAW (Thermobaric) rockets x5</label>
+		<description>Craft 5 83mm SMAW (Thermobaric) rockets.</description>
+		<jobString>Making 83mm SMAW (Thermobaric) rockets.</jobString>
 		<workAmount>21800</workAmount>
 		<ingredients>
 			<li>
diff --git a/Defs/Ammo/Rocket/88mmRPzB.xml b/Defs/Ammo/Rocket/88mmRPzB.xml
index 0c86f9cf6e..b4b3f4e4b4 100644
--- a/Defs/Ammo/Rocket/88mmRPzB.xml
+++ b/Defs/Ammo/Rocket/88mmRPzB.xml
@@ -126,9 +126,9 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_88mmRPzB_HEAT</defName>
-		<label>make 88mm RPzB HEAT rockets x5</label>
-		<description>Craft 5 88mm RPzB HEAT rockets.</description>
-		<jobString>Making 88mm RPzB HEAT rockets.</jobString>
+		<label>make 88mm RPzB (HEAT) rockets x5</label>
+		<description>Craft 5 88mm RPzB (HEAT) rockets.</description>
+		<jobString>Making 88mm RPzB (HEAT) rockets.</jobString>
 		<workAmount>8000</workAmount>
 		<ingredients>
 			<li>
diff --git a/Defs/Ammo/Rocket/90mmRecoilless.xml b/Defs/Ammo/Rocket/90mmRecoilless.xml
index 9bdd1d5449..db388dcffc 100644
--- a/Defs/Ammo/Rocket/90mmRecoilless.xml
+++ b/Defs/Ammo/Rocket/90mmRecoilless.xml
@@ -40,7 +40,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base90mmRecoillessAmmo">
 		<defName>Ammo_90mmRCR_HEAT</defName>
-		<label>90mm recoilless rifle round (HEAT)</label>
+		<label>90mm recoilless cartridge (HEAT)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Rocket/90mmHEAT</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -56,18 +56,32 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base90mmRecoillessAmmo">
 		<defName>Ammo_90mmRCR_CAN</defName>
-		<label>90mm recoilless rifle round (CAN)</label>
+		<label>90mm recoilless cartridge (CAN)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Rocket/90mmCanister</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>25.7</MarketValue>
-			<Mass>3.08</Mass>
+			<MarketValue>24.9</MarketValue>
+			<Mass>2.78</Mass>
 			<Bulk>9.3</Bulk>
 		</statBases>
-		<ammoClass>Grapeshot</ammoClass>
-		<detonateProjectile>Bullet_90mmRCR_CAN</detonateProjectile>
+		<ammoClass>BuckShot</ammoClass>
+		<comps>
+			<li Class="CompProperties_Explosive">
+				<damageAmountBase>25</damageAmountBase>
+				<explosiveRadius>1.0</explosiveRadius>
+				<explosiveDamageType>Bomb</explosiveDamageType>
+				<explosiveExpandPerStackcount>0.033</explosiveExpandPerStackcount>
+				<startWickOnDamageTaken>
+					<li>Bomb</li>
+				</startWickOnDamageTaken>
+				<startWickHitPointsPercent>0.5</startWickHitPointsPercent>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+				<explodeOnKilled>True</explodeOnKilled>
+				<wickTicks>90~120</wickTicks>
+			</li>
+		</comps>
 	</ThingDef>
 
 	<!-- ================== Projectiles ================== -->
@@ -139,22 +153,23 @@
 		</comps>
 	</ThingDef>
 
-	<ThingDef ParentName="Base12GaugeBullet">
+	<ThingDef ParentName="BaseBulletCE">
 		<defName>Bullet_90mmRCR_CAN</defName>
 		<label>Flechette</label>
 		<graphicData>
-			<texPath>Things/Projectile/Shotgun_Pellet</texPath>
+			<texPath>Things/Projectile/Bullet_Small</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
 			<speed>87</speed>
-			<damageAmountBase>27</damageAmountBase>
-			<pelletCount>120</pelletCount>
-			<!-- Originally 2400 flechettes are present, changed to 120 buffed projectile -->
+			<damageAmountBase>31</damageAmountBase>
+			<pelletCount>60</pelletCount>
+			<!-- Originally 2400 flechettes are present, changed to 60 buffed projectile -->
 			<armorPenetrationSharp>5</armorPenetrationSharp>
-			<armorPenetrationBlunt>14.52</armorPenetrationBlunt>
-			<spreadMult>35.6</spreadMult>
-			<!-- x4 the normal spread -->
+			<armorPenetrationBlunt>21.78</armorPenetrationBlunt>
+			<spreadMult>26.7</spreadMult>
+			<!-- x3 the normal spread -->
 		</projectile>
 	</ThingDef>
 
@@ -162,9 +177,9 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_90mmRCR_HEAT</defName>
-		<label>make 90mm recoilless HEAT rockets x5</label>
-		<description>Craft 5 90mm recoilless HEAT rockets.</description>
-		<jobString>Making 90mm recoilless HEAT rockets.</jobString>
+		<label>make 90mm recoilless (HEAT) rockets x5</label>
+		<description>Craft 5 90mm recoilless (HEAT) rockets.</description>
+		<jobString>Making 90mm recoilless (HEAT) rockets.</jobString>
 		<workAmount>9200</workAmount>
 		<ingredients>
 			<li>
@@ -206,10 +221,10 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_90mmRCR_CAN</defName>
-		<label>Make 90mm recoilless canister shells x5</label>
-		<description>Craft 90mm recoilless canister shells.</description>
-		<jobString>Making 90mm recoilless canister shells.</jobString>
-		<workAmount>7400</workAmount>
+		<label>Make 90mm recoilless (Canister) shells x5</label>
+		<description>Craft 90mm recoilless (Canister) shells.</description>
+		<jobString>Making 90mm recoilless (Canister) shells.</jobString>
+		<workAmount>4200</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -217,7 +232,7 @@
 						<li>Steel</li>
 					</thingDefs>
 				</filter>
-				<count>32</count>
+				<count>30</count>
 			</li>
 			<li>
 				<filter>
diff --git a/Defs/Ammo/Rocket/M6.xml b/Defs/Ammo/Rocket/M6.xml
index 506598110f..33669c1eea 100644
--- a/Defs/Ammo/Rocket/M6.xml
+++ b/Defs/Ammo/Rocket/M6.xml
@@ -129,9 +129,9 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_M6_HEAT</defName>
-		<label>make M6 HEAT rockets x5</label>
-		<description>Craft 5 M6 HEAT rockets.</description>
-		<jobString>Making M6 HEAT rockets.</jobString>
+		<label>make M6 (HEAT) rockets x5</label>
+		<description>Craft 5 M6 (HEAT) rockets.</description>
+		<jobString>Making M6 (HEAT) rockets.</jobString>
 		<workAmount>7800</workAmount>
 		<ingredients>
 			<li>
diff --git a/Defs/Ammo/Rocket/M6A1.xml b/Defs/Ammo/Rocket/M6A1.xml
index 62178c2d97..db927b84c4 100644
--- a/Defs/Ammo/Rocket/M6A1.xml
+++ b/Defs/Ammo/Rocket/M6A1.xml
@@ -118,9 +118,9 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_M6A1_HEAT</defName>
-		<label>make M6A1 HEAT rockets x5</label>
-		<description>Craft 5 M6A1 HEAT rockets.</description>
-		<jobString>Making M6A1 HEAT rockets.</jobString>
+		<label>make M6A1 (HEAT) rockets x5</label>
+		<description>Craft 5 M6A1 (HEAT) rockets.</description>
+		<jobString>Making M6A1 (HEAT) rockets.</jobString>
 		<workAmount>7800</workAmount>
 		<ingredients>
 			<li>
diff --git a/Defs/Ammo/Rocket/M6A3.xml b/Defs/Ammo/Rocket/M6A3.xml
index ca4ff1e49f..0423b77371 100644
--- a/Defs/Ammo/Rocket/M6A3.xml
+++ b/Defs/Ammo/Rocket/M6A3.xml
@@ -183,9 +183,9 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_M6A3_HEAT</defName>
-		<label>make M6A3 HEAT rockets x5</label>
-		<description>Craft 5 M6A3 HEAT rockets.</description>
-		<jobString>Making M6A3 HEAT rockets.</jobString>
+		<label>make M6A3 (HEAT) rockets x5</label>
+		<description>Craft 5 M6A3 (HEAT) rockets.</description>
+		<jobString>Making M6A3 (HEAT) rockets.</jobString>
 		<workAmount>7800</workAmount>
 		<ingredients>
 			<li>
@@ -227,9 +227,9 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_M6A3_Incendiary</defName>
-		<label>make M6A3 Incendiary rockets x5</label>
-		<description>Craft 5 M6A3 Incendiary rockets.</description>
-		<jobString>Making M6A3 Incendiary rockets.</jobString>
+		<label>make M6A3 (Incendiary) rockets x5</label>
+		<description>Craft 5 M6A3 (Incendiary) rockets.</description>
+		<jobString>Making M6A3 (Incendiary) rockets.</jobString>
 		<workAmount>5800</workAmount>
 		<ingredients>
 			<li>
diff --git a/Defs/Ammo/Rocket/M74.xml b/Defs/Ammo/Rocket/M74.xml
index ac96ff31ae..69122628ef 100644
--- a/Defs/Ammo/Rocket/M74.xml
+++ b/Defs/Ammo/Rocket/M74.xml
@@ -125,9 +125,9 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_M74_Incendiary</defName>
-		<label>make M74 Incendiary rockets x4</label>
-		<description>Craft 4 M74 Incendiary rockets.</description>
-		<jobString>Making M74 Incendiary rockets.</jobString>
+		<label>make M74 (Incendiary) rockets x4</label>
+		<description>Craft 4 M74 (Incendiary) rockets.</description>
+		<jobString>Making M74 (Incendiary) rockets.</jobString>
 		<workAmount>5200</workAmount>
 		<ingredients>
 			<li>
diff --git a/Defs/Ammo/Rocket/RPG32.xml b/Defs/Ammo/Rocket/RPG32.xml
index 73238c006b..b0c653a20b 100644
--- a/Defs/Ammo/Rocket/RPG32.xml
+++ b/Defs/Ammo/Rocket/RPG32.xml
@@ -157,9 +157,9 @@
 
 	<RecipeDef ParentName="AmmoRecipeBase">
 		<defName>MakeAmmo_RPG32Rocket_HEAT</defName>
-		<label>make RPG-32 HEAT rockets x5</label>
-		<description>Craft 5 RPG-32 HEAT rockets.</description>
-		<jobString>Making RPG-32 HEAT rockets.</jobString>
+		<label>make RPG-32 (HEAT) rockets x5</label>
+		<description>Craft 5 RPG-32 (HEAT) rockets.</description>
+		<jobString>Making RPG-32 (HEAT) rockets.</jobString>
 		<workAmount>13000</workAmount>
 		<ingredients>
 			<li>
@@ -201,9 +201,9 @@
 
 	<RecipeDef ParentName="AmmoRecipeBase">
 		<defName>MakeAmmo_RPG32Rocket_Thermobaric</defName>
-		<label>make RPG-32 thermobaric rockets x5</label>
-		<description>Craft 5 RPG-32 thermobaric rockets.</description>
-		<jobString>Making RPG-32 thermobaric rockets.</jobString>
+		<label>make RPG-32 (Thermobaric) rockets x5</label>
+		<description>Craft 5 RPG-32 (Thermobaric) rockets.</description>
+		<jobString>Making RPG-32 (Thermobaric) rockets.</jobString>
 		<workAmount>25000</workAmount>
 		<ingredients>
 			<li>
diff --git a/Defs/Ammo/Rocket/RPG7.xml b/Defs/Ammo/Rocket/RPG7.xml
index 459568e9fe..fd94a85b09 100644
--- a/Defs/Ammo/Rocket/RPG7.xml
+++ b/Defs/Ammo/Rocket/RPG7.xml
@@ -170,7 +170,7 @@
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<explosionRadius>5</explosionRadius>
 			<damageDef>Thermobaric</damageDef>
-			<damageAmountBase>300</damageAmountBase>
+			<damageAmountBase>275</damageAmountBase>
 			<armorPenetrationSharp>0</armorPenetrationSharp>
 			<armorPenetrationBlunt>0</armorPenetrationBlunt>
 			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
@@ -210,9 +210,9 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_RPG7Grenade_HEAT</defName>
-		<label>make RPG-7 HEAT grenades x5</label>
-		<description>Craft 5 RPG-7 HEAT grenades.</description>
-		<jobString>Making RPG-7 HEAT grenades.</jobString>
+		<label>make RPG-7 (HEAT) grenades x5</label>
+		<description>Craft 5 RPG-7 (HEAT) grenades.</description>
+		<jobString>Making RPG-7 (HEAT) grenades.</jobString>
 		<workAmount>9200</workAmount>
 		<ingredients>
 			<li>
@@ -254,9 +254,9 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_RPG7Grenade_Thermobaric</defName>
-		<label>make RPG-7 thermobaric grenades x5</label>
-		<description>Craft 5 RPG-7 thermobaric grenades.</description>
-		<jobString>Making RPG-7 thermobaric grenades.</jobString>
+		<label>make RPG-7 (Thermobaric) grenades x5</label>
+		<description>Craft 5 RPG-7 (Thermobaric) grenades.</description>
+		<jobString>Making RPG-7 (Thermobaric) grenades.</jobString>
 		<workAmount>20400</workAmount>
 		<ingredients>
 			<li>
@@ -307,9 +307,9 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_RPG7Grenade_Frag</defName>
-		<label>make RPG-7 frag grenades x5</label>
-		<description>Craft 5 RPG-7 frag grenades.</description>
-		<jobString>Making RPG-7 frag grenades.</jobString>
+		<label>make RPG-7 (Frag) grenades x5</label>
+		<description>Craft 5 RPG-7 (Frag) grenades.</description>
+		<jobString>Making RPG-7 (Frag) grenades.</jobString>
 		<workAmount>5400</workAmount>
 		<ingredients>
 			<li>
diff --git a/Defs/Ammo/Rocket/SPG9.xml b/Defs/Ammo/Rocket/SPG9.xml
index 09e025dd22..35efe88284 100644
--- a/Defs/Ammo/Rocket/SPG9.xml
+++ b/Defs/Ammo/Rocket/SPG9.xml
@@ -239,9 +239,9 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_SPG9Rocket_HEAT</defName>
-		<label>make SPG-9 HEAT rockets x5</label>
-		<description>Craft 5 SPG-9 HEAT rockets.</description>
-		<jobString>Making SPG-9 HEAT rockets.</jobString>
+		<label>make SPG-9 (HEAT) rockets x5</label>
+		<description>Craft 5 SPG-9 (HEAT) rockets.</description>
+		<jobString>Making SPG-9 (HEAT) rockets.</jobString>
 		<workAmount>9400</workAmount>
 		<ingredients>
 			<li>
@@ -283,9 +283,9 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_SPG9Rocket_Thermobaric</defName>
-		<label>make SPG-9 thermobaric rockets x5</label>
-		<description>Craft 5 SPG-9 thermobaric rockets.</description>
-		<jobString>Making SPG-9 thermobaric rockets.</jobString>
+		<label>make SPG-9 (Thermobaric) rockets x5</label>
+		<description>Craft 5 SPG-9 (Thermobaric) rockets.</description>
+		<jobString>Making SPG-9 (Thermobaric) rockets.</jobString>
 		<workAmount>23800</workAmount>
 		<ingredients>
 			<li>
@@ -327,9 +327,9 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_SPG9Rocket_Frag</defName>
-		<label>make SPG-9 HE rockets x5</label>
-		<description>Craft 5 SPG-9 HE rockets.</description>
-		<jobString>Making SPG-9 HE rockets.</jobString>
+		<label>make SPG-9 (HE) rockets x5</label>
+		<description>Craft 5 SPG-9 (HE) rockets.</description>
+		<jobString>Making SPG-9 (HE) rockets.</jobString>
 		<workAmount>11400</workAmount>
 		<ingredients>
 			<li>
@@ -371,9 +371,10 @@
 
 	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_SPG9Rocket_EMP</defName>
-		<label>make SPG-9 EMP rockets x5</label>
-		<description>Craft 5 SPG-9 EMP rockets.</description>
-		<jobString>Making SPG-9 EMP rockets.</jobString>
+		<label>make SPG-9 (EMP) rockets x5</label>
+		<description>Craft 5 SPG-9 (EMP) rockets.</description>
+		<jobString>Making SPG-9 (EMP) rockets.</jobString>
+		<researchPrerequisite Inherit="False" />
 		<researchPrerequisites>
 			<li>MicroelectronicsBasics</li>
 			<li>CE_Launchers</li>
diff --git a/Defs/Ammo/Rocket/TomahawkLAM.xml b/Defs/Ammo/Rocket/TomahawkLAM.xml
index 629ede4f3c..4370610dbd 100644
--- a/Defs/Ammo/Rocket/TomahawkLAM.xml
+++ b/Defs/Ammo/Rocket/TomahawkLAM.xml
@@ -126,12 +126,12 @@
 
 	<!-- ==================== Recipes ========================== -->
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="LauncherAmmoRecipeBase">
 		<defName>MakeAmmo_TomahawkLAM</defName>
 		<label>make Tomahawk Missile</label>
-		<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
 		<description>Craft a single Tomahawk Missile.</description>
 		<jobString>Making Tomahawk Missile.</jobString>
+		<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
 		<workAmount>607200</workAmount>
 		<ingredients>
 			<li>
diff --git a/Defs/Ammo/Shell/100x695mmR.xml b/Defs/Ammo/Shell/100x695mmR.xml
index b0d9fda055..0e557fe416 100644
--- a/Defs/Ammo/Shell/100x695mmR.xml
+++ b/Defs/Ammo/Shell/100x695mmR.xml
@@ -142,11 +142,16 @@
 
 	<!-- ==================== Recipes ========================== -->
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_100x695mmRCannonShell_HEAT</defName>
-		<label>make 100x695mmR HEAT cannon shells x2</label>
-		<description>Craft 2 100x695mmR HEAT cannon shells.</description>
-		<jobString>Making 100x695mmR HEAT cannon shells.</jobString>
+		<label>make 100x695mmR (HEAT) cannon shells x2</label>
+		<description>Craft 2 100x695mmR (HEAT) cannon shells.</description>
+		<jobString>Making 100x695mmR (HEAT) cannon shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>CE_Launchers</li>
+		</researchPrerequisites>
 		<workAmount>15400</workAmount>
 		<ingredients>
 			<li>
@@ -184,16 +189,13 @@
 		<products>
 			<Ammo_100x695mmRCannonShell_HEAT>2</Ammo_100x695mmRCannonShell_HEAT>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_100x695mmRCannonShell_HE</defName>
-		<label>make 100x695mmR HE cannon shells x2</label>
-		<description>Craft 5 100x695mmR HE cannon shells.</description>
-		<jobString>Making 100x695mmR HE cannon shells.</jobString>
+		<label>make 100x695mmR (HE) cannon shells x2</label>
+		<description>Craft 5 100x695mmR (HE) cannon shells.</description>
+		<jobString>Making 100x695mmR (HE) cannon shells.</jobString>
 		<workAmount>16200</workAmount>
 		<ingredients>
 			<li>
@@ -231,9 +233,6 @@
 		<products>
 			<Ammo_100x695mmRCannonShell_HE>2</Ammo_100x695mmRCannonShell_HE>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
 </Defs>
\ No newline at end of file
diff --git a/Defs/Ammo/Shell/105mmHowitzer.xml b/Defs/Ammo/Shell/105mmHowitzer.xml
index f300db6fd6..7518acde45 100644
--- a/Defs/Ammo/Shell/105mmHowitzer.xml
+++ b/Defs/Ammo/Shell/105mmHowitzer.xml
@@ -150,6 +150,7 @@
 
 	<!-- indirect fire-->
 	<ThingDef Name="Base105mmHowitzerShell" ParentName="BaseExplosiveBullet" Abstract="true">
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<graphicData>
 			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
@@ -174,7 +175,6 @@
 	<ThingDef ParentName="Base105mmHowitzerShell">
 		<defName>Bullet_105mmHowitzerShell_HE</defName>
 		<label>105mm Howitzer shell (HE)</label>
-		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<graphicData>
 			<texPath>Things/Projectile/Cannon/Howitzer/HE</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -213,7 +213,7 @@
 			<aimHeightOffset>11</aimHeightOffset>
 			<shellingProps>
 				<damage>0.26</damage>
-			</shellingProps>			
+			</shellingProps>
 		</projectile>
 		<comps>
 			<li Class="CombatExtended.CompProperties_Fragments">
@@ -221,7 +221,7 @@
 					<Fragment_Large>40</Fragment_Large>
 					<Fragment_Small>44</Fragment_Small>
 				</fragments>
-				<fragAngleRange>-90~-40</fragAngleRange>	
+				<fragAngleRange>-90~-40</fragAngleRange>
 			</li>
 		</comps>
 	</ThingDef>
@@ -295,6 +295,7 @@
 
 	<!-- direct fire-->
 	<ThingDef Name="Base105mmHowitzerShellDirectfire" ParentName="BaseExplosiveBullet" Abstract="true">
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<graphicData>
 			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
@@ -311,6 +312,7 @@
 	<ThingDef ParentName="Base105mmHowitzerShellDirectfire">
 		<defName>Bullet_105mmHowitzerShell_HEAT_directfire</defName>
 		<label>105mm cannon shell (HEAT)</label>
+		<thingClass>CombatExtended.BulletCE</thingClass>
 		<graphicData>
 			<texPath>Things/Projectile/Cannon/HEAT</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -416,13 +418,8 @@
 			<damageDef>Smoke</damageDef>
 			<suppressionFactor>0.0</suppressionFactor>
 			<dangerFactor>0.0</dangerFactor>
-			<armorPenetrationSharp>0</armorPenetrationSharp>
-			<armorPenetrationBlunt>0</armorPenetrationBlunt>
 			<explosionRadius>8.5</explosionRadius>
-			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
 			<soundExplode>Explosion_EMP</soundExplode>
-			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-			<soundAmbient>MortarRound_Ambient</soundAmbient>
 			<postExplosionGasType>BlindSmoke</postExplosionGasType>
 			<preExplosionSpawnChance>1</preExplosionSpawnChance>
 			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
@@ -432,11 +429,16 @@
 
 	<!-- ==================== Recipes ========================== -->
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeAmmo_105mmHowitzerShell_HE</defName>
-		<label>make 105mm HE howitzer shells x2</label>
-		<description>Craft 2 105mm HE howitzer shells.</description>
-		<jobString>Making 105mm HE howitzer shells.</jobString>
+		<label>make 105mm (HE) howitzer shells x2</label>
+		<description>Craft 2 105mm (HE) howitzer shells.</description>
+		<jobString>Making 105mm (HE) howitzer shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>Mortars</li>
+			<li>CE_TurretHeavyWeapons</li>
+		</researchPrerequisites>
 		<workAmount>10000</workAmount>
 		<ingredients>
 			<li>
@@ -474,16 +476,18 @@
 		<products>
 			<Ammo_105mmHowitzerShell_HE>2</Ammo_105mmHowitzerShell_HE>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeAmmo_105mmHowitzerShell_HE_HFuzed</defName>
-		<label>make 105mm airburst howitzer shells x2</label>
-		<description>Craft 2 105mm airburst howitzer shells.</description>
-		<jobString>Making 105mm airburst howitzer shells.</jobString>
+		<label>make 105mm (Airburst) howitzer shells x2</label>
+		<description>Craft 2 105mm (Airburst) howitzer shells.</description>
+		<jobString>Making 105mm (Airburst) howitzer shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>Mortars</li>
+			<li>CE_TurretHeavyWeapons</li>
+		</researchPrerequisites>
 		<workAmount>11200</workAmount>
 		<ingredients>
 			<li>
@@ -526,11 +530,17 @@
 		</skillRequirements>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeAmmo_105mmHowitzerShell_HEAT</defName>
-		<label>make 105mm HEAT howitzer shells x2</label>
-		<description>Craft 2 105mm HEAT howitzer shells.</description>
-		<jobString>Making 105mm HEAT howitzer shells.</jobString>
+		<label>make 105mm (HEAT) howitzer shells x2</label>
+		<description>Craft 2 105mm (HEAT) howitzer shells.</description>
+		<jobString>Making 105mm (HEAT) howitzer shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>Mortars</li>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>CE_Launchers</li>
+		</researchPrerequisites>
 		<workAmount>10400</workAmount>
 		<ingredients>
 			<li>
@@ -568,16 +578,18 @@
 		<products>
 			<Ammo_105mmHowitzerShell_HEAT>2</Ammo_105mmHowitzerShell_HEAT>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeAmmo_105mmHowitzerShell_Incendiary</defName>
-		<label>make 105mm Incendiary howitzer shells x2</label>
-		<description>Craft 2 105mm Incendiary howitzer shells.</description>
-		<jobString>Making 105mm Incendiary howitzer shells.</jobString>
+		<label>make 105mm (Incendiary) howitzer shells x2</label>
+		<description>Craft 2 105mm (Incendiary) howitzer shells.</description>
+		<jobString>Making 105mm (Incendiary) howitzer shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>Mortars</li>
+			<li>CE_TurretHeavyWeapons</li>
+		</researchPrerequisites>
 		<workAmount>8400</workAmount>
 		<ingredients>
 			<li>
@@ -615,17 +627,19 @@
 		<products>
 			<Ammo_105mmHowitzerShell_Incendiary>2</Ammo_105mmHowitzerShell_Incendiary>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeAmmo_105mmHowitzerShell_EMP</defName>
-		<label>make 105mm EMP howitzer shells x2</label>
-		<description>Craft 2 105mm EMP howitzer shells.</description>
-		<jobString>Making 105mm EMP howitzer shells.</jobString>
-		<researchPrerequisite>MicroelectronicsBasics</researchPrerequisite>
+		<label>make 105mm (EMP) howitzer shells x2</label>
+		<description>Craft 2 105mm (EMP) howitzer shells.</description>
+		<jobString>Making 105mm (EMP) howitzer shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>Mortars</li>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>MicroelectronicsBasics</li>
+		</researchPrerequisites>
 		<workAmount>12000</workAmount>
 		<ingredients>
 			<li>
@@ -654,16 +668,18 @@
 		<products>
 			<Ammo_105mmHowitzerShell_EMP>2</Ammo_105mmHowitzerShell_EMP>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeAmmo_105mmHowitzerShell_Smoke</defName>
-		<label>make 105mm Smoke howitzer shells x2</label>
-		<description>Craft 2 105mm Smoke howitzer shells.</description>
-		<jobString>Making 105mm Smoke howitzer shells.</jobString>
+		<label>make 105mm (Smoke) howitzer shells x2</label>
+		<description>Craft 2 105mm (Smoke) howitzer shells.</description>
+		<jobString>Making 105mm (Smoke) howitzer shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>Mortars</li>
+			<li>CE_TurretHeavyWeapons</li>
+		</researchPrerequisites>
 		<workAmount>8400</workAmount>
 		<ingredients>
 			<li>
@@ -701,9 +717,6 @@
 		<products>
 			<Ammo_105mmHowitzerShell_Smoke>2</Ammo_105mmHowitzerShell_Smoke>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
 </Defs>
\ No newline at end of file
diff --git a/Defs/Ammo/Shell/105x607mmR.xml b/Defs/Ammo/Shell/105x607mmR.xml
index 6c4d3de1d9..145429ae8f 100644
--- a/Defs/Ammo/Shell/105x607mmR.xml
+++ b/Defs/Ammo/Shell/105x607mmR.xml
@@ -2,8 +2,8 @@
 <Defs>
 
 	<ThingCategoryDef>
-		<defName>Ammo105x607mmRCannonShells</defName>
-		<label>105x607mmR cannon shell</label>
+		<defName>Ammo105x607mmRShells</defName>
+		<label>105x607mmR shell</label>
 		<parent>AmmoShells</parent>
 		<iconPath>UI/Icons/ThingCategories/CaliberCannon</iconPath>
 	</ThingCategoryDef>
@@ -11,21 +11,21 @@
 	<!-- ==================== AmmoSet ========================== -->
 
 	<CombatExtended.AmmoSetDef>
-		<defName>AmmoSet_105x607mmRCannonShell</defName>
+		<defName>AmmoSet_105x607mmRShell</defName>
 		<label>105x607mmR recoilless rifle shells</label>
 		<ammoTypes>
-			<Ammo_105x607mmRCannonShell_HEAT>Bullet_105x607mmRCannonShell_HEAT</Ammo_105x607mmRCannonShell_HEAT>
-			<Ammo_105x607mmRCannonShell_HE>Bullet_105x607mmRCannonShell_HE</Ammo_105x607mmRCannonShell_HE>
+			<Ammo_105x607mmRShell_HEAT>Bullet_105x607mmRShell_HEAT</Ammo_105x607mmRShell_HEAT>
+			<Ammo_105x607mmRShell_HE>Bullet_105x607mmRShell_HE</Ammo_105x607mmRShell_HE>
 		</ammoTypes>
 		<similarTo>AmmoSet_HeavyCannon</similarTo>
 	</CombatExtended.AmmoSetDef>
 
 	<!-- ==================== Ammo ========================== -->
 
-	<ThingDef Class="CombatExtended.AmmoDef" Name="105x607mmRCannonShellBase" ParentName="HeavyAmmoBase" Abstract="True">
+	<ThingDef Class="CombatExtended.AmmoDef" Name="105x607mmRShellBase" ParentName="HeavyAmmoBase" Abstract="True">
 		<description>High-caliber recoilless rifle shells, typically used by large recoilless rifles.</description>
 		<thingCategories>
-			<li>Ammo105x607mmRCannonShells</li>
+			<li>Ammo105x607mmRShells</li>
 		</thingCategories>
 		<stackLimit>25</stackLimit>
 		<tradeTags>
@@ -41,9 +41,9 @@
 		<cookOffSound>MortarBomb_Explode</cookOffSound>
 	</ThingDef>
 
-	<ThingDef Class="CombatExtended.AmmoDef" ParentName="105x607mmRCannonShellBase">
-		<defName>Ammo_105x607mmRCannonShell_HEAT</defName>
-		<label>105x607mmR cannon shell (HEAT)</label>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="105x607mmRShellBase">
+		<defName>Ammo_105x607mmRShell_HEAT</defName>
+		<label>105x607mmR shell (HEAT)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Cannon/Tank/HEAT</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -52,12 +52,12 @@
 			<MarketValue>131.37</MarketValue>
 		</statBases>
 		<ammoClass>RocketHEAT</ammoClass>
-		<detonateProjectile>Bullet_105x607mmRCannonShell_HEAT</detonateProjectile>
+		<detonateProjectile>Bullet_105x607mmRShell_HEAT</detonateProjectile>
 	</ThingDef>
 
-	<ThingDef Class="CombatExtended.AmmoDef" ParentName="105x607mmRCannonShellBase">
-		<defName>Ammo_105x607mmRCannonShell_HE</defName>
-		<label>105x607mmR cannon shell (HE)</label>
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="105x607mmRShellBase">
+		<defName>Ammo_105x607mmRShell_HE</defName>
+		<label>105x607mmR shell (HE)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -66,12 +66,12 @@
 			<MarketValue>162.7</MarketValue>
 		</statBases>
 		<ammoClass>GrenadeHE</ammoClass>
-		<detonateProjectile>Bullet_105x607mmRCannonShell_HE</detonateProjectile>
+		<detonateProjectile>Bullet_105x607mmRShell_HE</detonateProjectile>
 	</ThingDef>
 
 	<!-- ================== Projectiles ================== -->
 
-	<ThingDef Name="Base105x607mmRCannonShell" ParentName="BaseExplosiveBullet" Abstract="true">
+	<ThingDef Name="Base105x607mmRShell" ParentName="BaseExplosiveBullet" Abstract="true">
 		<graphicData>
 			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
@@ -85,8 +85,8 @@
 		</projectile>
 	</ThingDef>
 
-	<ThingDef ParentName="Base105x607mmRCannonShell">
-		<defName>Bullet_105x607mmRCannonShell_HEAT</defName>
+	<ThingDef ParentName="Base105x607mmRShell">
+		<defName>Bullet_105x607mmRShell_HEAT</defName>
 		<label>105x607mmR shell (HEAT)</label>
 		<graphicData>
 			<texPath>Things/Projectile/Cannon/HEAT</texPath>
@@ -115,8 +115,8 @@
 		</comps>
 	</ThingDef>
 
-	<ThingDef ParentName="Base105x607mmRCannonShell">
-		<defName>Bullet_105x607mmRCannonShell_HE</defName>
+	<ThingDef ParentName="Base105x607mmRShell">
+		<defName>Bullet_105x607mmRShell_HE</defName>
 		<label>105x607mmR shell (HE)</label>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<graphicData>
@@ -142,11 +142,16 @@
 
 	<!-- ==================== Recipes ========================== -->
 
-	<RecipeDef ParentName="AmmoRecipeBase">
-		<defName>MakeAmmo_105x607mmRCannonShell_HEAT</defName>
-		<label>make 105x607mmR HEAT cannon shells x2</label>
-		<description>Craft 2 105x607mmR HEAT cannon shells.</description>
-		<jobString>Making 105x607mmR HEAT cannon shells.</jobString>
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
+		<defName>MakeAmmo_105x607mmRShell_HEAT</defName>
+		<label>make 105x607mmR (HEAT) shells x2</label>
+		<description>Craft 2 105x607mmR (HEAT) shells.</description>
+		<jobString>Making 105x607mmR (HEAT) shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>CE_Launchers</li>
+		</researchPrerequisites>
 		<workAmount>11200</workAmount>
 		<ingredients>
 			<li>
@@ -182,18 +187,15 @@
 			</thingDefs>
 		</fixedIngredientFilter>
 		<products>
-			<Ammo_105x607mmRCannonShell_HEAT>2</Ammo_105x607mmRCannonShell_HEAT>
+			<Ammo_105x607mmRShell_HEAT>2</Ammo_105x607mmRShell_HEAT>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
-		<defName>MakeAmmo_105x607mmRCannonShell_HE</defName>
-		<label>make 105x607mmR HE cannon shells x2</label>
-		<description>Craft 2 105x607mmR HE cannon shells.</description>
-		<jobString>Making 105x607mmR HE cannon shells.</jobString>
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
+		<defName>MakeAmmo_105x607mmRShell_HE</defName>
+		<label>make 105x607mmR (HE) shells x2</label>
+		<description>Craft 2 105x607mmR (HE) shells.</description>
+		<jobString>Making 105x607mmR (HE) shells.</jobString>
 		<workAmount>14400</workAmount>
 		<ingredients>
 			<li>
@@ -229,11 +231,8 @@
 			</thingDefs>
 		</fixedIngredientFilter>
 		<products>
-			<Ammo_105x607mmRCannonShell_HE>2</Ammo_105x607mmRCannonShell_HE>
+			<Ammo_105x607mmRShell_HE>2</Ammo_105x607mmRShell_HE>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
 </Defs>
\ No newline at end of file
diff --git a/Defs/Ammo/Shell/105x617mmR.xml b/Defs/Ammo/Shell/105x617mmR.xml
index 3b6f44aa8f..4c6d5fa279 100644
--- a/Defs/Ammo/Shell/105x617mmR.xml
+++ b/Defs/Ammo/Shell/105x617mmR.xml
@@ -144,11 +144,16 @@
 
 	<!-- ==================== Recipes ========================== -->
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_105x617mmRCannonShell_HEAT</defName>
-		<label>make 105x617mmR HEAT cannon shells x2</label>
-		<description>Craft 2 105x617mmR HEAT cannon shells.</description>
-		<jobString>Making 105x617mmR HEAT cannon shells.</jobString>
+		<label>make 105x617mmR (HEAT) cannon shells x2</label>
+		<description>Craft 2 105x617mmR (HEAT) cannon shells.</description>
+		<jobString>Making 105x617mmR (HEAT) cannon shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>CE_Launchers</li>
+		</researchPrerequisites>
 		<workAmount>11800</workAmount>
 		<ingredients>
 			<li>
@@ -186,16 +191,13 @@
 		<products>
 			<Ammo_105x617mmRCannonShell_HEAT>2</Ammo_105x617mmRCannonShell_HEAT>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_105x617mmRCannonShell_HE</defName>
-		<label>make 105x617mmR HE cannon shells x2</label>
-		<description>Craft 2 105x617mmR HE cannon shells.</description>
-		<jobString>Making 105x617mmR HE cannon shells.</jobString>
+		<label>make 105x617mmR (HE) cannon shells x2</label>
+		<description>Craft 2 105x617mmR (HE) cannon shells.</description>
+		<jobString>Making 105x617mmR (HE) cannon shells.</jobString>
 		<workAmount>13000</workAmount>
 		<ingredients>
 			<li>
@@ -233,9 +235,6 @@
 		<products>
 			<Ammo_105x617mmRCannonShell_HE>2</Ammo_105x617mmRCannonShell_HE>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
 </Defs>
\ No newline at end of file
diff --git a/Defs/Ammo/Shell/120mmCannon.xml b/Defs/Ammo/Shell/120mmCannon.xml
index 5b35f012f8..c4591b7825 100644
--- a/Defs/Ammo/Shell/120mmCannon.xml
+++ b/Defs/Ammo/Shell/120mmCannon.xml
@@ -141,11 +141,16 @@
 
 	<!-- ==================== Recipes ========================== -->
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_120mmCannonShell_HEAT</defName>
-		<label>make 120mm HEAT cannon shells x2</label>
-		<description>Craft 2 120mm HEAT cannon shells.</description>
-		<jobString>Making 120mm HEAT cannon shells.</jobString>
+		<label>make 120mm (HEAT) cannon shells x2</label>
+		<description>Craft 2 120mm (HEAT) cannon shells.</description>
+		<jobString>Making 120mm (HEAT) cannon shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>CE_Launchers</li>
+		</researchPrerequisites>
 		<workAmount>13000</workAmount>
 		<ingredients>
 			<li>
@@ -183,16 +188,13 @@
 		<products>
 			<Ammo_120mmCannonShell_HEAT>2</Ammo_120mmCannonShell_HEAT>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_120mmCannonShell_HE</defName>
-		<label>make 120mm HE cannon shells x2</label>
-		<description>Craft 2 120mm HE cannon shells.</description>
-		<jobString>Making 120mm HE cannon shells.</jobString>
+		<label>make 120mm (HE) cannon shells x2</label>
+		<description>Craft 2 120mm (HE) cannon shells.</description>
+		<jobString>Making 120mm (HE) cannon shells.</jobString>
 		<workAmount>15400</workAmount>
 		<ingredients>
 			<li>
@@ -230,9 +232,6 @@
 		<products>
 			<Ammo_120mmCannonShell_HE>2</Ammo_120mmCannonShell_HE>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
 </Defs>
\ No newline at end of file
diff --git a/Defs/Ammo/Shell/155mmHowitzer.xml b/Defs/Ammo/Shell/155mmHowitzer.xml
index aaa43e4dee..16856404bb 100644
--- a/Defs/Ammo/Shell/155mmHowitzer.xml
+++ b/Defs/Ammo/Shell/155mmHowitzer.xml
@@ -130,6 +130,7 @@
 	<!-- ================== Projectiles ================== -->
 
 	<ThingDef Name="Base155mmHowitzerShell" ParentName="BaseExplosiveBullet" Abstract="true">
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<graphicData>
 			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
@@ -154,7 +155,6 @@
 	<ThingDef ParentName="Base155mmHowitzerShell">
 		<defName>Bullet_155mmHowitzerShell_HE</defName>
 		<label>155mm Howitzer shell (HE)</label>
-		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<graphicData>
 			<texPath>Things/Projectile/Cannon/Howitzer/HE</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -204,7 +204,7 @@
 					<Fragment_Large>40</Fragment_Large>
 					<Fragment_Small>80</Fragment_Small>
 				</fragments>
-				<fragAngleRange>-90~-40</fragAngleRange>	
+				<fragAngleRange>-90~-40</fragAngleRange>
 			</li>
 		</comps>
 	</ThingDef>
@@ -282,6 +282,7 @@
 
 	<!-- direct fire-->
 	<ThingDef Name="Base155mmHowitzerShellDirectfire" ParentName="BaseExplosiveBullet" Abstract="true">
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<graphicData>
 			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
@@ -298,7 +299,6 @@
 	<ThingDef ParentName="Base155mmHowitzerShellDirectfire">
 		<defName>Bullet_155mmHowitzerShell_HE_directfire</defName>
 		<label>155mm Howitzer shell (HE)</label>
-		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<graphicData>
 			<texPath>Things/Projectile/Cannon/Howitzer/HE</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -371,10 +371,7 @@
 			<suppressionFactor>0.0</suppressionFactor>
 			<dangerFactor>0.0</dangerFactor>
 			<explosionRadius>10.5</explosionRadius>
-			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
 			<soundExplode>Explosion_EMP</soundExplode>
-			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-			<soundAmbient>MortarRound_Ambient</soundAmbient>
 			<postExplosionGasType>BlindSmoke</postExplosionGasType>
 			<preExplosionSpawnChance>1</preExplosionSpawnChance>
 			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
@@ -384,11 +381,16 @@
 
 	<!-- ==================== Recipes ========================== -->
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeAmmo_155mmHowitzerShell_HE</defName>
-		<label>make 155mm HE howitzer shells x1</label>
-		<description>Craft 1 155mm HE howitzer shells.</description>
-		<jobString>Making 155mm HE howitzer shells.</jobString>
+		<label>make 155mm (HE) howitzer shells x1</label>
+		<description>Craft 1 155mm (HE) howitzer shells.</description>
+		<jobString>Making 155mm (HE) howitzer shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>Mortars</li>
+			<li>CE_TurretHeavyWeapons</li>
+		</researchPrerequisites>
 		<workAmount>17400</workAmount>
 		<ingredients>
 			<li>
@@ -426,16 +428,18 @@
 		<products>
 			<Ammo_155mmHowitzerShell_HE>1</Ammo_155mmHowitzerShell_HE>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeAmmo_155mmHowitzerShell_HE_HFuzed</defName>
-		<label>make 155mm airburst howitzer shells x1</label>
-		<description>Craft 1 155mm airburst howitzer shells.</description>
-		<jobString>Making 155mm airburst howitzer shells.</jobString>
+		<label>make 155mm (Airburst) howitzer shells x1</label>
+		<description>Craft 1 155mm (Airburst) howitzer shells.</description>
+		<jobString>Making 155mm (Airburst) howitzer shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>Mortars</li>
+			<li>CE_TurretHeavyWeapons</li>
+		</researchPrerequisites>
 		<workAmount>18600</workAmount>
 		<ingredients>
 			<li>
@@ -478,11 +482,16 @@
 		</skillRequirements>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeAmmo_155mmHowitzerShell_Incendiary</defName>
-		<label>make 155mm Incendiary howitzer shells x1</label>
-		<description>Craft 155mm Incendiary Howitzer shell.</description>
-		<jobString>Making 155mm Incendiary Howitzer shell.</jobString>
+		<label>make 155mm (Incendiary) howitzer shells x1</label>
+		<description>Craft 155mm (Incendiary) Howitzer shell.</description>
+		<jobString>Making 155mm (Incendiary) Howitzer shell.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>Mortars</li>
+			<li>CE_TurretHeavyWeapons</li>
+		</researchPrerequisites>
 		<workAmount>12600</workAmount>
 		<ingredients>
 			<li>
@@ -520,17 +529,19 @@
 		<products>
 			<Ammo_155mmHowitzerShell_Incendiary>1</Ammo_155mmHowitzerShell_Incendiary>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeAmmo_155mmHowitzerShell_EMP</defName>
-		<label>make 155mm EMP howitzer shells x1</label>
-		<description>Craft 155mm EMP Howitzer shell.</description>
-		<jobString>Making 155mm EMP Howitzer shell.</jobString>
-		<researchPrerequisite>MicroelectronicsBasics</researchPrerequisite>
+		<label>make 155mm (EMP) howitzer shells x1</label>
+		<description>Craft 155mm (EMP) Howitzer shell.</description>
+		<jobString>Making 155mm (EMP) Howitzer shell.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>Mortars</li>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>MicroelectronicsBasics</li>
+		</researchPrerequisites>
 		<workAmount>18400</workAmount>
 		<ingredients>
 			<li>
@@ -559,16 +570,18 @@
 		<products>
 			<Ammo_155mmHowitzerShell_EMP>1</Ammo_155mmHowitzerShell_EMP>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeAmmo_155mmHowitzerShell_Smoke</defName>
-		<label>make 155mm Smoke howitzer shells x1</label>
-		<description>Craft 155mm Smoke Howitzer shell.</description>
-		<jobString>Making 155mm Smoke Howitzer shell.</jobString>
+		<label>make 155mm (Smoke) howitzer shells x1</label>
+		<description>Craft 155mm (Smoke) Howitzer shell.</description>
+		<jobString>Making 155mm (Smoke) Howitzer shell.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>Mortars</li>
+			<li>CE_TurretHeavyWeapons</li>
+		</researchPrerequisites>
 		<workAmount>11400</workAmount>
 		<ingredients>
 			<li>
@@ -606,9 +619,6 @@
 		<products>
 			<Ammo_155mmHowitzerShell_Smoke>1</Ammo_155mmHowitzerShell_Smoke>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
 </Defs>
\ No newline at end of file
diff --git a/Defs/Ammo/Shell/15cmNebelwerfer.xml b/Defs/Ammo/Shell/15cmNebelwerfer.xml
index d1deaeaf8c..e165de80a4 100644
--- a/Defs/Ammo/Shell/15cmNebelwerfer.xml
+++ b/Defs/Ammo/Shell/15cmNebelwerfer.xml
@@ -40,7 +40,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="15cmNebelwerferBase">
 		<defName>Ammo_15cmNebelwerfer_HE</defName>
-		<label>15cm Nebelwerfer Rocket (HE)</label>
+		<label>15cm Nebelwerfer rocket (HE)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Cannon/15cmNbW</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -59,7 +59,7 @@
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Base130mmType63">
 		<defName>Bullet_15cmNebelwerfer_HE</defName>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-		<label>15cm Nebelwerfer Rocket (HE)</label>
+		<label>15cm Nebelwerfer rocket (HE)</label>
 		<graphicData>
 			<texPath>Things/Projectile/Rocket/15cm_NbW</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -88,11 +88,11 @@
 
 	<!-- ==================== Recipes ========================== -->
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_15cmNebelwerfer_HE</defName>
-		<label>make 15cm Nebelwerfer HE rocket</label>
-		<description>Craft a 15cm Nebelwerfer HE rockets.</description>
-		<jobString>Making 15cm Nebelwerfer HE rockets.</jobString>
+		<label>make 15cm Nebelwerfer (HE) rocket</label>
+		<description>Craft a 15cm Nebelwerfer (HE) rockets.</description>
+		<jobString>Making 15cm Nebelwerfer (HE) rockets.</jobString>
 		<workAmount>44600</workAmount>
 		<ingredients>
 			<li>
@@ -130,9 +130,6 @@
 		<products>
 			<Ammo_15cmNebelwerfer_HE>6</Ammo_15cmNebelwerfer_HE>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
 </Defs>
\ No newline at end of file
diff --git a/Defs/Ammo/Shell/28cmSpgr.xml b/Defs/Ammo/Shell/28cmSpgr.xml
index ee5f11a4e5..4429dddd4e 100644
--- a/Defs/Ammo/Shell/28cmSpgr.xml
+++ b/Defs/Ammo/Shell/28cmSpgr.xml
@@ -42,7 +42,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="28cmSpgrShellBase">
 		<defName>Ammo_28cmSpgrShell_HE</defName>
-		<label>28cm Spgr. shell (HE)</label>
+		<label>28cm Spgr. cannon shell (HE)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Cannon/HE</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -76,7 +76,7 @@
 
 	<ThingDef ParentName="Base28cmSpgrShell">
 		<defName>Bullet_28cmSpgrShell_HE</defName>
-		<label>28cm Spgr. shell (HE)</label>
+		<label>28cm Spgr. cannon shell (HE)</label>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<graphicData>
 			<texPath>Things/Projectile/Cannon/HE</texPath>
@@ -101,11 +101,11 @@
 
 	<!-- ==================== Recipes ========================== -->
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_28cmSpgrShell_HE</defName>
-		<label>make 28cm Spgr. HE cannon shells x5</label>
-		<description>Craft 5 28cm Spgr. HE cannon shells.</description>
-		<jobString>Making 28cm Spgr. HE cannon shells.</jobString>
+		<label>make 28cm Spgr. (HE) cannon shells x5</label>
+		<description>Craft 5 28cm Spgr. (HE) cannon shells.</description>
+		<jobString>Making 28cm Spgr. (HE) cannon shells.</jobString>
 		<workAmount>74400</workAmount>
 		<ingredients>
 			<li>
@@ -143,9 +143,6 @@
 		<products>
 			<Ammo_28cmSpgrShell_HE>5</Ammo_28cmSpgrShell_HE>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
 </Defs>
\ No newline at end of file
diff --git a/Defs/Ammo/Shell/37x223mmR.xml b/Defs/Ammo/Shell/37x223mmR.xml
index 8805ee7f11..1211af91b8 100644
--- a/Defs/Ammo/Shell/37x223mmR.xml
+++ b/Defs/Ammo/Shell/37x223mmR.xml
@@ -42,7 +42,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo37x223mmRBase">
 		<defName>Ammo_37x223mmR_AP</defName>
-		<label>37x223mmR cartridge (AP)</label>
+		<label>37x223mmR cannon shell (AP)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Cannon/HEAT</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -57,7 +57,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo37x223mmRBase">
 		<defName>Ammo_37x223mmR_HE</defName>
-		<label>37x223mmR cartridge (HE)</label>
+		<label>37x223mmR cannon shell (HE)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Cannon/HE</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -88,7 +88,7 @@
 
 	<ThingDef ParentName="Base37x223mmRBullet">
 		<defName>Bullet_37x223mmR_AP</defName>
-		<label>37x223mmR shell (AP)</label>
+		<label>37x223mmR cannon shell (AP)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageDef>Bullet</damageDef>
 			<damageAmountBase>82</damageAmountBase>
@@ -99,7 +99,7 @@
 
 	<ThingDef ParentName="Base37x223mmRBullet">
 		<defName>Bullet_37x223mmR_HE</defName>
-		<label>37x223mmR shell (HE)</label>
+		<label>37x223mmR cannon shell (HE)</label>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<speed>150</speed>
 			<damageDef>Bomb</damageDef>
@@ -120,11 +120,12 @@
 
 	<!-- ==================== Recipes ========================== -->
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_37x223mmR_AP</defName>
-		<label>make 37x223mmR (AP) cartridge x25</label>
-		<description>Craft 25 37x223mmR (AP) cartridges.</description>
-		<jobString>Making 37x223mmR (AP) cartridges.</jobString>
+		<label>make 37x223mmR (AP) cannon shells x25</label>
+		<description>Craft 25 37x223mmR (AP) cannon shells.</description>
+		<jobString>Making 37x223mmR (AP) cannon shells.</jobString>
+		<workAmount>8880</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -143,17 +144,14 @@
 		<products>
 			<Ammo_37x223mmR_AP>25</Ammo_37x223mmR_AP>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>8880</workAmount>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_37x223mmR_HE</defName>
-		<label>make 37x223mmR (HE) cartridge x25</label>
-		<description>Craft 25 37x223mmR (HE) cartridges.</description>
-		<jobString>Making 37x223mmR (HE) cartridges.</jobString>
+		<label>make 37x223mmR (HE) cannon shells x25</label>
+		<description>Craft 25 37x223mmR (HE) cannon shells.</description>
+		<jobString>Making 37x223mmR (HE) cannon shells.</jobString>
+		<workAmount>9000</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -190,10 +188,6 @@
 		<products>
 			<Ammo_37x223mmR_HE>25</Ammo_37x223mmR_HE>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>9000</workAmount>
 	</RecipeDef>
 
 </Defs>
\ No newline at end of file
diff --git a/Defs/Ammo/Shell/40x365mmBofors.xml b/Defs/Ammo/Shell/40x365mmBofors.xml
index bbfe18f779..a78c44dd4c 100644
--- a/Defs/Ammo/Shell/40x365mmBofors.xml
+++ b/Defs/Ammo/Shell/40x365mmBofors.xml
@@ -182,11 +182,12 @@
 
 	<!-- ==================== Recipes ========================== -->
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_40x365mmBofors_AP</defName>
 		<label>make 40x365mm Bofors (AP) cartridge x25</label>
 		<description>Craft 25 40x365mm Bofors (AP) cartridges.</description>
 		<jobString>Making 40x365mm Bofors (AP) cartridges.</jobString>
+		<workAmount>15120</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -205,17 +206,14 @@
 		<products>
 			<Ammo_40x365mmBofors_AP>25</Ammo_40x365mmBofors_AP>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>15120</workAmount>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_40x365mmBofors_HE</defName>
 		<label>make 40x365mm Bofors (HE) cartridge x25</label>
 		<description>Craft 25 40x365mm Bofors (HE) cartridges.</description>
 		<jobString>Making 40x365mm Bofors (HE) cartridges.</jobString>
+		<workAmount>18600</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -252,18 +250,19 @@
 		<products>
 			<Ammo_40x365mmBofors_HE>25</Ammo_40x365mmBofors_HE>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>18600</workAmount>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_40x365mmBofors_HE_TFuzed</defName>
-		<label>make 40x365mm Bofors Time-Fuzed cartridge x25</label>
-		<description>Craft 25 40x365mm Bofors Time-Fuzed cartridges.</description>
-		<jobString>Making 40x365mm Bofors Time-Fuzed cartridges.</jobString>
-		<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
+		<label>make 40x365mm Bofors (Time-Fuzed) cartridge x25</label>
+		<description>Craft 25 40x365mm Bofors (Time-Fuzed) cartridges.</description>
+		<jobString>Making 40x365mm Bofors (Time-Fuzed) cartridges.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>CE_AdvancedLaunchers</li>
+		</researchPrerequisites>
+		<workAmount>20400</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -300,17 +299,19 @@
 		<products>
 			<Ammo_40x365mmBofors_HE_TFuzed>25</Ammo_40x365mmBofors_HE_TFuzed>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>20400</workAmount>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AdvancedAmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_40x365mmBofors_Sabot</defName>
 		<label>make 40x365mm Bofors (Sabot) cartridge x25</label>
 		<description>Craft 25 40x365mm Bofors (Sabot) cartridges.</description>
 		<jobString>Making 40x365mm Bofors (Sabot) cartridges.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>CE_AdvancedAmmo</li>
+		</researchPrerequisites>
+		<workAmount>16200</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -347,10 +348,6 @@
 		<products>
 			<Ammo_40x365mmBofors_Sabot>25</Ammo_40x365mmBofors_Sabot>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>16200</workAmount>
 	</RecipeDef>
 
 </Defs>
\ No newline at end of file
diff --git a/Defs/Ammo/Shell/50mmType89Mortar.xml b/Defs/Ammo/Shell/50mmType89Mortar.xml
index ea8f5d0f8d..08e9046f26 100644
--- a/Defs/Ammo/Shell/50mmType89Mortar.xml
+++ b/Defs/Ammo/Shell/50mmType89Mortar.xml
@@ -199,11 +199,11 @@
 
 	<!-- ==================== Recipes ========================== -->
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeAmmo_50mmType89MortarShell_HE</defName>
-		<label>make 50mm type 89 HE mortar shells x5</label>
-		<description>Craft 5 50mm type 89 HE mortar shells.</description>
-		<jobString>Making 50mm type 89 HE mortar shells.</jobString>
+		<label>make 50mm type 89 (HE) mortar shells x5</label>
+		<description>Craft 5 50mm type 89 (HE) mortar shells.</description>
+		<jobString>Making 50mm type 89 (HE) mortar shells.</jobString>
 		<workAmount>3000</workAmount>
 		<ingredients>
 			<li>
@@ -241,16 +241,14 @@
 		<products>
 			<Ammo_50mmType89MortarShell_HE>5</Ammo_50mmType89MortarShell_HE>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeAmmo_50mmType89MortarShell_Incendiary</defName>
-		<label>make 50mm type 89 incendiary mortar shells x5</label>
-		<description>Craft 5 50mm type 89 incendiary mortar shells.</description>
-		<jobString>Making 50mm type 89 incendiary mortar shells.</jobString>
+		<label>make 50mm type 89 (Incendiary) mortar shells x5</label>
+		<description>Craft 5 50mm type 89 (Incendiary) mortar shells.</description>
+		<jobString>Making 50mm type 89 (Incendiary) mortar shells.</jobString>
+		<workAmount>3000</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -287,18 +285,19 @@
 		<products>
 			<Ammo_50mmType89MortarShell_Incendiary>5</Ammo_50mmType89MortarShell_Incendiary>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>3000</workAmount>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeAmmo_50mmType89MortarShell_EMP</defName>
-		<label>make 50mm type 89 EMP mortar shells x5</label>
-		<description>Craft 5 50mm type 89 EMP mortar shells.</description>
-		<jobString>Making 50mm type 89 EMP mortar shells.</jobString>
-		<researchPrerequisite>MicroelectronicsBasics</researchPrerequisite>
+		<label>make 50mm type 89 (EMP) mortar shells x5</label>
+		<description>Craft 5 50mm type 89 (EMP) mortar shells.</description>
+		<jobString>Making 50mm type 89 (EMP) mortar shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>Mortars</li>
+			<li>MicroelectronicsBasics</li>
+		</researchPrerequisites>
+		<workAmount>3400</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -326,17 +325,14 @@
 		<products>
 			<Ammo_50mmType89MortarShell_EMP>5</Ammo_50mmType89MortarShell_EMP>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>3400</workAmount>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeAmmo_50mmType89MortarShell_Smoke</defName>
-		<label>make 50mm type 89 smoke mortar shells x5</label>
-		<description>Craft 5 50mm type 89 smoke mortar shells.</description>
-		<jobString>Making 50mm type 89 smoke mortar shells.</jobString>
+		<label>make 50mm type 89 (Smoke) mortar shells x5</label>
+		<description>Craft 5 50mm type 89 (Smoke) mortar shells.</description>
+		<jobString>Making 50mm type 89 (Smoke) mortar shells.</jobString>
+		<workAmount>2600</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -373,10 +369,6 @@
 		<products>
 			<Ammo_50mmType89MortarShell_Smoke>5</Ammo_50mmType89MortarShell_Smoke>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>2600</workAmount>
 	</RecipeDef>
 
 </Defs>
\ No newline at end of file
diff --git a/Defs/Ammo/Shell/57x307mmR.xml b/Defs/Ammo/Shell/57x307mmR.xml
index d854adc7cb..bfe2e9903f 100644
--- a/Defs/Ammo/Shell/57x307mmR.xml
+++ b/Defs/Ammo/Shell/57x307mmR.xml
@@ -86,7 +86,7 @@
 
 	<ThingDef ParentName="Base57x307mmRBullet">
 		<defName>Bullet_57x307mmR_AP</defName>
-		<label>57x307mmR bullet (AP)</label>
+		<label>57x307mmR cannon shell (AP)</label>
 		<graphicData>
 			<texPath>Things/Projectile/Cannon/AP</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -101,7 +101,7 @@
 
 	<ThingDef ParentName="Base57x307mmRBullet">
 		<defName>Bullet_57x307mmR_HE</defName>
-		<label>57x307mmR bullet (HE)</label>
+		<label>57x307mmR cannon shell (HE)</label>
 		<graphicData>
 			<texPath>Things/Projectile/Cannon/HEFS</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -125,11 +125,12 @@
 
 	<!-- ==================== Recipes ========================== -->
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_57x307mmR_AP</defName>
-		<label>make 57x307mmR (AP) shells x10</label>
-		<description>Craft 10 57x307mmR (AP) shells.</description>
-		<jobString>Making 57x307mmR (AP) shells.</jobString>
+		<label>make 57x307mmR (AP) cannon shells x10</label>
+		<description>Craft 10 57x307mmR (AP) cannon shells.</description>
+		<jobString>Making 57x307mmR (AP) cannon shells.</jobString>
+		<workAmount>10320</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -148,17 +149,14 @@
 		<products>
 			<Ammo_57x307mmR_AP>10</Ammo_57x307mmR_AP>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>10320</workAmount>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_57x307mmR_HE</defName>
-		<label>make 57x307mmR (HE) cartridge x10</label>
-		<description>Craft 10 57x307mmR (HE) cartridges.</description>
-		<jobString>Making 57x307mmR (HE) cartridges.</jobString>
+		<label>make 57x307mmR (HE) cannon shells x10</label>
+		<description>Craft 10 57x307mmR (HE) cannon shells.</description>
+		<jobString>Making 57x307mmR (HE) cannon shells.</jobString>
+		<workAmount>10600</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -195,10 +193,6 @@
 		<products>
 			<Ammo_57x307mmR_HE>10</Ammo_57x307mmR_HE>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>10600</workAmount>
 	</RecipeDef>
 
 </Defs>
\ No newline at end of file
diff --git a/Defs/Ammo/Shell/57x438mmBofors.xml b/Defs/Ammo/Shell/57x438mmBofors.xml
new file mode 100644
index 0000000000..7bf5532541
--- /dev/null
+++ b/Defs/Ammo/Shell/57x438mmBofors.xml
@@ -0,0 +1,355 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<ThingCategoryDef>
+		<defName>Ammo57x438mmBofors</defName>
+		<label>57x438mm Bofors</label>
+		<parent>AmmoShells</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberAutocannonLarge</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_57x438mmBofors</defName>
+		<label>57x438mm Bofors</label>
+		<ammoTypes>
+			<Ammo_57x438mmBofors_AP>Bullet_57x438mmBofors_AP</Ammo_57x438mmBofors_AP>
+			<Ammo_57x438mmBofors_HE>Bullet_57x438mmBofors_HE</Ammo_57x438mmBofors_HE>
+			<Ammo_57x438mmBofors_HE_TFuzed>Bullet_57x438mmBofors_HE_TFuzed</Ammo_57x438mmBofors_HE_TFuzed>
+			<Ammo_57x438mmBofors_Sabot>Bullet_57x438mmBofors_Sabot</Ammo_57x438mmBofors_Sabot>
+		</ammoTypes>
+		<similarTo>AmmoSet_LightCannon</similarTo>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="Ammo57x438mmBoforsBase" ParentName="HeavyAmmoBase" Abstract="True">
+		<description>Large caliber cartridge used by naval artillery cannons.</description>
+		<thingCategories>
+			<li>Ammo57x438mmBofors</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+		<statBases>
+			<Mass>6.1</Mass>
+			<Bulk>10.56</Bulk>
+		</statBases>
+		<cookOffFlashScale>20</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo57x438mmBoforsBase">
+		<defName>Ammo_57x438mmBofors_AP</defName>
+		<label>57x438mm Bofors cartridge (AP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/HighCaliber/Bofors/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>24.4</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<cookOffProjectile>Bullet_57x438mmBofors_AP</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo57x438mmBoforsBase">
+		<defName>Ammo_57x438mmBofors_HE</defName>
+		<label>57x438mm Bofors cartridge (HE)</label>
+		<graphicData>
+			<texPath>Things/Ammo/HighCaliber/Bofors/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>39.32</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeHE</ammoClass>
+		<detonateProjectile>Bullet_57x438mmBofors_HE</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo57x438mmBoforsBase">
+		<defName>Ammo_57x438mmBofors_HE_TFuzed</defName>
+		<label>57x438mm Bofors cartridge (HE Time-Fuzed)</label>
+		<graphicData>
+			<texPath>Things/Ammo/HighCaliber/Bofors/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>49.07</MarketValue>
+		</statBases>
+		<ammoClass>GrenadeHETF</ammoClass>
+		<cookOffProjectile>Bullet_57x438mmBofors_HE</cookOffProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo57x438mmBoforsBase">
+		<defName>Ammo_57x438mmBofors_Sabot</defName>
+		<label>57x438mm Bofors cartridge (Sabot)</label>
+		<graphicData>
+			<texPath>Things/Ammo/HighCaliber/Bofors/Sabot</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<Mass>5.071</Mass>
+			<MarketValue>27</MarketValue>
+		</statBases>
+		<ammoClass>Sabot</ammoClass>
+		<cookOffProjectile>Bullet_57x438mmBofors_Sabot</cookOffProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="Base57x438mmBoforsBullet" ParentName="BaseExplosiveBullet" Abstract="true">
+		<graphicData>
+			<texPath>Things/Projectile/Bullet_Big</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>183</speed>
+			<flyOverhead>false</flyOverhead>
+			<dropsCasings>true</dropsCasings>
+			<casingMoteDefname>Fleck_BigShell</casingMoteDefname>
+			<casingFilthDefname>Filth_CannonAmmoCasings</casingFilthDefname>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base57x438mmBoforsBullet">
+		<defName>Bullet_57x438mmBofors_AP</defName>
+		<label>57x438mm Bofors bullet (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>192</damageAmountBase>
+			<armorPenetrationSharp>120</armorPenetrationSharp>
+			<armorPenetrationBlunt>25709.4</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base57x438mmBoforsBullet">
+		<defName>Bullet_57x438mmBofors_HE</defName>
+		<label>57x438mm Bofors bullet (HE)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>108</damageAmountBase>
+			<explosionRadius>2</explosionRadius>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>7</Fragment_Large>
+					<Fragment_Small>14</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base57x438mmBoforsBullet">
+		<defName>Bullet_57x438mmBofors_HE_TFuzed</defName>
+		<label>57x438mm Bofors bullet (HE Time-Fuzed)</label>
+		<thingClass>CombatExtended.ProjectileCE_Bursting</thingClass>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>108</damageAmountBase>
+			<explosionRadius>2</explosionRadius>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<aimHeightOffset>2</aimHeightOffset>
+			<armingDelay>2</armingDelay>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>7</Fragment_Large>
+					<Fragment_Small>14</Fragment_Small>
+				</fragments>
+				<fragAngleRange>-89~-5</fragAngleRange>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base57x438mmBoforsBullet">
+		<defName>Bullet_57x438mmBofors_Sabot</defName>
+		<label>57x438mm Bofors bullet (Sabot)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>183</damageAmountBase>
+			<armorPenetrationSharp>210</armorPenetrationSharp>
+			<armorPenetrationBlunt>33023.34</armorPenetrationBlunt>
+			<speed>248</speed>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
+		<defName>MakeAmmo_57x438mmBofors_AP</defName>
+		<label>make 57x438mm Bofors (AP) cartridge x25</label>
+		<description>Craft 25 57x438mm Bofors (AP) cartridges.</description>
+		<jobString>Making 57x438mm Bofors (AP) cartridges.</jobString>
+		<workAmount>14640</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>122</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_57x438mmBofors_AP>10</Ammo_57x438mmBofors_AP>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
+		<defName>MakeAmmo_57x438mmBofors_HE</defName>
+		<label>make 57x438mm Bofors (HE) cartridge x25</label>
+		<description>Craft 25 57x438mm Bofors (HE) cartridges.</description>
+		<jobString>Making 57x438mm Bofors (HE) cartridges.</jobString>
+		<workAmount>17800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>122</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>11</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_57x438mmBofors_HE>10</Ammo_57x438mmBofors_HE>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
+		<defName>MakeAmmo_57x438mmBofors_HE_TFuzed</defName>
+		<label>make 57x438mm Bofors (Time-Fuzed) cartridge x25</label>
+		<description>Craft 25 57x438mm Bofors (Time-Fuzed) cartridges.</description>
+		<jobString>Making 57x438mm Bofors (Time-Fuzed) cartridges.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>CE_AdvancedLaunchers</li>
+		</researchPrerequisites>
+		<workAmount>19600</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>122</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>11</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+				<li>FSX</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_57x438mmBofors_HE_TFuzed>10</Ammo_57x438mmBofors_HE_TFuzed>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
+		<defName>MakeAmmo_57x438mmBofors_Sabot</defName>
+		<label>make 57x438mm Bofors (Sabot) cartridge x25</label>
+		<description>Craft 25 57x438mm Bofors (Sabot) cartridges.</description>
+		<jobString>Making 57x438mm Bofors (Sabot) cartridges.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>CE_AdvancedAmmo</li>
+		</researchPrerequisites>
+		<workAmount>15800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>74</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>14</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Chemfuel</li>
+					</thingDefs>
+				</filter>
+				<count>14</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+				<li>Chemfuel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_57x438mmBofors_Sabot>10</Ammo_57x438mmBofors_Sabot>
+		</products>
+	</RecipeDef>
+
+</Defs>
\ No newline at end of file
diff --git a/Defs/Ammo/Shell/57x483mmBofors.xml b/Defs/Ammo/Shell/57x483mmBofors.xml
deleted file mode 100644
index 563871f0b7..0000000000
--- a/Defs/Ammo/Shell/57x483mmBofors.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Defs>
-
-	<ThingCategoryDef>
-		<defName>Ammo57x483mmBofors</defName>
-		<label>57x483mm Bofors</label>
-		<parent>AmmoShells</parent>
-		<iconPath>UI/Icons/ThingCategories/CaliberAutocannonLarge</iconPath>
-	</ThingCategoryDef>
-
-	<!-- ==================== AmmoSet ========================== -->
-
-	<CombatExtended.AmmoSetDef>
-		<defName>AmmoSet_57x483mmBofors</defName>
-		<label>57x483mm Bofors</label>
-		<ammoTypes>
-			<Ammo_57x483mmBofors_HE>Bullet_57x483mmBofors_HE</Ammo_57x483mmBofors_HE>
-		</ammoTypes>
-		<similarTo>AmmoSet_LightCannon</similarTo>
-	</CombatExtended.AmmoSetDef>
-
-	<!-- ==================== Ammo ========================== -->
-
-	<ThingDef Class="CombatExtended.AmmoDef" Name="Ammo57x483mmBoforsBase" ParentName="HeavyAmmoBase" Abstract="True">
-		<description>Large caliber cartridge used by naval artillery cannons.</description>
-		<thingCategories>
-			<li>Ammo57x483mmBofors</li>
-		</thingCategories>
-		<stackLimit>25</stackLimit>
-		<tradeTags>
-			<li>CE_AutoEnableTrade</li>
-			<li>CE_AutoEnableCrafting_TableMachining</li>
-		</tradeTags>
-		<statBases>
-			<Mass>6.1</Mass>
-			<Bulk>10.56</Bulk>
-		</statBases>
-		<cookOffFlashScale>20</cookOffFlashScale>
-		<cookOffSound>MortarBomb_Explode</cookOffSound>
-	</ThingDef>
-
-	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo57x483mmBoforsBase">
-		<defName>Ammo_57x483mmBofors_HE</defName>
-		<label>57x483mm Bofors cartridge (HE)</label>
-		<graphicData>
-			<texPath>Things/Ammo/HighCaliber/Bofors/HE</texPath>
-			<graphicClass>Graphic_StackCount</graphicClass>
-		</graphicData>
-		<statBases>
-			<MarketValue>39.32</MarketValue>
-		</statBases>
-		<ammoClass>GrenadeHE</ammoClass>
-		<detonateProjectile>Bullet_57x483mmBofors_HE</detonateProjectile>
-	</ThingDef>
-
-	<!-- ================== Projectiles ================== -->
-
-	<ThingDef Name="Base57x483mmBoforsBullet" ParentName="BaseExplosiveBullet" Abstract="true">
-		<graphicData>
-			<texPath>Things/Projectile/Bullet_Big</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-		</graphicData>
-		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<speed>193</speed>
-			<soundExplode>MortarBomb_Explode</soundExplode>
-			<flyOverhead>false</flyOverhead>
-			<dropsCasings>true</dropsCasings>
-			<casingMoteDefname>Fleck_BigShell</casingMoteDefname>
-			<casingFilthDefname>Filth_CannonAmmoCasings</casingFilthDefname>
-		</projectile>
-	</ThingDef>
-
-	<ThingDef ParentName="Base57x483mmBoforsBullet">
-		<defName>Bullet_57x483mmBofors_HE</defName>
-		<label>57x483mm Bofors bullet (HE)</label>
-		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<damageDef>Bomb</damageDef>
-			<damageAmountBase>108</damageAmountBase>
-			<explosionRadius>2</explosionRadius>
-			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-		</projectile>
-		<comps>
-			<li Class="CombatExtended.CompProperties_Fragments">
-				<fragments>
-					<Fragment_Large>7</Fragment_Large>
-					<Fragment_Small>14</Fragment_Small>
-				</fragments>
-			</li>
-		</comps>
-	</ThingDef>
-
-	<!-- ==================== Recipes ========================== -->
-
-	<RecipeDef ParentName="AmmoRecipeBase">
-		<defName>MakeAmmo_57x483mmBofors_HE</defName>
-		<label>make 57x483mm Bofors (HE) cartridge x25</label>
-		<description>Craft 25 57x483mm Bofors (HE) cartridges.</description>
-		<jobString>Making 57x483mm Bofors (HE) cartridges.</jobString>
-		<ingredients>
-			<li>
-				<filter>
-					<thingDefs>
-						<li>Steel</li>
-					</thingDefs>
-				</filter>
-				<count>122</count>
-			</li>
-			<li>
-				<filter>
-					<thingDefs>
-						<li>ComponentIndustrial</li>
-					</thingDefs>
-				</filter>
-				<count>2</count>
-			</li>
-			<li>
-				<filter>
-					<thingDefs>
-						<li>FSX</li>
-					</thingDefs>
-				</filter>
-				<count>11</count>
-			</li>
-		</ingredients>
-		<fixedIngredientFilter>
-			<thingDefs>
-				<li>Steel</li>
-				<li>ComponentIndustrial</li>
-				<li>FSX</li>
-			</thingDefs>
-		</fixedIngredientFilter>
-		<products>
-			<Ammo_57x483mmBofors_HE>25</Ammo_57x483mmBofors_HE>
-		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>17800</workAmount>
-	</RecipeDef>
-
-</Defs>
\ No newline at end of file
diff --git a/Defs/Ammo/Shell/60mmMortar.xml b/Defs/Ammo/Shell/60mmMortar.xml
index ae648f445b..59d4e8b801 100644
--- a/Defs/Ammo/Shell/60mmMortar.xml
+++ b/Defs/Ammo/Shell/60mmMortar.xml
@@ -247,11 +247,12 @@
 
 	<!-- ==================== Recipes ========================== -->
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeShell_60mmMortar_HE</defName>
-		<label>make 60mm HE mortar shells x5</label>
-		<description>Craft 5 60mm HE mortar shells.</description>
-		<jobString>Making 60mm HE mortar shells.</jobString>
+		<label>make 60mm (HE) mortar shells x5</label>
+		<description>Craft 5 60mm (HE) mortar shells.</description>
+		<jobString>Making 60mm (HE) mortar shells.</jobString>
+		<workAmount>4800</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -288,17 +289,14 @@
 		<products>
 			<Shell_60mmMortar_HE>5</Shell_60mmMortar_HE>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>4800</workAmount>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeShell_60mmMortar_Incendiary</defName>
-		<label>make 60mm incendiary mortar shells x5</label>
-		<description>Craft 5 60mm incendiary mortar shells.</description>
-		<jobString>Making 60mm incendiary mortar shells.</jobString>
+		<label>make 60mm (Incendiary) mortar shells x5</label>
+		<description>Craft 5 60mm (Incendiary) mortar shells.</description>
+		<jobString>Making 60mm (Incendiary) mortar shells.</jobString>
+		<workAmount>4000</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -335,18 +333,19 @@
 		<products>
 			<Shell_60mmMortar_Incendiary>5</Shell_60mmMortar_Incendiary>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>4000</workAmount>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeShell_60mmMortar_EMP</defName>
-		<label>make 60mm EMP mortar shells x5</label>
-		<description>Craft 5 60mm EMP mortar shells.</description>
-		<jobString>Making 60mm EMP mortar shells.</jobString>
-		<researchPrerequisite>MicroelectronicsBasics</researchPrerequisite>
+		<label>make 60mm (EMP) mortar shells x5</label>
+		<description>Craft 5 60mm (EMP) mortar shells.</description>
+		<jobString>Making 60mm (EMP) mortar shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>Mortars</li>
+			<li>MicroelectronicsBasics</li>
+		</researchPrerequisites>
+		<workAmount>5600</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -374,18 +373,19 @@
 		<products>
 			<Shell_60mmMortar_EMP>5</Shell_60mmMortar_EMP>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>5600</workAmount>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeShell_60mmMortar_Firefoam</defName>
-		<label>make 60mm firefoam mortar shells x5</label>
-		<description>Craft 5 60mm firefoam mortar shells.</description>
-		<jobString>Making 60mm firefoam mortar shells.</jobString>
-		<researchPrerequisite>Firefoam</researchPrerequisite>
+		<label>make 60mm (Firefoam) mortar shells x5</label>
+		<description>Craft 5 60mm (Firefoam) mortar shells.</description>
+		<jobString>Making 60mm (Firefoam) mortar shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>Mortars</li>
+			<li>Firefoam</li>
+		</researchPrerequisites>
+		<workAmount>4600</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -424,17 +424,14 @@
 		<products>
 			<Shell_60mmMortar_Firefoam>5</Shell_60mmMortar_Firefoam>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>4600</workAmount>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
 		<defName>MakeShell_60mmMortar_Smoke</defName>
-		<label>make 60mm smoke mortar shells x5</label>
-		<description>Craft 5 60mm smoke mortar shells.</description>
-		<jobString>Making 60mm smoke mortar shells.</jobString>
+		<label>make 60mm (Smoke) mortar shells x5</label>
+		<description>Craft 5 60mm (Smoke) mortar shells.</description>
+		<jobString>Making 60mm (Smoke) mortar shells.</jobString>
+		<workAmount>3600</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -471,10 +468,6 @@
 		<products>
 			<Shell_60mmMortar_Smoke>5</Shell_60mmMortar_Smoke>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>3600</workAmount>
 	</RecipeDef>
 
 </Defs>
\ No newline at end of file
diff --git a/Defs/Ammo/Shell/75x350mmR.xml b/Defs/Ammo/Shell/75x350mmR.xml
index 3920f90879..fede10bf9a 100644
--- a/Defs/Ammo/Shell/75x350mmR.xml
+++ b/Defs/Ammo/Shell/75x350mmR.xml
@@ -16,6 +16,7 @@
 		<ammoTypes>
 			<Ammo_75x350mmR_AP>Bullet_75x350mmR_AP</Ammo_75x350mmR_AP>
 			<Ammo_75x350mmR_HE>Bullet_75x350mmR_HE</Ammo_75x350mmR_HE>
+			<Ammo_75x350mmR_APCR>Bullet_75x350mmR_APCR</Ammo_75x350mmR_APCR>
 		</ammoTypes>
 		<similarTo>AmmoSet_LightCannon</similarTo>
 	</CombatExtended.AmmoSetDef>
@@ -41,7 +42,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo75x350mmRBase">
 		<defName>Ammo_75x350mmR_AP</defName>
-		<label>75x350mmR cartridge (AP)</label>
+		<label>75x350mmR cannon shell (AP)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Cannon/Tank/APHE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -56,19 +57,35 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo75x350mmRBase">
 		<defName>Ammo_75x350mmR_HE</defName>
-		<label>75x350mmR cartridge (HE)</label>
+		<label>75x350mmR cannon shell (HE)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>60.31</MarketValue>
+			<MarketValue>57.31</MarketValue>
 			<Bulk>11.86</Bulk>
 		</statBases>
 		<ammoClass>GrenadeHE</ammoClass>
 		<detonateProjectile>Bullet_75x350mmR_HE</detonateProjectile>
 	</ThingDef>
 
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="Ammo75x350mmRBase">
+		<defName>Ammo_75x350mmR_APCR</defName>
+		<label>75x350mmR cannon shell (APCR)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Cannon/Tank/APCR</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>42.81</MarketValue>
+			<Mass>5.817</Mass>
+			<Bulk>9.28</Bulk>
+		</statBases>
+		<ammoClass>CompositeRigidAP</ammoClass>
+		<detonateProjectile>Bullet_75x350mmR_APCR</detonateProjectile>
+	</ThingDef>
+
 	<!-- ================== Projectiles ================== -->
 
 	<ThingDef Name="Base75x350mmRBullet" ParentName="BaseExplosiveBullet" Abstract="true">
@@ -86,32 +103,32 @@
 
 	<ThingDef ParentName="Base75x350mmRBullet">
 		<defName>Bullet_75x350mmR_AP</defName>
-		<label>75x350mmR bullet (AP)</label>
+		<label>75x350mmR cannon shell (AP)</label>
 		<graphicData>
 			<texPath>Things/Projectile/Cannon/AP</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageDef>Bullet</damageDef>
-			<speed>124</speed>
 			<damageAmountBase>206</damageAmountBase>
 			<armorPenetrationSharp>88</armorPenetrationSharp>
 			<armorPenetrationBlunt>24149.06</armorPenetrationBlunt>
+			<speed>124</speed>
 		</projectile>
 	</ThingDef>
 
 	<ThingDef ParentName="Base75x350mmRBullet">
 		<defName>Bullet_75x350mmR_HE</defName>
-		<label>75x350mmR bullet (HE)</label>
+		<label>75x350mmR cannon shell (HE)</label>
 		<graphicData>
 			<texPath>Things/Projectile/Cannon/HEFS</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
 			<damageDef>Bomb</damageDef>
-			<speed>93</speed>
 			<damageAmountBase>104</damageAmountBase>
 			<explosionRadius>2</explosionRadius>
+			<speed>100</speed>
 			<soundExplode>MortarBomb_Explode</soundExplode>
 			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
 		</projectile>
@@ -125,13 +142,30 @@
 		</comps>
 	</ThingDef>
 
+	<ThingDef ParentName="Base75x350mmRBullet">
+		<defName>Bullet_75x350mmR_APCR</defName>
+		<label>75x350mmR cannon shell (APCR)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Cannon/AP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>197</damageAmountBase>
+			<armorPenetrationSharp>154</armorPenetrationSharp>
+			<armorPenetrationBlunt>31047.56</armorPenetrationBlunt>
+			<speed>169</speed>
+		</projectile>
+	</ThingDef>
+
 	<!-- ==================== Recipes ========================== -->
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_75x350mmR_AP</defName>
-		<label>make 75x350mmR (AP) shells x10</label>
-		<description>Craft 10 75x350mmR (AP) shells.</description>
-		<jobString>Making 75x350mmR (AP) shells.</jobString>
+		<label>make 75x350mmR (AP) cannon shells x5</label>
+		<description>Craft 5 75x350mmR (AP) cannon shells.</description>
+		<jobString>Making 75x350mmR (AP) cannon shells.</jobString>
+		<workAmount>10560</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -148,19 +182,16 @@
 			</thingDefs>
 		</fixedIngredientFilter>
 		<products>
-			<Ammo_75x350mmR_AP>10</Ammo_75x350mmR_AP>
+			<Ammo_75x350mmR_AP>5</Ammo_75x350mmR_AP>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>10560</workAmount>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_75x350mmR_HE</defName>
-		<label>make 75x350mmR (HE) cartridge x10</label>
-		<description>Craft 10 75x350mmR (HE) cartridges.</description>
-		<jobString>Making 75x350mmR (HE) cartridges.</jobString>
+		<label>make 75x350mmR (HE) cannon shells x5</label>
+		<description>Craft 5 75x350mmR (HE) cannon shells.</description>
+		<jobString>Making 75x350mmR (HE) cannon shells.</jobString>
+		<workAmount>12400</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -195,12 +226,48 @@
 			</thingDefs>
 		</fixedIngredientFilter>
 		<products>
-			<Ammo_75x350mmR_HE>10</Ammo_75x350mmR_HE>
+			<Ammo_75x350mmR_HE>5</Ammo_75x350mmR_HE>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
+		<defName>MakeAmmo_75x350mmR_APCR</defName>
+		<label>make 75x350mmR (APCR) cannon shells x5</label>
+		<description>Craft 5 75x350mmR (APCR) cannon shells.</description>
+		<jobString>Making 75x350mmR (APCR) cannon shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>CE_AdvancedAmmo</li>
+		</researchPrerequisites>
+		<workAmount>10600</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>48</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>19</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_75x350mmR_APCR>5</Ammo_75x350mmR_APCR>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
-		<workAmount>12400</workAmount>
 	</RecipeDef>
 
 </Defs>
\ No newline at end of file
diff --git a/Defs/Ammo/Shell/762x385mmRCannon.xml b/Defs/Ammo/Shell/762x385mmRCannon.xml
index df59e9aec7..e3f89e027c 100644
--- a/Defs/Ammo/Shell/762x385mmRCannon.xml
+++ b/Defs/Ammo/Shell/762x385mmRCannon.xml
@@ -15,7 +15,9 @@
 		<label>76.2x385mmR Cannon shells</label>
 		<ammoTypes>
 			<Ammo_762x385mmRCannonShell_HEAT>Bullet_762x385mmRCannonShell_HEAT</Ammo_762x385mmRCannonShell_HEAT>
+			<Ammo_762x385mmRCannonShell_AP>Bullet_762x385mmRCannonShell_AP</Ammo_762x385mmRCannonShell_AP>
 			<Ammo_762x385mmRCannonShell_HE>Bullet_762x385mmRCannonShell_HE</Ammo_762x385mmRCannonShell_HE>
+			<Ammo_762x385mmRCannonShell_APCR>Bullet_762x385mmRCannonShell_APCR</Ammo_762x385mmRCannonShell_APCR>
 			<Ammo_762x385mmRCannonShell_EMP>Bullet_762x385mmRCannonShell_EMP</Ammo_762x385mmRCannonShell_EMP>
 		</ammoTypes>
 		<similarTo>AmmoSet_HeavyCannon</similarTo>
@@ -44,7 +46,7 @@
 
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x385mmRCannonShellBase">
 		<defName>Ammo_762x385mmRCannonShell_HEAT</defName>
-		<label>76.2x385mmR Cannon shell (HEAT)</label>
+		<label>76.2x385mmR cannon shell (HEAT)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Cannon/Tank/HEAT</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -56,9 +58,23 @@
 		<detonateProjectile>Bullet_762x385mmRCannonShell_HEAT</detonateProjectile>
 	</ThingDef>
 
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x385mmRCannonShellBase">
+		<defName>Ammo_762x385mmRCannonShell_AP</defName>
+		<label>76.2x385mmR cannon shell (AP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Cannon/Tank/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>36</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<detonateProjectile>Bullet_762x385mmRCannonShell_AP</detonateProjectile>
+	</ThingDef>
+
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x385mmRCannonShellBase">
 		<defName>Ammo_762x385mmRCannonShell_HE</defName>
-		<label>76.2x385mmR Cannon shell (HE)</label>
+		<label>76.2x385mmR cannon shell (HE)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -70,9 +86,24 @@
 		<detonateProjectile>Bullet_762x385mmRCannonShell_HE</detonateProjectile>
 	</ThingDef>
 
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x385mmRCannonShellBase">
+		<defName>Ammo_762x385mmRCannonShell_APCR</defName>
+		<label>76.2x385mmR cannon shell (APCR)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Cannon/Tank/APCR</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<Mass>6.16</Mass>
+			<MarketValue>44.75</MarketValue>
+		</statBases>
+		<ammoClass>CompositeRigidAP</ammoClass>
+		<detonateProjectile>Bullet_762x385mmRCannonShell_APCR</detonateProjectile>
+	</ThingDef>
+
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x385mmRCannonShellBase">
 		<defName>Ammo_762x385mmRCannonShell_EMP</defName>
-		<label>76.2x385mmR Cannon shell (EMP)</label>
+		<label>76.2x385mmR cannon shell (EMP)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Cannon/Tank/EMP</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -101,7 +132,7 @@
 
 	<ThingDef ParentName="Base762x385mmRCannonShell">
 		<defName>Bullet_762x385mmRCannonShell_HEAT</defName>
-		<label>76.2x385mmR Cannon shell (HEAT)</label>
+		<label>76.2x385mmR cannon shell (HEAT)</label>
 		<graphicData>
 			<texPath>Things/Projectile/Cannon/HEAT</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -129,9 +160,20 @@
 		</comps>
 	</ThingDef>
 
+	<ThingDef ParentName="Base40x365mmBoforsBullet">
+		<defName>Bullet_762x385mmRCannonShell_AP</defName>
+		<label>76.2x385mmR cannon shell (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>220</damageAmountBase>
+			<armorPenetrationSharp>110</armorPenetrationSharp>
+			<armorPenetrationBlunt>28668.8</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
 	<ThingDef ParentName="Base762x385mmRCannonShell">
 		<defName>Bullet_762x385mmRCannonShell_HE</defName>
-		<label>76.2x385mmR Cannon shell (HE)</label>
+		<label>76.2x385mmR cannon shell (HE)</label>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<graphicData>
 			<texPath>Things/Projectile/Cannon/HE</texPath>
@@ -154,9 +196,21 @@
 		</comps>
 	</ThingDef>
 
+	<ThingDef ParentName="Base40x365mmBoforsBullet">
+		<defName>Bullet_762x385mmRCannonShell_APCR</defName>
+		<label>76.2x385mmR cannon shell (APCR)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>210</damageAmountBase>
+			<armorPenetrationSharp>192</armorPenetrationSharp>
+			<armorPenetrationBlunt>36830.16</armorPenetrationBlunt>
+			<speed>181</speed>
+		</projectile>
+	</ThingDef>
+
 	<ThingDef ParentName="Base762x385mmRCannonShell">
 		<defName>Bullet_762x385mmRCannonShell_EMP</defName>
-		<label>76.2x385mmR Cannon shell (EMP)</label>
+		<label>76.2x385mmR cannon shell (EMP)</label>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<graphicData>
 			<texPath>Things/Projectile/Cannon/EMP</texPath>
@@ -171,11 +225,16 @@
 
 	<!-- ==================== Recipes ========================== -->
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_762x385mmRCannonShell_HEAT</defName>
-		<label>make 76.2x385mmR HEAT cannon shells x5</label>
-		<description>Craft 5 76.2x385mmR HEAT cannon shells.</description>
-		<jobString>Making 76.2x385mmR HEAT cannon shells.</jobString>
+		<label>make 76.2x385mmR (HEAT) cannon shells x5</label>
+		<description>Craft 5 76.2x385mmR (HEAT) cannon shells.</description>
+		<jobString>Making 76.2x385mmR (HEAT) cannon shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>CE_Launchers</li>
+		</researchPrerequisites>
 		<workAmount>12600</workAmount>
 		<ingredients>
 			<li>
@@ -213,16 +272,39 @@
 		<products>
 			<Ammo_762x385mmRCannonShell_HEAT>5</Ammo_762x385mmRCannonShell_HEAT>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
+		<defName>MakeAmmo_762x385mmRCannonShell_AP</defName>
+		<label>make 76.2x385mmR (AP) cannon shells x5</label>
+		<description>Craft 5 76.2x385mmR (AP) cannon shells.</description>
+		<jobString>Making 76.2x385mmR (AP) cannon shells.</jobString>
+		<workAmount>10800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>90</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x385mmRCannonShell_AP>5</Ammo_762x385mmRCannonShell_AP>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_762x385mmRCannonShell_HE</defName>
-		<label>make 76.2x385mmR HE cannon shells x5</label>
-		<description>Craft 5 76.2x385mmR HE cannon shells.</description>
-		<jobString>Making 76.2x385mmR HE cannon shells.</jobString>
+		<label>make 76.2x385mmR (HE) cannon shells x5</label>
+		<description>Craft 5 76.2x385mmR (HE) cannon shells.</description>
+		<jobString>Making 76.2x385mmR (HE) cannon shells.</jobString>
 		<workAmount>12200</workAmount>
 		<ingredients>
 			<li>
@@ -262,12 +344,56 @@
 		</products>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
+		<defName>MakeAmmo_762x385mmRCannonShell_APCR</defName>
+		<label>make 76.2x385mmR (APCR) cannon shells x5</label>
+		<description>Craft 5 76.2x385mmR (APCR) cannon shells.</description>
+		<jobString>Making 76.2x385mmR (APCR) cannon shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>CE_AdvancedAmmo</li>
+		</researchPrerequisites>
+		<workAmount>11200</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>56</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>18</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x385mmRCannonShell_APCR>5</Ammo_762x385mmRCannonShell_APCR>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_762x385mmRCannonShell_EMP</defName>
-		<label>make 76.2x385mmR EMP cannon shells x5</label>
-		<description>Craft 5 76.2x385mmR EMP cannon shells.</description>
-		<jobString>Making 76.2x385mmR EMP cannon shells.</jobString>
-		<researchPrerequisite>MicroelectronicsBasics</researchPrerequisite>
+		<label>make 76.2x385mmR (EMP) cannon shells x5</label>
+		<description>Craft 5 76.2x385mmR (EMP) cannon shells.</description>
+		<jobString>Making 76.2x385mmR (EMP) cannon shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>MicroelectronicsBasics</li>
+		</researchPrerequisites>
 		<workAmount>13800</workAmount>
 		<ingredients>
 			<li>
@@ -296,9 +422,6 @@
 		<products>
 			<Ammo_762x385mmRCannonShell_EMP>5</Ammo_762x385mmRCannonShell_EMP>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
 </Defs>
\ No newline at end of file
diff --git a/Defs/Ammo/Shell/762x539mmR.xml b/Defs/Ammo/Shell/762x539mmR.xml
index 1e7bbdcfbe..3a98f60de6 100644
--- a/Defs/Ammo/Shell/762x539mmR.xml
+++ b/Defs/Ammo/Shell/762x539mmR.xml
@@ -16,13 +16,14 @@
 		<ammoTypes>
 			<Ammo_762x539mmR_AP>Bullet_762x539mmR_AP</Ammo_762x539mmR_AP>
 			<Ammo_762x539mmR_HE>Bullet_762x539mmR_HE</Ammo_762x539mmR_HE>
+			<Ammo_762x539mmR_APCR>Bullet_762x539mmR_APCR</Ammo_762x539mmR_APCR>
 		</ammoTypes>
 		<similarTo>AmmoSet_LightCannon</similarTo>
 	</CombatExtended.AmmoSetDef>
 
 	<!-- ==================== Ammo ========================== -->
 
-	<ThingDef Class="CombatExtended.AmmoDef" Name="762x539mmRBase" ParentName="AmmoBase" Abstract="True">
+	<ThingDef Class="CombatExtended.AmmoDef" Name="762x539mmRShellBase" ParentName="AmmoBase" Abstract="True">
 		<description>Medium-velocity cannon shell fired by tank destroyer guns.</description>
 		<thingCategories>
 			<li>Ammo762x539mmR</li>
@@ -41,9 +42,9 @@
 		<cookOffSound>MortarBomb_Explode</cookOffSound>
 	</ThingDef>
 
-	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x539mmRBase">
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x539mmRShellBase">
 		<defName>Ammo_762x539mmR_AP</defName>
-		<label>76.2x539mmR Cannon shell (AP)</label>
+		<label>76.2x539mmR cannon shell (AP)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Cannon/Tank/APHE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -55,9 +56,9 @@
 		<detonateProjectile>Bullet_762x539mmR_HE</detonateProjectile>
 	</ThingDef>
 
-	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x539mmRBase">
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x539mmRShellBase">
 		<defName>Ammo_762x539mmR_HE</defName>
-		<label>76.2x539mmR Cannon shell (HE)</label>
+		<label>76.2x539mmR cannon shell (HE)</label>
 		<graphicData>
 			<texPath>Things/Ammo/Cannon/Tank/HE</texPath>
 			<graphicClass>Graphic_StackCount</graphicClass>
@@ -69,9 +70,24 @@
 		<detonateProjectile>Bullet_762x539mmR_HE</detonateProjectile>
 	</ThingDef>
 
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="762x539mmRShellBase">
+		<defName>Ammo_762x539mmR_APCR</defName>
+		<label>76.2x539mmR cannon shell (APCR)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Cannon/Tank/APCR</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<Mass>7.885</Mass>
+			<MarketValue>56.74</MarketValue>
+		</statBases>
+		<ammoClass>CompositeRigidAP</ammoClass>
+		<detonateProjectile>Bullet_762x539mmR_APCR</detonateProjectile>
+	</ThingDef>
+
 	<!-- ================== Projectiles ================== -->
 
-	<ThingDef Name="Base762x539mmR" ParentName="BaseExplosiveBullet" Abstract="true">
+	<ThingDef Name="Base762x539mmRBullet" ParentName="BaseExplosiveBullet" Abstract="true">
 		<graphicData>
 			<shaderType>TransparentPostLight</shaderType>
 		</graphicData>
@@ -84,9 +100,9 @@
 		</projectile>
 	</ThingDef>
 
-	<ThingDef ParentName="Base762x539mmR">
+	<ThingDef ParentName="Base762x539mmRBullet">
 		<defName>Bullet_762x539mmR_AP</defName>
-		<label>76.2x539mmR Cannon shell (AP)</label>
+		<label>76.2x539mmR cannon shell (AP)</label>
 		<graphicData>
 			<texPath>Things/Projectile/Cannon/AP</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -100,9 +116,9 @@
 		</projectile>
 	</ThingDef>
 
-	<ThingDef ParentName="Base762x539mmR">
+	<ThingDef ParentName="Base762x539mmRBullet">
 		<defName>Bullet_762x539mmR_HE</defName>
-		<label>76.2x539mmR Cannon shell (HE)</label>
+		<label>76.2x539mmR cannon shell (HE)</label>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
 		<graphicData>
 			<texPath>Things/Projectile/Cannon/HEFS</texPath>
@@ -125,13 +141,29 @@
 		</comps>
 	</ThingDef>
 
+	<ThingDef ParentName="Base762x539mmRBullet">
+		<defName>Bullet_762x539mmR_APCR</defName>
+		<label>75x350mmR cannon shell (APCR)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Cannon/AP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>247</damageAmountBase>
+			<armorPenetrationSharp>231</armorPenetrationSharp>
+			<armorPenetrationBlunt>58776.16</armorPenetrationBlunt>
+			<speed>208</speed>
+		</projectile>
+	</ThingDef>
+
 	<!-- ==================== Recipes ========================== -->
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_762x539mmR_AP</defName>
-		<label>make 76.2x539mmR AP cannon shells x5</label>
-		<description>Craft 5 76.2x539mmR AP cannon shells.</description>
-		<jobString>Making 76.2x539mmR AP cannon shells.</jobString>
+		<label>make 76.2x539mmR (AP) cannon shells x5</label>
+		<description>Craft 5 76.2x539mmR (AP) cannon shells.</description>
+		<jobString>Making 76.2x539mmR (AP) cannon shells.</jobString>
 		<workAmount>12960</workAmount>
 		<ingredients>
 			<li>
@@ -151,16 +183,13 @@
 		<products>
 			<Ammo_762x539mmR_AP>5</Ammo_762x539mmR_AP>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_762x539mmR_HE</defName>
-		<label>make 76.2x539mmR HE cannon shells x5</label>
-		<description>Craft 5 76.2x539mmR HE cannon shells.</description>
-		<jobString>Making 76.2x539mmR HE cannon shells.</jobString>
+		<label>make 76.2x539mmR (HE) cannon shells x5</label>
+		<description>Craft 5 76.2x539mmR (HE) cannon shells.</description>
+		<jobString>Making 76.2x539mmR (HE) cannon shells.</jobString>
 		<workAmount>13200</workAmount>
 		<ingredients>
 			<li>
@@ -200,4 +229,44 @@
 		</products>
 	</RecipeDef>
 
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
+		<defName>MakeAmmo_762x539mmR_APCR</defName>
+		<label>make 76.2x539mmR (APCR) cannon shells x5</label>
+		<description>Craft 5 76.2x539mmR (APCR) cannon shells.</description>
+		<jobString>Making 76.2x539mmR (APCR) cannon shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>CE_AdvancedAmmo</li>
+		</researchPrerequisites>
+		<workAmount>14000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>80</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>20</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_762x539mmR_APCR>5</Ammo_762x539mmR_APCR>
+		</products>
+	</RecipeDef>
+
 </Defs>
\ No newline at end of file
diff --git a/Defs/Ammo/Shell/81mmMortar.xml b/Defs/Ammo/Shell/81mmMortar.xml
index ad2b6bc1bd..49b31aebfb 100644
--- a/Defs/Ammo/Shell/81mmMortar.xml
+++ b/Defs/Ammo/Shell/81mmMortar.xml
@@ -1,738 +1,732 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Defs>
 
-  <ThingCategoryDef>
-    <defName>Ammo81mmMortarShells</defName>
-    <label>81mm mortar shell</label>
-    <parent>AmmoShells</parent>
-    <iconPath>UI/Icons/ThingCategories/CaliberMortar</iconPath>
-  </ThingCategoryDef>
-
-  <!-- ==================== AmmoSet ========================== -->
-
-  <CombatExtended.AmmoSetDef>
-    <defName>AmmoSet_81mmMortarShell</defName>
-    <label>81mm mortar shells</label>
-    <ammoTypes>
-      <!-- Overrides vanilla artillery shell -->
-      <Shell_HighExplosive>Bullet_81mmMortarShell_HE</Shell_HighExplosive>
-      <Shell_HighExplosive_HFuzed>Bullet_81mmMortarShell_HE_HFuzed</Shell_HighExplosive_HFuzed>
-      <Shell_Incendiary>Bullet_81mmMortarShell_Incendiary</Shell_Incendiary>
-      <Shell_EMP>Bullet_81mmMortarShell_EMP</Shell_EMP>
-      <Shell_Firefoam>Bullet_81mmMortarShell_Firefoam</Shell_Firefoam>
-      <Shell_Smoke>Bullet_81mmMortarShell_Smoke</Shell_Smoke>
-      <Shell_AntigrainWarhead>Bullet_81mmMortarShell_Antigrain</Shell_AntigrainWarhead>
-      <Shell_Toxic MayRequire="Ludeon.RimWorld.Biotech">Bullet_81mmMortarShell_Tox</Shell_Toxic>
-    </ammoTypes>
-    <isMortarAmmoSet>true</isMortarAmmoSet>
-  </CombatExtended.AmmoSetDef>
-
-  <!-- ==================== Ammo ========================== -->
-
-  <ThingDef Class="CombatExtended.AmmoDef" Name="81mmMortarShellBase" ParentName="HeavyAmmoBase" Abstract="True">
-    <description>Low-velocity shell designed to be fired from a mortar.</description>
-    <statBases>
-      <MaxHitPoints>200</MaxHitPoints>
-    </statBases>
-    <thingCategories>
-      <li>Ammo81mmMortarShells</li>
-    </thingCategories>
-    <stackLimit>25</stackLimit>
-    <cookOffFlashScale>30</cookOffFlashScale>
-    <cookOffSound>MortarBomb_Explode</cookOffSound>
-    <isMortarAmmo>true</isMortarAmmo>
-  </ThingDef>
-
-  <ThingDef Class="CombatExtended.AmmoDef" Name="81mmMortarShellBaseCraftableBase" ParentName="81mmMortarShellBase" Abstract="True">
-    <tradeTags>
-      <li>CE_AutoEnableTrade</li>
-      <li>CE_AutoEnableCrafting_TableMachining</li>
-    </tradeTags>
-  </ThingDef>
-
-  <!-- Need to override mortar shell because of hardcoded vanilla references -->
-  <ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
-    <defName>Shell_HighExplosive</defName>
-    <label>81mm mortar shell (HE)</label>
-    <graphicData>
-      <texPath>Things/Ammo/Mortar/HE</texPath>
-      <graphicClass>Graphic_StackCount</graphicClass>
-    </graphicData>
-    <statBases>
-      <MarketValue>50.09</MarketValue>
-      <Mass>5.27</Mass>
-      <Bulk>8.17</Bulk>
-    </statBases>
-    <ammoClass>GrenadeHE</ammoClass>
-    <detonateProjectile>Bullet_81mmMortarShell_HE</detonateProjectile>
-  </ThingDef>
-
-  <ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
-    <defName>Shell_HighExplosive_HFuzed</defName>
-    <label>81mm mortar shell (Airburst)</label>
-    <graphicData>
-      <texPath>Things/Ammo/Mortar/Airburst</texPath>
-      <graphicClass>Graphic_StackCount</graphicClass>
-    </graphicData>
-    <statBases>
-      <MarketValue>63.09</MarketValue>
-      <Mass>5.27</Mass>
-      <Bulk>8.17</Bulk>
-    </statBases>
-    <ammoClass>GrenadeHETF</ammoClass>
-    <detonateProjectile>Bullet_81mmMortarShell_HE</detonateProjectile>
-  </ThingDef>
-
-  <ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
-    <defName>Shell_Incendiary</defName>
-    <label>81mm mortar shell (Incendiary)</label>
-    <graphicData>
-      <texPath>Things/Ammo/Mortar/Incendiary</texPath>
-      <graphicClass>Graphic_StackCount</graphicClass>
-    </graphicData>
-    <statBases>
-      <MarketValue>42.34</MarketValue>
-      <Mass>5.65</Mass>
-      <Bulk>9.0</Bulk>
-    </statBases>
-    <ammoClass>GrenadeIncendiary</ammoClass>
-    <detonateProjectile>Bullet_81mmMortarShell_Incendiary</detonateProjectile>
-  </ThingDef>
-
-  <ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
-    <defName>Shell_EMP</defName>
-    <label>81mm mortar shell (EMP)</label>
-    <graphicData>
-      <texPath>Things/Ammo/Mortar/EMP</texPath>
-      <graphicClass>Graphic_StackCount</graphicClass>
-    </graphicData>
-    <statBases>
-      <MarketValue>112.42</MarketValue>
-      <Mass>5.27</Mass>
-      <Bulk>8.17</Bulk>
-    </statBases>
-    <ammoClass>GrenadeEMP</ammoClass>
-    <detonateProjectile>Bullet_81mmMortarShell_EMP</detonateProjectile>
-  </ThingDef>
-
-  <ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
-    <defName>Shell_Firefoam</defName>
-    <label>81mm mortar shell (Foam)</label>
-    <graphicData>
-      <texPath>Things/Ammo/Mortar/Firefoam</texPath>
-      <graphicClass>Graphic_StackCount</graphicClass>
-    </graphicData>
-    <statBases>
-      <MarketValue>37.03</MarketValue>
-      <Mass>4.1</Mass>
-      <Bulk>10.01</Bulk>
-    </statBases>
-    <ammoClass>FoamFuel</ammoClass>
-    <detonateProjectile>Bullet_81mmMortarShell_Firefoam</detonateProjectile>
-  </ThingDef>
-
-  <ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
-    <defName>Shell_Smoke</defName>
-    <label>81mm mortar shell (Smoke)</label>
-    <graphicData>
-      <texPath>Things/Ammo/Mortar/Smoke</texPath>
-      <graphicClass>Graphic_StackCount</graphicClass>
-    </graphicData>
-    <statBases>
-      <MarketValue>37.03</MarketValue>
-      <Mass>4.1</Mass>
-      <Bulk>10.01</Bulk>
-    </statBases>
-    <ammoClass>Smoke</ammoClass>
-    <detonateProjectile>Bullet_81mmMortarShell_Smoke</detonateProjectile>
-  </ThingDef>
-
-  <ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBase">
-    <defName>Shell_AntigrainWarhead</defName>
-    <label>81mm mortar shell (Anti)</label>
-    <graphicData>
-      <texPath>Things/Ammo/Mortar/Antigrain</texPath>
-      <graphicClass>Graphic_StackCount</graphicClass>
-    </graphicData>
-    <statBases>
-      <MarketValue>1500</MarketValue>
-      <Mass>6.5</Mass>
-      <Bulk>6</Bulk>
-    </statBases>
-    <thingSetMakerTags>
-      <li>RewardStandardCore</li>
-    </thingSetMakerTags>
-    <tradeTags>
-      <li>CE_AutoEnableTrade_Sellable</li>
-    </tradeTags>
-    <ammoClass>Antigrain</ammoClass>
-    <comps>
-      <!-- Vanilla values -->
-      <li Class="CompProperties_Explosive">
-        <explosiveRadius>14.9</explosiveRadius>
-        <explosiveDamageType>BombSuper</explosiveDamageType>
-        <startWickHitPointsPercent>0.7</startWickHitPointsPercent>
-        <chanceToStartFire>0.22</chanceToStartFire>
-        <damageFalloff>true</damageFalloff>
-        <explosionEffect>GiantExplosion</explosionEffect>
-        <explosionSound>Explosion_GiantBomb</explosionSound>
-        <wickTicks>60~120</wickTicks>
-        <explodeOnKilled>True</explodeOnKilled>
-        <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-      </li>
-    </comps>
-  </ThingDef>
-
-  <ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase" MayRequire="Ludeon.RimWorld.Biotech">
-    <defName>Shell_Toxic</defName>
-    <label>81mm mortar shell (Toxic)</label>
-    <graphicData>
-      <texPath>Things/Ammo/Mortar/Toxic</texPath>
-      <graphicClass>Graphic_StackCount</graphicClass>
-    </graphicData>
-    <statBases>
-      <MarketValue>37.03</MarketValue>
-      <Mass>4.1</Mass>
-      <Bulk>10.01</Bulk>
-    </statBases>
-    <ammoClass>Toxic</ammoClass>
-    <detonateProjectile>Bullet_81mmMortarShell_Tox</detonateProjectile>
-  </ThingDef>
-
-  <!-- ================== Projectiles ================== -->
-
-  <ThingDef Name="Base81mmMortarShell" ParentName="BaseExplosiveBullet" Abstract="true">
-    <thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-    <graphicData>
-      <shaderType>TransparentPostLight</shaderType>
-    </graphicData>
-    <projectile Class="CombatExtended.ProjectilePropertiesCE">
-      <speed>0</speed>
-      <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-      <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-      <soundAmbient>MortarRound_Ambient</soundAmbient>
-      <flyOverhead>true</flyOverhead>
-      <dropsCasings>false</dropsCasings>
-      <gravityFactor>5</gravityFactor>
-      <shellingProps>
-        <iconPath>Things/WorldObjects/Munitions/Mortar</iconPath>
-        <tilesPerTick>0.06</tilesPerTick>
-        <range>10</range>
-      </shellingProps>
-    </projectile>
-  </ThingDef>
-
-  <ThingDef ParentName="Base81mmMortarShell">
-    <defName>Bullet_81mmMortarShell_HE</defName>
-    <label>81mm mortar shell (HE)</label>
-    <graphicData>
-      <texPath>Things/Projectile/Mortar/HE</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <projectile Class="CombatExtended.ProjectilePropertiesCE">
-      <damageDef>Bomb</damageDef>
-      <damageAmountBase>156</damageAmountBase>
-      <explosionRadius>2.5</explosionRadius>
-      <flyOverhead>true</flyOverhead>
-      <soundExplode>MortarBomb_Explode</soundExplode>
-      <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-      <ai_IsIncendiary>true</ai_IsIncendiary>
-    </projectile>
-    <comps>
-      <li Class="CombatExtended.CompProperties_Fragments">
-        <fragments>
-          <Fragment_Large>16</Fragment_Large>
-          <Fragment_Small>25</Fragment_Small>
-        </fragments>
-      </li>
-    </comps>
-  </ThingDef>
-
-  <ThingDef ParentName="Base81mmMortarShell">
-    <defName>Bullet_81mmMortarShell_HE_HFuzed</defName>
-    <label>81mm mortar shell (Airburst)</label>
-    <thingClass>CombatExtended.ProjectileCE_HeightFuse</thingClass>
-    <graphicData>
-      <texPath>Things/Projectile/Mortar/Airburst</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <projectile Class="CombatExtended.ProjectilePropertiesCE">
-      <damageDef>Smoke</damageDef>
-      <damageAmountBase>0</damageAmountBase>
-      <explosionRadius>1</explosionRadius>
-      <flyOverhead>true</flyOverhead>
-      <soundExplode>MortarBomb_Explode</soundExplode>
-      <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-      <ai_IsIncendiary>true</ai_IsIncendiary>
-      <aimHeightOffset>8</aimHeightOffset>
+	<ThingCategoryDef>
+		<defName>Ammo81mmMortarShells</defName>
+		<label>81mm mortar shell</label>
+		<parent>AmmoShells</parent>
+		<iconPath>UI/Icons/ThingCategories/CaliberMortar</iconPath>
+	</ThingCategoryDef>
+
+	<!-- ==================== AmmoSet ========================== -->
+
+	<CombatExtended.AmmoSetDef>
+		<defName>AmmoSet_81mmMortarShell</defName>
+		<label>81mm mortar shells</label>
+		<ammoTypes>
+			<!-- Overrides vanilla artillery shell -->
+			<Shell_HighExplosive>Bullet_81mmMortarShell_HE</Shell_HighExplosive>
+			<Shell_HighExplosive_HFuzed>Bullet_81mmMortarShell_HE_HFuzed</Shell_HighExplosive_HFuzed>
+			<Shell_Incendiary>Bullet_81mmMortarShell_Incendiary</Shell_Incendiary>
+			<Shell_EMP>Bullet_81mmMortarShell_EMP</Shell_EMP>
+			<Shell_Firefoam>Bullet_81mmMortarShell_Firefoam</Shell_Firefoam>
+			<Shell_Smoke>Bullet_81mmMortarShell_Smoke</Shell_Smoke>
+			<Shell_AntigrainWarhead>Bullet_81mmMortarShell_Antigrain</Shell_AntigrainWarhead>
+			<Shell_Toxic MayRequire="Ludeon.RimWorld.Biotech">Bullet_81mmMortarShell_Tox</Shell_Toxic>
+		</ammoTypes>
+		<isMortarAmmoSet>true</isMortarAmmoSet>
+	</CombatExtended.AmmoSetDef>
+
+	<!-- ==================== Ammo ========================== -->
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="81mmMortarShellBase" ParentName="HeavyAmmoBase" Abstract="True">
+		<description>Low-velocity shell designed to be fired from a mortar.</description>
+		<statBases>
+			<MaxHitPoints>200</MaxHitPoints>
+		</statBases>
+		<thingCategories>
+			<li>Ammo81mmMortarShells</li>
+		</thingCategories>
+		<stackLimit>25</stackLimit>
+		<cookOffFlashScale>30</cookOffFlashScale>
+		<cookOffSound>MortarBomb_Explode</cookOffSound>
+		<isMortarAmmo>true</isMortarAmmo>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" Name="81mmMortarShellBaseCraftableBase" ParentName="81mmMortarShellBase" Abstract="True">
+		<tradeTags>
+			<li>CE_AutoEnableTrade</li>
+			<li>CE_AutoEnableCrafting_TableMachining</li>
+		</tradeTags>
+	</ThingDef>
+
+	<!-- Need to override mortar shell because of hardcoded vanilla references -->
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
+		<defName>Shell_HighExplosive</defName>
+		<label>81mm mortar shell (HE)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Mortar/HE</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>50.09</MarketValue>
+			<Mass>5.27</Mass>
+			<Bulk>8.17</Bulk>
+		</statBases>
+		<ammoClass>GrenadeHE</ammoClass>
+		<detonateProjectile>Bullet_81mmMortarShell_HE</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
+		<defName>Shell_HighExplosive_HFuzed</defName>
+		<label>81mm mortar shell (Airburst)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Mortar/Airburst</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>63.09</MarketValue>
+			<Mass>5.27</Mass>
+			<Bulk>8.17</Bulk>
+		</statBases>
+		<ammoClass>GrenadeHETF</ammoClass>
+		<detonateProjectile>Bullet_81mmMortarShell_HE</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
+		<defName>Shell_Incendiary</defName>
+		<label>81mm mortar shell (Incendiary)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Mortar/Incendiary</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>42.34</MarketValue>
+			<Mass>5.65</Mass>
+			<Bulk>9.0</Bulk>
+		</statBases>
+		<ammoClass>GrenadeIncendiary</ammoClass>
+		<detonateProjectile>Bullet_81mmMortarShell_Incendiary</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
+		<defName>Shell_EMP</defName>
+		<label>81mm mortar shell (EMP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Mortar/EMP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>112.42</MarketValue>
+			<Mass>5.27</Mass>
+			<Bulk>8.17</Bulk>
+		</statBases>
+		<ammoClass>GrenadeEMP</ammoClass>
+		<detonateProjectile>Bullet_81mmMortarShell_EMP</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
+		<defName>Shell_Firefoam</defName>
+		<label>81mm mortar shell (Foam)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Mortar/Firefoam</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>37.03</MarketValue>
+			<Mass>4.1</Mass>
+			<Bulk>10.01</Bulk>
+		</statBases>
+		<ammoClass>FoamFuel</ammoClass>
+		<detonateProjectile>Bullet_81mmMortarShell_Firefoam</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase">
+		<defName>Shell_Smoke</defName>
+		<label>81mm mortar shell (Smoke)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Mortar/Smoke</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>37.03</MarketValue>
+			<Mass>4.1</Mass>
+			<Bulk>10.01</Bulk>
+		</statBases>
+		<ammoClass>Smoke</ammoClass>
+		<detonateProjectile>Bullet_81mmMortarShell_Smoke</detonateProjectile>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBase">
+		<defName>Shell_AntigrainWarhead</defName>
+		<label>81mm mortar shell (Anti)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Mortar/Antigrain</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>1500</MarketValue>
+			<Mass>6.5</Mass>
+			<Bulk>6</Bulk>
+		</statBases>
+		<thingSetMakerTags>
+			<li>RewardStandardCore</li>
+		</thingSetMakerTags>
+		<tradeTags>
+			<li>CE_AutoEnableTrade_Sellable</li>
+		</tradeTags>
+		<ammoClass>Antigrain</ammoClass>
+		<comps>
+			<!-- Vanilla values -->
+			<li Class="CompProperties_Explosive">
+				<explosiveRadius>14.9</explosiveRadius>
+				<explosiveDamageType>BombSuper</explosiveDamageType>
+				<startWickHitPointsPercent>0.7</startWickHitPointsPercent>
+				<chanceToStartFire>0.22</chanceToStartFire>
+				<damageFalloff>true</damageFalloff>
+				<explosionEffect>GiantExplosion</explosionEffect>
+				<explosionSound>Explosion_GiantBomb</explosionSound>
+				<wickTicks>60~120</wickTicks>
+				<explodeOnKilled>True</explodeOnKilled>
+				<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="81mmMortarShellBaseCraftableBase" MayRequire="Ludeon.RimWorld.Biotech">
+		<defName>Shell_Toxic</defName>
+		<label>81mm mortar shell (Toxic)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Mortar/Toxic</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>37.03</MarketValue>
+			<Mass>4.1</Mass>
+			<Bulk>10.01</Bulk>
+		</statBases>
+		<ammoClass>Toxic</ammoClass>
+		<detonateProjectile>Bullet_81mmMortarShell_Tox</detonateProjectile>
+	</ThingDef>
+
+	<!-- ================== Projectiles ================== -->
+
+	<ThingDef Name="Base81mmMortarShell" ParentName="BaseExplosiveBullet" Abstract="true">
+		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+		<graphicData>
+			<shaderType>TransparentPostLight</shaderType>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<speed>0</speed>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+			<flyOverhead>true</flyOverhead>
+			<dropsCasings>false</dropsCasings>
+			<gravityFactor>5</gravityFactor>
+			<shellingProps>
+				<iconPath>Things/WorldObjects/Munitions/Mortar</iconPath>
+				<tilesPerTick>0.06</tilesPerTick>
+				<range>10</range>
+			</shellingProps>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base81mmMortarShell">
+		<defName>Bullet_81mmMortarShell_HE</defName>
+		<label>81mm mortar shell (HE)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/HE</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bomb</damageDef>
+			<damageAmountBase>156</damageAmountBase>
+			<explosionRadius>2.5</explosionRadius>
+			<flyOverhead>true</flyOverhead>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>16</Fragment_Large>
+					<Fragment_Small>25</Fragment_Small>
+				</fragments>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base81mmMortarShell">
+		<defName>Bullet_81mmMortarShell_HE_HFuzed</defName>
+		<label>81mm mortar shell (Airburst)</label>
+		<thingClass>CombatExtended.ProjectileCE_HeightFuse</thingClass>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/Airburst</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Smoke</damageDef>
+			<damageAmountBase>0</damageAmountBase>
+			<explosionRadius>1</explosionRadius>
+			<flyOverhead>true</flyOverhead>
+			<soundExplode>MortarBomb_Explode</soundExplode>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<ai_IsIncendiary>true</ai_IsIncendiary>
+			<aimHeightOffset>8</aimHeightOffset>
 			<shellingProps>
 				<damage>0.013</damage>
 			</shellingProps>
-    </projectile>
-    <comps>
-      <li Class="CombatExtended.CompProperties_Fragments">
-        <fragments>
-          <Fragment_Large>12</Fragment_Large>
-          <Fragment_Small>24</Fragment_Small>
-        </fragments>
-        <fragAngleRange>-90~-48</fragAngleRange>
-      </li>
-    </comps>
-  </ThingDef>
-
-  <ThingDef ParentName="Base81mmMortarShell">
-    <defName>Bullet_81mmMortarShell_Incendiary</defName>
-    <label>81mm mortar shell (Incendiary)</label>
-    <graphicData>
-      <texPath>Things/Projectile/Mortar/Incendiary</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <projectile Class="CombatExtended.ProjectilePropertiesCE">
-      <damageDef>PrometheumFlame</damageDef>
-      <damageAmountBase>11</damageAmountBase>
-      <explosionRadius>6.5</explosionRadius>
-      <flyOverhead>true</flyOverhead>
-      <preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
-      <preExplosionSpawnChance>0.15</preExplosionSpawnChance>
-      <soundExplode>MortarIncendiary_Explode</soundExplode>
-    </projectile>
-  </ThingDef>
-
-  <ThingDef ParentName="Base81mmMortarShell">
-    <defName>Bullet_81mmMortarShell_EMP</defName>
-    <label>81mm mortar shell (EMP)</label>
-    <graphicData>
-      <texPath>Things/Projectile/Mortar/EMP</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <projectile Class="CombatExtended.ProjectilePropertiesCE">
-      <damageDef>EMP</damageDef>
-      <damageAmountBase>156</damageAmountBase>
-      <flyOverhead>true</flyOverhead>
-      <explosionRadius>5.5</explosionRadius>
-    </projectile>
-  </ThingDef>
-
-  <ThingDef ParentName="Base81mmMortarShell">
-    <defName>Bullet_81mmMortarShell_Firefoam</defName>
-    <label>81mm mortar shell (Foam)</label>
-    <graphicData>
-      <texPath>Things/Projectile/Mortar/Firefoam</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <projectile Class="CombatExtended.ProjectilePropertiesCE">
-      <damageDef>Extinguish</damageDef>
-      <suppressionFactor>0.0</suppressionFactor>
-      <dangerFactor>0.0</dangerFactor>
-      <explosionRadius>5</explosionRadius>
-      <flyOverhead>true</flyOverhead>
-      <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-      <soundExplode>Explosion_EMP</soundExplode>
-      <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-      <soundAmbient>MortarRound_Ambient</soundAmbient>
-      <postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
-      <postExplosionSpawnChance>1</postExplosionSpawnChance>
-      <postExplosionSpawnThingCount>3</postExplosionSpawnThingCount>
-      <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-      <explosionEffect>ExtinguisherExplosion</explosionEffect>
-    </projectile>
-  </ThingDef>
-
-  <ThingDef ParentName="Base81mmMortarShell">
-    <defName>Bullet_81mmMortarShell_Smoke</defName>
-    <label>81mm mortar shell (Smoke)</label>
-    <graphicData>
-      <texPath>Things/Projectile/Mortar/Smoke</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <projectile Class="CombatExtended.ProjectilePropertiesCE">
-      <damageDef>Smoke</damageDef>
-      <suppressionFactor>0.0</suppressionFactor>
-      <dangerFactor>0.0</dangerFactor>
-      <explosionRadius>6</explosionRadius>
-      <flyOverhead>true</flyOverhead>
-      <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-      <soundExplode>Explosion_EMP</soundExplode>
-      <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-      <soundAmbient>MortarRound_Ambient</soundAmbient>
-      <postExplosionGasType>BlindSmoke</postExplosionGasType>
-      <preExplosionSpawnChance>1</preExplosionSpawnChance>
-      <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-      <explosionEffect>ExtinguisherExplosion</explosionEffect>
-    </projectile>
-  </ThingDef>
-
-  <ThingDef ParentName="Base81mmMortarShell">
-    <defName>Bullet_81mmMortarShell_Antigrain</defName>
-    <label>81mm mortar shell (Anti)</label>
-    <graphicData>
-      <texPath>Things/Projectile/Mortar/Antigrain</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <projectile Class="CombatExtended.ProjectilePropertiesCE">
-      <damageDef>BombSuper</damageDef>
-      <explosionRadius>50</explosionRadius>
-      <explosionChanceToStartFire>0.22</explosionChanceToStartFire>
-      <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
-      <flyOverhead>true</flyOverhead>
-      <explosionEffect>GiantExplosion</explosionEffect>
-      <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-      <soundExplode>Explosion_GiantBomb</soundExplode>
-      <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-      <soundAmbient>MortarRound_Ambient</soundAmbient>
-      <shellingProps>
-        <damage>0.85</damage>
-      </shellingProps>
-    </projectile>
-  </ThingDef>
-
-  <ThingDef ParentName="Base81mmMortarShell" MayRequire="Ludeon.RimWorld.Biotech">
-    <defName>Bullet_81mmMortarShell_Tox</defName>
-    <label>81mm mortar shell (Toxic)</label>
-    <graphicData>
-      <texPath>Things/Projectile/Mortar/Toxic</texPath>
-      <graphicClass>Graphic_Single</graphicClass>
-    </graphicData>
-    <projectile Class="CombatExtended.ProjectilePropertiesCE">
-      <damageDef>ToxGas</damageDef>
-      <armorPenetrationSharp>0</armorPenetrationSharp>
-      <armorPenetrationBlunt>0</armorPenetrationBlunt>
-      <explosionRadius>0.1</explosionRadius>
-      <flyOverhead>true</flyOverhead>
-      <soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
-      <soundExplode>ToxicShellLanded</soundExplode>
-      <soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
-      <soundAmbient>MortarRound_Ambient</soundAmbient>
-      <postExplosionSpawnThingDef>Shell_Toxic_Releasing</postExplosionSpawnThingDef>
-      <postExplosionSpawnThingDefWater>Shell_Toxic_Releasing_Water</postExplosionSpawnThingDefWater>
-    </projectile>
-  </ThingDef>
-
-  <!-- ==================== Recipes ========================== -->
-
-  <RecipeDef ParentName="AmmoRecipeBase">
-    <defName>MakeShell_HighExplosive</defName>
-    <label>make 81mm HE mortar shells x5</label>
-    <description>Craft 5 81mm HE mortar shells.</description>
-    <jobString>Making 81mm HE mortar shells.</jobString>
-    <ingredients>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>Steel</li>
-          </thingDefs>
-        </filter>
-        <count>54</count>
-      </li>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>FSX</li>
-          </thingDefs>
-        </filter>
-        <count>10</count>
-      </li>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>ComponentIndustrial</li>
-          </thingDefs>
-        </filter>
-        <count>2</count>
-      </li>
-    </ingredients>
-    <fixedIngredientFilter>
-      <thingDefs>
-        <li>Steel</li>
-        <li>FSX</li>
-        <li>ComponentIndustrial</li>
-      </thingDefs>
-    </fixedIngredientFilter>
-    <products>
-      <Shell_HighExplosive>5</Shell_HighExplosive>
-    </products>
-    <skillRequirements>
-      <Crafting>4</Crafting>
-    </skillRequirements>
-    <workAmount>10600</workAmount>
-  </RecipeDef>
-
-  <RecipeDef ParentName="AmmoRecipeBase">
-    <defName>MakeShell_HighExplosive_HFuzed</defName>
-    <label>make 81mm airburst mortar shells x5</label>
-    <description>Craft 5 81mm airburst mortar shells.</description>
-    <jobString>Making 81mm airburst mortar shells.</jobString>
-    <ingredients>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>Steel</li>
-          </thingDefs>
-        </filter>
-        <count>54</count>
-      </li>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>FSX</li>
-          </thingDefs>
-        </filter>
-        <count>10</count>
-      </li>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>ComponentIndustrial</li>
-          </thingDefs>
-        </filter>
-        <count>4</count>
-      </li>
-    </ingredients>
-    <fixedIngredientFilter>
-      <thingDefs>
-        <li>Steel</li>
-        <li>FSX</li>
-        <li>ComponentIndustrial</li>
-      </thingDefs>
-    </fixedIngredientFilter>
-    <products>
-      <Shell_HighExplosive_HFuzed>5</Shell_HighExplosive_HFuzed>
-    </products>
-    <skillRequirements>
-      <Crafting>5</Crafting>
-    </skillRequirements>
-    <workAmount>11800</workAmount>
-  </RecipeDef>
-
-  <RecipeDef ParentName="AmmoRecipeBase">
-    <defName>MakeShell_Incendiary</defName>
-    <label>make 81mm incendiary mortar shells x5</label>
-    <description>Craft 5 81mm incendiary mortar shells.</description>
-    <jobString>Making 81mm incendiary mortar shells.</jobString>
-    <ingredients>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>Steel</li>
-          </thingDefs>
-        </filter>
-        <count>58</count>
-      </li>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>Prometheum</li>
-          </thingDefs>
-        </filter>
-        <count>5</count>
-      </li>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>ComponentIndustrial</li>
-          </thingDefs>
-        </filter>
-        <count>2</count>
-      </li>
-    </ingredients>
-    <fixedIngredientFilter>
-      <thingDefs>
-        <li>Steel</li>
-        <li>Prometheum</li>
-        <li>ComponentIndustrial</li>
-      </thingDefs>
-    </fixedIngredientFilter>
-    <products>
-      <Shell_Incendiary>5</Shell_Incendiary>
-    </products>
-    <skillRequirements>
-      <Crafting>4</Crafting>
-    </skillRequirements>
-    <workAmount>9000</workAmount>
-  </RecipeDef>
-
-  <RecipeDef ParentName="AmmoRecipeBase">
-    <defName>MakeShell_EMP</defName>
-    <label>make 81mm EMP mortar shells x5</label>
-    <description>Craft 5 81mm EMP mortar shells.</description>
-    <jobString>Making 81mm EMP mortar shells.</jobString>
-    <researchPrerequisite>MicroelectronicsBasics</researchPrerequisite>
-    <ingredients>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>Steel</li>
-          </thingDefs>
-        </filter>
-        <count>54</count>
-      </li>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>ComponentIndustrial</li>
-          </thingDefs>
-        </filter>
-        <count>14</count>
-      </li>
-    </ingredients>
-    <fixedIngredientFilter>
-      <thingDefs>
-        <li>Steel</li>
-        <li>ComponentIndustrial</li>
-      </thingDefs>
-    </fixedIngredientFilter>
-    <products>
-      <Shell_EMP>5</Shell_EMP>
-    </products>
-    <skillRequirements>
-      <Crafting>4</Crafting>
-    </skillRequirements>
-    <workAmount>13800</workAmount>
-  </RecipeDef>
-
-  <RecipeDef ParentName="AmmoRecipeBase">
-    <defName>MakeShell_Firefoam</defName>
-    <label>make 81mm firefoam mortar shells x5</label>
-    <description>Craft 5 81mm firefoam mortar shells.</description>
-    <jobString>Making 81mm firefoam mortar shells.</jobString>
-    <researchPrerequisite>Firefoam</researchPrerequisite>
-    <ingredients>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>Steel</li>
-          </thingDefs>
-        </filter>
-        <count>42</count>
-      </li>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>ComponentIndustrial</li>
-          </thingDefs>
-        </filter>
-        <count>2</count>
-      </li>
-      <li>
-        <filter>
-          <categories>
-            <li>MeatRaw</li>
-          </categories>
-        </filter>
-        <count>17</count>
-      </li>
-    </ingredients>
-    <fixedIngredientFilter>
-      <thingDefs>
-        <li>Steel</li>
-        <li>ComponentIndustrial</li>
-      </thingDefs>
-      <categories>
-        <li>MeatRaw</li>
-      </categories>
-    </fixedIngredientFilter>
-    <products>
-      <Shell_Firefoam>5</Shell_Firefoam>
-    </products>
-    <skillRequirements>
-      <Crafting>4</Crafting>
-    </skillRequirements>
-    <workAmount>8800</workAmount>
-  </RecipeDef>
-
-  <RecipeDef ParentName="AmmoRecipeBase">
-    <defName>MakeShell_Smoke</defName>
-    <label>make 81mm smoke mortar shells x5</label>
-    <description>Craft 5 81mm smoke mortar shells.</description>
-    <jobString>Making 81mm smoke mortar shells.</jobString>
-    <ingredients>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>Steel</li>
-          </thingDefs>
-        </filter>
-        <count>42</count>
-      </li>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>ComponentIndustrial</li>
-          </thingDefs>
-        </filter>
-        <count>2</count>
-      </li>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>Prometheum</li>
-          </thingDefs>
-        </filter>
-        <count>2</count>
-      </li>
-    </ingredients>
-    <fixedIngredientFilter>
-      <thingDefs>
-        <li>Steel</li>
-        <li>Prometheum</li>
-        <li>ComponentIndustrial</li>
-      </thingDefs>
-    </fixedIngredientFilter>
-    <products>
-      <Shell_Smoke>5</Shell_Smoke>
-    </products>
-    <skillRequirements>
-      <Crafting>4</Crafting>
-    </skillRequirements>
-    <workAmount>6600</workAmount>
-  </RecipeDef>
-
-  <RecipeDef ParentName="AmmoRecipeBase" MayRequire="Ludeon.RimWorld.Biotech">
-    <defName>MakeShell_Toxic</defName>
-    <label>make 81mm tox mortar shells x5</label>
-    <description>Craft 5 81mm tox mortar shells.</description>
-    <jobString>Making 81mm tox mortar shells.</jobString>
-    <researchPrerequisite>ToxGas</researchPrerequisite>
-    <ingredients>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>Steel</li>
-          </thingDefs>
-        </filter>
-        <count>42</count>
-      </li>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>ComponentIndustrial</li>
-          </thingDefs>
-        </filter>
-        <count>2</count>
-      </li>
-      <li>
-        <filter>
-          <thingDefs>
-            <li>Prometheum</li>
-          </thingDefs>
-        </filter>
-        <count>2</count>
-      </li>
-    </ingredients>
-    <fixedIngredientFilter>
-      <thingDefs>
-        <li>Steel</li>
-        <li>Prometheum</li>
-        <li>ComponentIndustrial</li>
-      </thingDefs>
-    </fixedIngredientFilter>
-    <products>
-      <Shell_Toxic>5</Shell_Toxic>
-    </products>
-    <skillRequirements>
-      <Crafting>4</Crafting>
-    </skillRequirements>
-    <workAmount>6600</workAmount>
-  </RecipeDef>
+		</projectile>
+		<comps>
+			<li Class="CombatExtended.CompProperties_Fragments">
+				<fragments>
+					<Fragment_Large>12</Fragment_Large>
+					<Fragment_Small>24</Fragment_Small>
+				</fragments>
+				<fragAngleRange>-90~-48</fragAngleRange>
+			</li>
+		</comps>
+	</ThingDef>
+
+	<ThingDef ParentName="Base81mmMortarShell">
+		<defName>Bullet_81mmMortarShell_Incendiary</defName>
+		<label>81mm mortar shell (Incendiary)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/Incendiary</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>PrometheumFlame</damageDef>
+			<damageAmountBase>11</damageAmountBase>
+			<explosionRadius>6.5</explosionRadius>
+			<flyOverhead>true</flyOverhead>
+			<preExplosionSpawnThingDef>FilthPrometheum</preExplosionSpawnThingDef>
+			<preExplosionSpawnChance>0.15</preExplosionSpawnChance>
+			<soundExplode>MortarIncendiary_Explode</soundExplode>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base81mmMortarShell">
+		<defName>Bullet_81mmMortarShell_EMP</defName>
+		<label>81mm mortar shell (EMP)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/EMP</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>EMP</damageDef>
+			<damageAmountBase>156</damageAmountBase>
+			<flyOverhead>true</flyOverhead>
+			<explosionRadius>5.5</explosionRadius>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base81mmMortarShell">
+		<defName>Bullet_81mmMortarShell_Firefoam</defName>
+		<label>81mm mortar shell (Foam)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/Firefoam</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Extinguish</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<explosionRadius>5</explosionRadius>
+			<flyOverhead>true</flyOverhead>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundExplode>Explosion_EMP</soundExplode>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+			<postExplosionSpawnThingDef>Filth_FireFoam</postExplosionSpawnThingDef>
+			<postExplosionSpawnChance>1</postExplosionSpawnChance>
+			<postExplosionSpawnThingCount>3</postExplosionSpawnThingCount>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<explosionEffect>ExtinguisherExplosion</explosionEffect>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base81mmMortarShell">
+		<defName>Bullet_81mmMortarShell_Smoke</defName>
+		<label>81mm mortar shell (Smoke)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/Smoke</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Smoke</damageDef>
+			<suppressionFactor>0.0</suppressionFactor>
+			<dangerFactor>0.0</dangerFactor>
+			<explosionRadius>6</explosionRadius>
+			<flyOverhead>true</flyOverhead>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundExplode>Explosion_EMP</soundExplode>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+			<postExplosionGasType>BlindSmoke</postExplosionGasType>
+			<preExplosionSpawnChance>1</preExplosionSpawnChance>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<explosionEffect>ExtinguisherExplosion</explosionEffect>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base81mmMortarShell">
+		<defName>Bullet_81mmMortarShell_Antigrain</defName>
+		<label>81mm mortar shell (Anti)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/Antigrain</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>BombSuper</damageDef>
+			<explosionRadius>50</explosionRadius>
+			<explosionChanceToStartFire>0.22</explosionChanceToStartFire>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<flyOverhead>true</flyOverhead>
+			<explosionEffect>GiantExplosion</explosionEffect>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundExplode>Explosion_GiantBomb</soundExplode>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+			<shellingProps>
+				<damage>0.85</damage>
+			</shellingProps>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="Base81mmMortarShell" MayRequire="Ludeon.RimWorld.Biotech">
+		<defName>Bullet_81mmMortarShell_Tox</defName>
+		<label>81mm mortar shell (Toxic)</label>
+		<graphicData>
+			<texPath>Things/Projectile/Mortar/Toxic</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>ToxGas</damageDef>
+			<armorPenetrationSharp>0</armorPenetrationSharp>
+			<armorPenetrationBlunt>0</armorPenetrationBlunt>
+			<explosionRadius>0.1</explosionRadius>
+			<flyOverhead>true</flyOverhead>
+			<soundHitThickRoof>Artillery_HitThickRoof</soundHitThickRoof>
+			<soundExplode>ToxicShellLanded</soundExplode>
+			<soundImpactAnticipate>MortarRound_PreImpact</soundImpactAnticipate>
+			<soundAmbient>MortarRound_Ambient</soundAmbient>
+			<postExplosionSpawnThingDef>Shell_Toxic_Releasing</postExplosionSpawnThingDef>
+			<postExplosionSpawnThingDefWater>Shell_Toxic_Releasing_Water</postExplosionSpawnThingDefWater>
+		</projectile>
+	</ThingDef>
+
+	<!-- ==================== Recipes ========================== -->
+
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
+		<defName>MakeShell_HighExplosive</defName>
+		<label>make 81mm (HE) mortar shells x5</label>
+		<description>Craft 5 81mm (HE) mortar shells.</description>
+		<jobString>Making 81mm (HE) mortar shells.</jobString>
+		<workAmount>10600</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>54</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Shell_HighExplosive>5</Shell_HighExplosive>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
+		<defName>MakeShell_HighExplosive_HFuzed</defName>
+		<label>make 81mm (Airburst) mortar shells x5</label>
+		<description>Craft 5 81mm (Airburst) mortar shells.</description>
+		<jobString>Making 81mm (Airburst) mortar shells.</jobString>
+		<workAmount>11800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>54</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>FSX</li>
+					</thingDefs>
+				</filter>
+				<count>10</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>4</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>FSX</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Shell_HighExplosive_HFuzed>5</Shell_HighExplosive_HFuzed>
+		</products>
+		<skillRequirements>
+			<Crafting>5</Crafting>
+		</skillRequirements>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
+		<defName>MakeShell_Incendiary</defName>
+		<label>make 81mm (Incendiary) mortar shells x5</label>
+		<description>Craft 5 81mm (Incendiary) mortar shells.</description>
+		<jobString>Making 81mm (Incendiary) mortar shells.</jobString>
+		<workAmount>9000</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>58</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>5</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Shell_Incendiary>5</Shell_Incendiary>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
+		<defName>MakeShell_EMP</defName>
+		<label>make 81mm (EMP) mortar shells x5</label>
+		<description>Craft 5 81mm (EMP) mortar shells.</description>
+		<jobString>Making 81mm (EMP) mortar shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>Mortars</li>
+			<li>MicroelectronicsBasics</li>
+		</researchPrerequisites>
+		<workAmount>13800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>54</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>14</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Shell_EMP>5</Shell_EMP>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
+		<defName>MakeShell_Firefoam</defName>
+		<label>make 81mm (Firefoam) mortar shells x5</label>
+		<description>Craft 5 81mm (Firefoam) mortar shells.</description>
+		<jobString>Making 81mm (Firefoam) mortar shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>Mortars</li>
+			<li>Firefoam</li>
+		</researchPrerequisites>
+		<workAmount>8800</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>42</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<categories>
+						<li>MeatRaw</li>
+					</categories>
+				</filter>
+				<count>17</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+			<categories>
+				<li>MeatRaw</li>
+			</categories>
+		</fixedIngredientFilter>
+		<products>
+			<Shell_Firefoam>5</Shell_Firefoam>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase">
+		<defName>MakeShell_Smoke</defName>
+		<label>make 81mm (Smoke) mortar shells x5</label>
+		<description>Craft 5 81mm (Smoke) mortar shells.</description>
+		<jobString>Making 81mm (Smoke) mortar shells.</jobString>
+		<workAmount>6600</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>42</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Shell_Smoke>5</Shell_Smoke>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="ArtilleryAmmoRecipeBase" MayRequire="Ludeon.RimWorld.Biotech">
+		<defName>MakeShell_Toxic</defName>
+		<label>make 81mm (Tox) mortar shells x5</label>
+		<description>Craft 5 81mm (Tox) mortar shells.</description>
+		<jobString>Making 81mm (Tox) mortar shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>Mortars</li>
+			<li>ToxGas</li>
+		</researchPrerequisites>
+		<workAmount>6600</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>42</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>ComponentIndustrial</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Prometheum</li>
+					</thingDefs>
+				</filter>
+				<count>2</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Prometheum</li>
+				<li>ComponentIndustrial</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Shell_Toxic>5</Shell_Toxic>
+		</products>
+	</RecipeDef>
 
 </Defs>
\ No newline at end of file
diff --git a/Defs/Ammo/Shell/90mmCannon.xml b/Defs/Ammo/Shell/90mmCannon.xml
index 031e592fb8..e47c7d321b 100644
--- a/Defs/Ammo/Shell/90mmCannon.xml
+++ b/Defs/Ammo/Shell/90mmCannon.xml
@@ -15,8 +15,10 @@
 		<label>90mm cannon shells</label>
 		<ammoTypes>
 			<Ammo_90mmCannonShell_HEAT>Bullet_90mmCannonShell_HEAT</Ammo_90mmCannonShell_HEAT>
+			<Ammo_90mmCannonShell_AP>Bullet_90mmCannonShell_AP</Ammo_90mmCannonShell_AP>
 			<Ammo_90mmCannonShell_HE>Bullet_90mmCannonShell_HE</Ammo_90mmCannonShell_HE>
 			<Ammo_90mmCannonShell_HE_TFuzed>Bullet_90mmCannonShell_HE_TFuzed</Ammo_90mmCannonShell_HE_TFuzed>
+			<Ammo_90mmCannonShell_APCR>Bullet_90mmCannonShell_APCR</Ammo_90mmCannonShell_APCR>
 			<Ammo_90mmCannonShell_EMP>Bullet_90mmCannonShell_EMP</Ammo_90mmCannonShell_EMP>
 		</ammoTypes>
 		<similarTo>AmmoSet_HeavyCannon</similarTo>
@@ -36,7 +38,7 @@
 		</tradeTags>
 		<statBases>
 			<MaxHitPoints>200</MaxHitPoints>
-			<Mass>19</Mass>
+			<Mass>18</Mass>
 			<Bulk>22.41</Bulk>
 		</statBases>
 		<cookOffFlashScale>30</cookOffFlashScale>
@@ -52,13 +54,27 @@
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
-			<Mass>15.8</Mass>
-			<MarketValue>89</MarketValue>
+			<Mass>19.5</Mass>
+			<MarketValue>103.28</MarketValue>
 		</statBases>
 		<ammoClass>RocketHEAT</ammoClass>
 		<detonateProjectile>Bullet_90mmCannonShell_HEAT</detonateProjectile>
 	</ThingDef>
 
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="90mmCannonShellBase">
+		<defName>Ammo_90mmCannonShell_AP</defName>
+		<label>90mm cannon shell (AP)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Cannon/Tank/AP</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<MarketValue>72</MarketValue>
+		</statBases>
+		<ammoClass>ArmorPiercing</ammoClass>
+		<detonateProjectile>Bullet_90mmCannonShell_AP</detonateProjectile>
+	</ThingDef>
+
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="90mmCannonShellBase">
 		<defName>Ammo_90mmCannonShell_HE</defName>
 		<label>90mm cannon shell (HE)</label>
@@ -67,7 +83,7 @@
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>104.83</MarketValue>
+			<MarketValue>100.07</MarketValue>
 		</statBases>
 		<ammoClass>GrenadeHE</ammoClass>
 		<detonateProjectile>Bullet_90mmCannonShell_HE</detonateProjectile>
@@ -81,12 +97,27 @@
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>124.33</MarketValue>
+			<MarketValue>119.57</MarketValue>
 		</statBases>
 		<ammoClass>GrenadeHETF</ammoClass>
 		<detonateProjectile>Bullet_90mmCannonShell_HE</detonateProjectile>
 	</ThingDef>
 
+	<ThingDef Class="CombatExtended.AmmoDef" ParentName="90mmCannonShellBase">
+		<defName>Ammo_90mmCannonShell_APCR</defName>
+		<label>90mm cannon shell (APCR)</label>
+		<graphicData>
+			<texPath>Things/Ammo/Cannon/Tank/APCR</texPath>
+			<graphicClass>Graphic_StackCount</graphicClass>
+		</graphicData>
+		<statBases>
+			<Mass>13.3</Mass>
+			<MarketValue>95.34</MarketValue>
+		</statBases>
+		<ammoClass>CompositeRigidAP</ammoClass>
+		<detonateProjectile>Bullet_90mmCannonShell_APCR</detonateProjectile>
+	</ThingDef>
+
 	<ThingDef Class="CombatExtended.AmmoDef" ParentName="90mmCannonShellBase">
 		<defName>Ammo_90mmCannonShell_EMP</defName>
 		<label>90mm cannon shell (EMP)</label>
@@ -95,7 +126,7 @@
 			<graphicClass>Graphic_StackCount</graphicClass>
 		</graphicData>
 		<statBases>
-			<MarketValue>160.66</MarketValue>
+			<MarketValue>155.9</MarketValue>
 		</statBases>
 		<ammoClass>GrenadeEMP</ammoClass>
 		<detonateProjectile>Bullet_90mmCannonShell_EMP</detonateProjectile>
@@ -147,6 +178,17 @@
 		</comps>
 	</ThingDef>
 
+	<ThingDef ParentName="Base40x365mmBoforsBullet">
+		<defName>Bullet_90mmCannonShell_AP</defName>
+		<label>90mm cannon shell (AP)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>318</damageAmountBase>
+			<armorPenetrationSharp>170</armorPenetrationSharp>
+			<armorPenetrationBlunt>70400</armorPenetrationBlunt>
+		</projectile>
+	</ThingDef>
+
 	<ThingDef ParentName="Base90mmCannonShell">
 		<defName>Bullet_90mmCannonShell_HE</defName>
 		<label>90mm cannon shell (HE)</label>
@@ -204,6 +246,18 @@
 		</comps>
 	</ThingDef>
 
+	<ThingDef ParentName="Base40x365mmBoforsBullet">
+		<defName>Bullet_90mmCannonShell_APCR</defName>
+		<label>90mm cannon shell (APCR)</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<damageDef>Bullet</damageDef>
+			<damageAmountBase>304</damageAmountBase>
+			<armorPenetrationSharp>300</armorPenetrationSharp>
+			<armorPenetrationBlunt>90720</armorPenetrationBlunt>
+			<speed>204</speed>
+		</projectile>
+	</ThingDef>
+
 	<ThingDef ParentName="Base90mmCannonShell">
 		<defName>Bullet_90mmCannonShell_EMP</defName>
 		<label>90mm cannon shell (EMP)</label>
@@ -223,12 +277,17 @@
 
 	<!-- ==================== Recipes ========================== -->
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_90mmCannonShell_HEAT</defName>
-		<label>make 90mm HEAT cannon shells x5</label>
-		<description>Craft 5 90mm HEAT cannon shells.</description>
-		<jobString>Making 90mm HEAT cannon shells.</jobString>
-		<workAmount>20400</workAmount>
+		<label>make 90mm (HEAT) cannon shells x5</label>
+		<description>Craft 5 90mm (HEAT) cannon shells.</description>
+		<jobString>Making 90mm (HEAT) cannon shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>CE_Launchers</li>
+		</researchPrerequisites>
+		<workAmount>24000</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -236,7 +295,7 @@
 						<li>Steel</li>
 					</thingDefs>
 				</filter>
-				<count>160</count>
+				<count>196</count>
 			</li>
 			<li>
 				<filter>
@@ -265,17 +324,40 @@
 		<products>
 			<Ammo_90mmCannonShell_HEAT>5</Ammo_90mmCannonShell_HEAT>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
+		<defName>MakeAmmo_90mmCannonShell_AP</defName>
+		<label>make 90mm (AP) cannon shells x5</label>
+		<description>Craft 5 90mm (AP) cannon shells.</description>
+		<jobString>Making 90mm (AP) cannon shells.</jobString>
+		<workAmount>21600</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>180</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_90mmCannonShell_AP>5</Ammo_90mmCannonShell_AP>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_90mmCannonShell_HE</defName>
-		<label>make 90mm HE cannon shells x5</label>
-		<description>Craft 5 90mm HE cannon shells.</description>
-		<jobString>Making 90mm HE cannon shells.</jobString>
-		<workAmount>24400</workAmount>
+		<label>make 90mm (HE) cannon shells x5</label>
+		<description>Craft 5 90mm (HE) cannon shells.</description>
+		<jobString>Making 90mm (HE) cannon shells.</jobString>
+		<workAmount>23200</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -283,7 +365,7 @@
 						<li>Steel</li>
 					</thingDefs>
 				</filter>
-				<count>192</count>
+				<count>180</count>
 			</li>
 			<li>
 				<filter>
@@ -312,18 +394,19 @@
 		<products>
 			<Ammo_90mmCannonShell_HE>5</Ammo_90mmCannonShell_HE>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_90mmCannonShell_HE_TFuzed</defName>
-		<label>make 90mm HE Time-Fuzed cannon shells x5</label>
-		<description>Craft 5 90mm HE Time-Fuzed cannon shells.</description>
-		<jobString>Making 90mm HE Time-Fuzed cannon shells.</jobString>
-		<workAmount>26400</workAmount>
-		<researchPrerequisite>CE_AdvancedLaunchers</researchPrerequisite>
+		<label>make 90mm (Time-Fuzed) cannon shells x5</label>
+		<description>Craft 5 90mm (Time-Fuzed) cannon shells.</description>
+		<jobString>Making 90mm (Time-Fuzed) cannon shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>CE_AdvancedLaunchers</li>
+		</researchPrerequisites>
+		<workAmount>25000</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -331,7 +414,7 @@
 						<li>Steel</li>
 					</thingDefs>
 				</filter>
-				<count>192</count>
+				<count>180</count>
 			</li>
 			<li>
 				<filter>
@@ -360,18 +443,59 @@
 		<products>
 			<Ammo_90mmCannonShell_HE_TFuzed>5</Ammo_90mmCannonShell_HE_TFuzed>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
-	<RecipeDef ParentName="AmmoRecipeBase">
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
+		<defName>MakeAmmo_90mmCannonShell_APCR</defName>
+		<label>make 90mm (APCR) cannon shells x5</label>
+		<description>Craft 5 90mm (APCR) cannon shells.</description>
+		<jobString>Making 90mm (APCR) cannon shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>CE_AdvancedAmmo</li>
+		</researchPrerequisites>
+		<workAmount>22400</workAmount>
+		<ingredients>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Steel</li>
+					</thingDefs>
+				</filter>
+				<count>140</count>
+			</li>
+			<li>
+				<filter>
+					<thingDefs>
+						<li>Uranium</li>
+					</thingDefs>
+				</filter>
+				<count>32</count>
+			</li>
+		</ingredients>
+		<fixedIngredientFilter>
+			<thingDefs>
+				<li>Steel</li>
+				<li>Uranium</li>
+			</thingDefs>
+		</fixedIngredientFilter>
+		<products>
+			<Ammo_90mmCannonShell_APCR>5</Ammo_90mmCannonShell_APCR>
+		</products>
+	</RecipeDef>
+
+	<RecipeDef ParentName="CannonAmmoRecipeBase">
 		<defName>MakeAmmo_90mmCannonShell_EMP</defName>
-		<label>make 90mm EMP cannon shells x5</label>
-		<description>Craft 5 90mm EMP cannon shells.</description>
-		<jobString>Making 90mm EMP cannon shells.</jobString>
-		<researchPrerequisite>MicroelectronicsBasics</researchPrerequisite>
-		<workAmount>27000</workAmount>
+		<label>make 90mm (EMP) cannon shells x5</label>
+		<description>Craft 5 90mm (EMP) cannon shells.</description>
+		<jobString>Making 90mm (EMP) cannon shells.</jobString>
+		<researchPrerequisite Inherit="False" />
+		<researchPrerequisites>
+			<li>CE_TurretHeavyWeapons</li>
+			<li>MicroelectronicsBasics</li>
+		</researchPrerequisites>
+		<workAmount>25800</workAmount>
 		<ingredients>
 			<li>
 				<filter>
@@ -379,7 +503,7 @@
 						<li>Steel</li>
 					</thingDefs>
 				</filter>
-				<count>192</count>
+				<count>180</count>
 			</li>
 			<li>
 				<filter>
@@ -399,9 +523,6 @@
 		<products>
 			<Ammo_90mmCannonShell_EMP>5</Ammo_90mmCannonShell_EMP>
 		</products>
-		<skillRequirements>
-			<Crafting>4</Crafting>
-		</skillRequirements>
 	</RecipeDef>
 
 </Defs>
\ No newline at end of file
diff --git a/Textures/Things/Ammo/Cannon/Tank/AP/AP_a.png b/Textures/Things/Ammo/Cannon/Tank/AP/AP_a.png
index d0df4f7483..a4f0436a56 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/AP/AP_a.png and b/Textures/Things/Ammo/Cannon/Tank/AP/AP_a.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/AP/AP_b.png b/Textures/Things/Ammo/Cannon/Tank/AP/AP_b.png
index d4d3eda60a..61b2520e8c 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/AP/AP_b.png and b/Textures/Things/Ammo/Cannon/Tank/AP/AP_b.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/AP/AP_c.png b/Textures/Things/Ammo/Cannon/Tank/AP/AP_c.png
index 92e3fce45e..a312dbd292 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/AP/AP_c.png and b/Textures/Things/Ammo/Cannon/Tank/AP/AP_c.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/APCR/APCR_a.png b/Textures/Things/Ammo/Cannon/Tank/APCR/APCR_a.png
index b0c52df340..6419a2fb93 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/APCR/APCR_a.png and b/Textures/Things/Ammo/Cannon/Tank/APCR/APCR_a.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/APCR/APCR_b.png b/Textures/Things/Ammo/Cannon/Tank/APCR/APCR_b.png
index 040cce21c7..0cf4cdead1 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/APCR/APCR_b.png and b/Textures/Things/Ammo/Cannon/Tank/APCR/APCR_b.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/APCR/APCR_c.png b/Textures/Things/Ammo/Cannon/Tank/APCR/APCR_c.png
index cf867bc167..f37367a4ea 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/APCR/APCR_c.png and b/Textures/Things/Ammo/Cannon/Tank/APCR/APCR_c.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/APHE/APHE_a.png b/Textures/Things/Ammo/Cannon/Tank/APHE/APHE_a.png
index edb73d9f0d..bdd91d83e8 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/APHE/APHE_a.png and b/Textures/Things/Ammo/Cannon/Tank/APHE/APHE_a.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/APHE/APHE_b.png b/Textures/Things/Ammo/Cannon/Tank/APHE/APHE_b.png
index 9ed121a341..114d9b94d4 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/APHE/APHE_b.png and b/Textures/Things/Ammo/Cannon/Tank/APHE/APHE_b.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/APHE/APHE_c.png b/Textures/Things/Ammo/Cannon/Tank/APHE/APHE_c.png
index d4c36bb218..b6c2cacf34 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/APHE/APHE_c.png and b/Textures/Things/Ammo/Cannon/Tank/APHE/APHE_c.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/Canister/Canister_a.png b/Textures/Things/Ammo/Cannon/Tank/Canister/Canister_a.png
index 508872e197..8f75ad8954 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/Canister/Canister_a.png and b/Textures/Things/Ammo/Cannon/Tank/Canister/Canister_a.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/Canister/Canister_b.png b/Textures/Things/Ammo/Cannon/Tank/Canister/Canister_b.png
index 8f9ab5f01f..ee1f6c4cc1 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/Canister/Canister_b.png and b/Textures/Things/Ammo/Cannon/Tank/Canister/Canister_b.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/Canister/Canister_c.png b/Textures/Things/Ammo/Cannon/Tank/Canister/Canister_c.png
index cfce902220..54410596fb 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/Canister/Canister_c.png and b/Textures/Things/Ammo/Cannon/Tank/Canister/Canister_c.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/EMP/EMP_a.png b/Textures/Things/Ammo/Cannon/Tank/EMP/EMP_a.png
index d21b91dab7..240dd7bd5e 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/EMP/EMP_a.png and b/Textures/Things/Ammo/Cannon/Tank/EMP/EMP_a.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/EMP/EMP_b.png b/Textures/Things/Ammo/Cannon/Tank/EMP/EMP_b.png
index 877fac4e20..faba7a29b5 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/EMP/EMP_b.png and b/Textures/Things/Ammo/Cannon/Tank/EMP/EMP_b.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/EMP/EMP_c.png b/Textures/Things/Ammo/Cannon/Tank/EMP/EMP_c.png
index e04e16dbe6..d433e6d77e 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/EMP/EMP_c.png and b/Textures/Things/Ammo/Cannon/Tank/EMP/EMP_c.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/HE/HE_a.png b/Textures/Things/Ammo/Cannon/Tank/HE/HE_a.png
index 7900b4a567..dd269e2be1 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/HE/HE_a.png and b/Textures/Things/Ammo/Cannon/Tank/HE/HE_a.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/HE/HE_b.png b/Textures/Things/Ammo/Cannon/Tank/HE/HE_b.png
index e52d8b3a95..113646fdbc 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/HE/HE_b.png and b/Textures/Things/Ammo/Cannon/Tank/HE/HE_b.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/HE/HE_c.png b/Textures/Things/Ammo/Cannon/Tank/HE/HE_c.png
index 6ef9f2284e..3a78697574 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/HE/HE_c.png and b/Textures/Things/Ammo/Cannon/Tank/HE/HE_c.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_a.png b/Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_a.png
index f954567c35..5d3b7c871e 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_a.png and b/Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_a.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_b.png b/Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_b.png
index 45ed9b9b39..75e702f4a6 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_b.png and b/Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_b.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_c.png b/Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_c.png
index 32b608cfab..0679854706 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_c.png and b/Textures/Things/Ammo/Cannon/Tank/HEAT/HEAT_c.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/HEATFS/HEATFS_a.png b/Textures/Things/Ammo/Cannon/Tank/HEATFS/HEATFS_a.png
index 089cd11165..ed2dcaec46 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/HEATFS/HEATFS_a.png and b/Textures/Things/Ammo/Cannon/Tank/HEATFS/HEATFS_a.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/HEATFS/HEATFS_b.png b/Textures/Things/Ammo/Cannon/Tank/HEATFS/HEATFS_b.png
index 0593920459..fa9f9baf84 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/HEATFS/HEATFS_b.png and b/Textures/Things/Ammo/Cannon/Tank/HEATFS/HEATFS_b.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/HEATFS/HEATFS_c.png b/Textures/Things/Ammo/Cannon/Tank/HEATFS/HEATFS_c.png
index 23b9169631..5d749d46df 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/HEATFS/HEATFS_c.png and b/Textures/Things/Ammo/Cannon/Tank/HEATFS/HEATFS_c.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/Sabot/Sabot_a.png b/Textures/Things/Ammo/Cannon/Tank/Sabot/Sabot_a.png
index 6e7c3f1e56..2c484b339d 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/Sabot/Sabot_a.png and b/Textures/Things/Ammo/Cannon/Tank/Sabot/Sabot_a.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/Sabot/Sabot_b.png b/Textures/Things/Ammo/Cannon/Tank/Sabot/Sabot_b.png
index 44637789b1..daa88eaff3 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/Sabot/Sabot_b.png and b/Textures/Things/Ammo/Cannon/Tank/Sabot/Sabot_b.png differ
diff --git a/Textures/Things/Ammo/Cannon/Tank/Sabot/Sabot_c.png b/Textures/Things/Ammo/Cannon/Tank/Sabot/Sabot_c.png
index 1e200cb885..1f4da2ad55 100644
Binary files a/Textures/Things/Ammo/Cannon/Tank/Sabot/Sabot_c.png and b/Textures/Things/Ammo/Cannon/Tank/Sabot/Sabot_c.png differ
diff --git a/Textures/Things/Ammo/RPG/Frag/Frag_a.png b/Textures/Things/Ammo/RPG/Frag/Frag_a.png
index 8be550b4e0..653f985e1e 100644
Binary files a/Textures/Things/Ammo/RPG/Frag/Frag_a.png and b/Textures/Things/Ammo/RPG/Frag/Frag_a.png differ
diff --git a/Textures/Things/Ammo/RPG/Frag/Frag_b.png b/Textures/Things/Ammo/RPG/Frag/Frag_b.png
index 1d683d0fc8..9562d2d872 100644
Binary files a/Textures/Things/Ammo/RPG/Frag/Frag_b.png and b/Textures/Things/Ammo/RPG/Frag/Frag_b.png differ
diff --git a/Textures/Things/Ammo/RPG/Frag/Frag_c.png b/Textures/Things/Ammo/RPG/Frag/Frag_c.png
index ac2753481c..31a8dd897d 100644
Binary files a/Textures/Things/Ammo/RPG/Frag/Frag_c.png and b/Textures/Things/Ammo/RPG/Frag/Frag_c.png differ
diff --git a/Textures/Things/Ammo/RPG/HEAT/HEAT_a.png b/Textures/Things/Ammo/RPG/HEAT/HEAT_a.png
index a9b05397fb..e0a0601c4b 100644
Binary files a/Textures/Things/Ammo/RPG/HEAT/HEAT_a.png and b/Textures/Things/Ammo/RPG/HEAT/HEAT_a.png differ
diff --git a/Textures/Things/Ammo/RPG/HEAT/HEAT_b.png b/Textures/Things/Ammo/RPG/HEAT/HEAT_b.png
index ba7e11a1db..3412ff9080 100644
Binary files a/Textures/Things/Ammo/RPG/HEAT/HEAT_b.png and b/Textures/Things/Ammo/RPG/HEAT/HEAT_b.png differ
diff --git a/Textures/Things/Ammo/RPG/HEAT/HEAT_c.png b/Textures/Things/Ammo/RPG/HEAT/HEAT_c.png
index 59c0d1c618..3fe7647d7e 100644
Binary files a/Textures/Things/Ammo/RPG/HEAT/HEAT_c.png and b/Textures/Things/Ammo/RPG/HEAT/HEAT_c.png differ
diff --git a/Textures/Things/Ammo/RPG/Thermobaric/Thermobaric_a.png b/Textures/Things/Ammo/RPG/Thermobaric/Thermobaric_a.png
index 35f40bbd33..b1119827f1 100644
Binary files a/Textures/Things/Ammo/RPG/Thermobaric/Thermobaric_a.png and b/Textures/Things/Ammo/RPG/Thermobaric/Thermobaric_a.png differ
diff --git a/Textures/Things/Ammo/RPG/Thermobaric/Thermobaric_b.png b/Textures/Things/Ammo/RPG/Thermobaric/Thermobaric_b.png
index e67e18cd35..6b4cf877e7 100644
Binary files a/Textures/Things/Ammo/RPG/Thermobaric/Thermobaric_b.png and b/Textures/Things/Ammo/RPG/Thermobaric/Thermobaric_b.png differ
diff --git a/Textures/Things/Ammo/RPG/Thermobaric/Thermobaric_c.png b/Textures/Things/Ammo/RPG/Thermobaric/Thermobaric_c.png
index c42afd9f2d..7a65369afe 100644
Binary files a/Textures/Things/Ammo/RPG/Thermobaric/Thermobaric_c.png and b/Textures/Things/Ammo/RPG/Thermobaric/Thermobaric_c.png differ
diff --git a/Textures/Things/Projectile/Cannon/AP.png b/Textures/Things/Projectile/Cannon/AP.png
index 85af04eb36..697b3665ea 100644
Binary files a/Textures/Things/Projectile/Cannon/AP.png and b/Textures/Things/Projectile/Cannon/AP.png differ
diff --git a/Textures/Things/Projectile/Cannon/APCR.png b/Textures/Things/Projectile/Cannon/APCR.png
index 740d562cd7..af878011a2 100644
Binary files a/Textures/Things/Projectile/Cannon/APCR.png and b/Textures/Things/Projectile/Cannon/APCR.png differ
diff --git a/Textures/Things/Projectile/Cannon/APHE.png b/Textures/Things/Projectile/Cannon/APHE.png
index 70b56a8f6c..4dfae1c801 100644
Binary files a/Textures/Things/Projectile/Cannon/APHE.png and b/Textures/Things/Projectile/Cannon/APHE.png differ
diff --git a/Textures/Things/Projectile/Cannon/EMP.png b/Textures/Things/Projectile/Cannon/EMP.png
index c06eeafdf4..db547a1fc5 100644
Binary files a/Textures/Things/Projectile/Cannon/EMP.png and b/Textures/Things/Projectile/Cannon/EMP.png differ
diff --git a/Textures/Things/Projectile/Cannon/EMPFS.png b/Textures/Things/Projectile/Cannon/EMPFS.png
index 6994983926..d3d5b442ea 100644
Binary files a/Textures/Things/Projectile/Cannon/EMPFS.png and b/Textures/Things/Projectile/Cannon/EMPFS.png differ
diff --git a/Textures/Things/Projectile/Cannon/HE.png b/Textures/Things/Projectile/Cannon/HE.png
index 9986ea1ffb..4d441e50bf 100644
Binary files a/Textures/Things/Projectile/Cannon/HE.png and b/Textures/Things/Projectile/Cannon/HE.png differ
diff --git a/Textures/Things/Projectile/Cannon/HEAT.png b/Textures/Things/Projectile/Cannon/HEAT.png
index d3595cb860..f3f5655622 100644
Binary files a/Textures/Things/Projectile/Cannon/HEAT.png and b/Textures/Things/Projectile/Cannon/HEAT.png differ
diff --git a/Textures/Things/Projectile/Cannon/HEATFS.png b/Textures/Things/Projectile/Cannon/HEATFS.png
index 15bd706be0..ed03ef4a98 100644
Binary files a/Textures/Things/Projectile/Cannon/HEATFS.png and b/Textures/Things/Projectile/Cannon/HEATFS.png differ
diff --git a/Textures/Things/Projectile/Cannon/HEFS.png b/Textures/Things/Projectile/Cannon/HEFS.png
index ad6200846b..6d698ca9f8 100644
Binary files a/Textures/Things/Projectile/Cannon/HEFS.png and b/Textures/Things/Projectile/Cannon/HEFS.png differ
diff --git a/Textures/Things/Projectile/Cannon/Sabot.png b/Textures/Things/Projectile/Cannon/Sabot.png
index f36836c94e..102a6cb013 100644
Binary files a/Textures/Things/Projectile/Cannon/Sabot.png and b/Textures/Things/Projectile/Cannon/Sabot.png differ
diff --git a/Textures/Things/Projectile/RPG/Frag.png b/Textures/Things/Projectile/RPG/Frag.png
index 48a2f12fa7..8849463052 100644
Binary files a/Textures/Things/Projectile/RPG/Frag.png and b/Textures/Things/Projectile/RPG/Frag.png differ
diff --git a/Textures/Things/Projectile/RPG/HEAT.png b/Textures/Things/Projectile/RPG/HEAT.png
index fdcbdfcac5..f13928b2e1 100644
Binary files a/Textures/Things/Projectile/RPG/HEAT.png and b/Textures/Things/Projectile/RPG/HEAT.png differ
diff --git a/Textures/Things/Projectile/RPG/Thermobaric.png b/Textures/Things/Projectile/RPG/Thermobaric.png
index 0cca0a9243..c202f19565 100644
Binary files a/Textures/Things/Projectile/RPG/Thermobaric.png and b/Textures/Things/Projectile/RPG/Thermobaric.png differ