diff --git a/ModPatches/Save Our Ship 2/Defs/Save Our Ship 2/Holograms_Projectiles.xml b/ModPatches/Save Our Ship 2/Defs/Save Our Ship 2/Holograms_Projectiles.xml
deleted file mode 100644
index 3611a58182..0000000000
--- a/ModPatches/Save Our Ship 2/Defs/Save Our Ship 2/Holograms_Projectiles.xml	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Defs>
-
-	<!-- === Projectiles === -->
-
-	<ThingDef Class="CombatExtended.Lasers.LaserBeamDefCE" ParentName="LaserBulletBlue">
-		<defName>Bullet_Laser_Hologram</defName>
-		<label>hologram laser</label>
-		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<damageDef>CE_Laser</damageDef>
-			<damageAmountBase>12</damageAmountBase>
-			<armorPenetrationSharp>12.5</armorPenetrationSharp>
-			<armorPenetrationBlunt>0.001</armorPenetrationBlunt><!-- The overall pressure exerted by a laser beam striking something is, unsuprisingly, negligable. -->
-		</projectile>
-	</ThingDef>
-
-	<ThingDef ParentName="Base40x46mmGrenadeBullet">
-		<defName>Bullet_Archoblast</defName>
-		<label>archoblast</label>
-		<graphicData>
-			<texPath>Things/Building/Ship/HullPlateTransparent</texPath>
-			<graphicClass>Graphic_Single</graphicClass>
-		</graphicData>
-		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<explosionRadius>3</explosionRadius>
-			<speed>999</speed>
-			<damageDef>Bomb</damageDef>
-			<damageAmountBase>20</damageAmountBase>
-			<extraDamages>
-				<li>
-					<def>EMP</def>
-					<amount>5</amount>
-					<chance>1</chance>
-				</li>
-				<li>
-					<def>Flame</def>
-					<amount>5</amount>
-					<chance>1</chance>
-				</li>
-			</extraDamages>
-		</projectile>
-	</ThingDef>
-
-</Defs>
\ No newline at end of file
diff --git a/ModPatches/Save Our Ship 2/Defs/Save Our Ship 2/Projectiles.xml b/ModPatches/Save Our Ship 2/Defs/Save Our Ship 2/Projectiles.xml
new file mode 100644
index 0000000000..c363b4c683
--- /dev/null
+++ b/ModPatches/Save Our Ship 2/Defs/Save Our Ship 2/Projectiles.xml	
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Defs>
+
+	<!-- === Projectiles === -->
+	<ThingDef ParentName="Base40x46mmGrenadeBullet">
+		<defName>Bullet_Shuttle_Plasma_CE</defName>
+		<label>plasma toroid</label>
+		<graphicData>
+			<texPath>Things/Projectile/ShipTurretPlasma</texPath>
+			<graphicClass>Graphic_Single</graphicClass>
+			<shaderType>TransparentPostLight</shaderType>
+			<drawSize>(1,1)</drawSize>
+		</graphicData>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1.2</explosionRadius>
+			<speed>160</speed>
+			<damageDef>ShipPlasmaSmall</damageDef>
+			<damageAmountBase>40</damageAmountBase>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+			<extraDamages>
+				<li>
+					<def>Flame</def>
+					<amount>20</amount>
+					<chance>1</chance>
+				</li>
+			</extraDamages>
+		</projectile>
+	</ThingDef>
+
+	<ThingDef ParentName="LaserBulletRed"><!-- the projectile switching don't work, so damage is reduced -->
+		<defName>Bullet_Shuttle_Laser_CE</defName>
+		<label>laser beam</label>
+		<projectile Class="CombatExtended.ProjectilePropertiesCE">
+			<explosionRadius>1.2</explosionRadius>
+			<speed>160</speed>
+			<damageDef>ShipLaserSmall</damageDef>
+			<damageAmountBase>25</damageAmountBase>
+			<applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+		</projectile>
+	</ThingDef>
+
+</Defs>
\ No newline at end of file
diff --git a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Apparel_SOS2.xml b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Apparel_SOS2.xml
index cf8c480172..7fbf93825c 100644
--- a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Apparel_SOS2.xml	
+++ b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Apparel_SOS2.xml	
@@ -25,6 +25,22 @@
 		</value>
 	</Operation>
 
+	<!-- Kid EVA Suit -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitBodyChild"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>4</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitBodyChild"]/equippedStatOffsets</xpath>
+		<value>
+			<ToxicEnvironmentResistance>0.50</ToxicEnvironmentResistance>
+		</value>
+	</Operation>
+
 	<!--  EVA Helmet -->
 	<Operation Class="PatchOperationAdd">
 		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmet"]/statBases</xpath>
@@ -73,6 +89,54 @@
 		</value>
 	</Operation>
 
+	<!-- Kid EVA Helmet -->
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetChild"]/statBases</xpath>
+		<value>
+			<Bulk>5</Bulk>
+			<WornBulk>1</WornBulk>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetChild"]/statBases/ArmorRating_Sharp</xpath>
+		<value>
+			<ArmorRating_Sharp>6.5</ArmorRating_Sharp>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetChild"]/statBases/ArmorRating_Blunt</xpath>
+		<value>
+			<ArmorRating_Blunt>20</ArmorRating_Blunt>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetChild"]/apparel/immuneToToxGasExposure</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetChild"]/apparel</xpath>
+			<value>
+				<immuneToToxGasExposure>true</immuneToToxGasExposure>
+			</value>
+		</nomatch>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetChild"]/equippedStatOffsets</xpath>
+		<value>
+			<SmokeSensitivity>-1</SmokeSensitivity>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="Apparel_SpaceSuitHelmetChild"]/apparel/layers</xpath>
+		<value>
+			<li>OnHead</li>
+			<li>StrappedHead</li>
+		</value>
+	</Operation>
+
 	<!--  Heavy EVA Helmet -->
 
 	<Operation Class="PatchOperationReplace">
diff --git a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Creatures_SOS2.xml b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Creatures_SOS2.xml
index 8e25b1916a..b69b9a962c 100644
--- a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Creatures_SOS2.xml	
+++ b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Creatures_SOS2.xml	
@@ -2,7 +2,7 @@
 <Patch>
 	<!-- ========== Base Space Insect ========== -->
 	<Operation Class="PatchOperationAddModExtension">
-		<xpath>Defs/ThingDef[@Name="BaseInsectSpace"]</xpath>
+		<xpath>Defs/ThingDef[@Name="SpaceInsectThingBase"]</xpath>
 		<value>
 			<li Class="CombatExtended.RacePropertiesExtensionCE">
 				<bodyShape>QuadrupedLow</bodyShape>
@@ -11,7 +11,7 @@
 	</Operation>
 
 	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[@Name="BaseInsectSpace"]/statBases</xpath>
+		<xpath>Defs/ThingDef[@Name="SpaceInsectThingBase"]/statBases</xpath>
 		<value>
 			<SmokeSensitivity>0</SmokeSensitivity>
 		</value>
@@ -100,14 +100,26 @@
 		<value>
 			<tools>
 				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
 					<capacities>
 						<li>Cut</li>
 					</capacities>
-					<power>20</power>
+					<power>21</power>
 					<cooldownTime>1.78</cooldownTime>
 					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-					<armorPenetrationSharp>0.14</armorPenetrationSharp>
-					<armorPenetrationBlunt>1</armorPenetrationBlunt>
+					<armorPenetrationSharp>0.36</armorPenetrationSharp>
+					<armorPenetrationBlunt>2.5</armorPenetrationBlunt>
+				</li>
+				<li Class="CombatExtended.ToolCE">
+					<label>head claw</label>
+					<capacities>
+						<li>Stab</li>
+					</capacities>
+					<power>15</power>
+					<cooldownTime>1.78</cooldownTime>
+					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
+					<armorPenetrationSharp>4</armorPenetrationSharp>
+					<armorPenetrationBlunt>2</armorPenetrationBlunt>
 				</li>
 				<li Class="CombatExtended.ToolCE">
 					<label>head</label>
@@ -184,8 +196,8 @@
 					<power>43</power>
 					<cooldownTime>2.48</cooldownTime>
 					<linkedBodyPartsGroup>HeadClaw</linkedBodyPartsGroup>
-					<armorPenetrationSharp>0.5</armorPenetrationSharp>
-					<armorPenetrationBlunt>3.750</armorPenetrationBlunt>
+					<armorPenetrationSharp>1.5</armorPenetrationSharp>
+					<armorPenetrationBlunt>7.5</armorPenetrationBlunt>
 				</li>
 				<li Class="CombatExtended.ToolCE">
 					<label>head</label>
@@ -231,70 +243,27 @@
 		</value>
 	</Operation>
 
-	<!-- ========== Base Shuttle ========== -->
-	<Operation Class="PatchOperationAddModExtension">
-		<xpath>Defs/ThingDef[@Name="BaseShuttle"]</xpath>
-		<value>
-			<li Class="CombatExtended.RacePropertiesExtensionCE">
-				<bodyShape>Vehicle</bodyShape>
-			</li>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[@Name="BaseShuttle"]/statBases</xpath>
-		<value>
-			<SmokeSensitivity>0</SmokeSensitivity>
-		</value>
-	</Operation>
-
 	<!-- ========== Shuttles Armor & Melee ========== -->
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="ShuttlePersonalRace" or
-			defName="ShuttleCargoRace" or
-			defName="ShuttleHeavyRace"
-			]/statBases/ArmorRating_Blunt </xpath>
+		<xpath>Defs/Vehicles.VehicleDef[defName="SoS2_Shuttle_Personal" or
+			defName="SoS2_Shuttle" or
+			defName="SoS2_Shuttle_Heavy" or
+			defName="SoS2_Shuttle_Superheavy"
+			]/statBases/ArmorRating_Blunt</xpath>
 		<value>
 			<ArmorRating_Blunt>45</ArmorRating_Blunt>
 		</value>
 	</Operation>
 
 	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="ShuttlePersonalRace" or
-			defName="ShuttleCargoRace" or
-			defName="ShuttleHeavyRace"
+		<xpath>Defs/Vehicles.VehicleDef[defName="SoS2_Shuttle_Personal" or
+			defName="SoS2_Shuttle" or
+			defName="SoS2_Shuttle_Heavy" or
+			defName="SoS2_Shuttle_Superheavy"
 			]/statBases/ArmorRating_Sharp </xpath>
 		<value>
 			<ArmorRating_Sharp>13</ArmorRating_Sharp>
 		</value>
 	</Operation>
 
-	<Operation Class="PatchOperationRemove">
-		<xpath>Defs/ThingDef[defName="ShuttlePersonalRace" or
-			defName="ShuttleCargoRace" or
-			defName="ShuttleHeavyRace"
-			]/verbs </xpath>
-	</Operation>
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="ShuttlePersonalRace" or
-			defName="ShuttleCargoRace" or
-			defName="ShuttleHeavyRace"
-			] </xpath>
-		<value>
-			<tools>
-				<li Class="CombatExtended.ToolCE">
-					<label>hull</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>35</power>
-					<cooldownTime>3.51</cooldownTime>
-					<armorPenetrationSharp>0</armorPenetrationSharp>
-					<armorPenetrationBlunt>15</armorPenetrationBlunt>
-					<alwaysTreatAsWeapon>true</alwaysTreatAsWeapon>
-				</li>
-			</tools>
-		</value>
-	</Operation>
 </Patch>
\ No newline at end of file
diff --git a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/HologramRace_SOS2.xml b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/HologramRace_SOS2.xml
deleted file mode 100644
index e4de28e3f1..0000000000
--- a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/HologramRace_SOS2.xml	
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-	<Operation Class="PatchOperationAddModExtension">
-		<xpath>Defs/ThingDef[defName="SoSHologramRace"]</xpath>
-		<value>
-			<li Class="CombatExtended.RacePropertiesExtensionCE">
-				<bodyShape>Humanoid</bodyShape>
-			</li>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="SoSHologramRace"]/statBases</xpath>
-		<value>
-			<MeleeDodgeChance>1</MeleeDodgeChance>
-			<MeleeCritChance>1</MeleeCritChance>
-			<MeleeParryChance>1</MeleeParryChance>
-			<SmokeSensitivity>0</SmokeSensitivity>
-			<Suppressability>0</Suppressability>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="SoSHologramRace"]/tools</xpath>
-		<value>
-			<tools>
-				<li Class="CombatExtended.ToolCE">
-					<label>left fist</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>1</power>
-					<cooldownTime>1.26</cooldownTime>
-					<linkedBodyPartsGroup>LeftHand</linkedBodyPartsGroup>
-					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-				</li>
-				<li Class="CombatExtended.ToolCE">
-					<label>right fist</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>1</power>
-					<cooldownTime>1.26</cooldownTime>
-					<linkedBodyPartsGroup>RightHand</linkedBodyPartsGroup>
-					<armorPenetrationBlunt>0.250</armorPenetrationBlunt>
-				</li>
-				<li Class="CombatExtended.ToolCE">
-					<label>head</label>
-					<capacities>
-						<li>Blunt</li>
-					</capacities>
-					<power>2</power>
-					<cooldownTime>4.49</cooldownTime>
-					<linkedBodyPartsGroup>HeadAttackTool</linkedBodyPartsGroup>
-					<chanceFactor>0.2</chanceFactor>
-					<armorPenetrationBlunt>0.625</armorPenetrationBlunt>
-				</li>
-			</tools>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationConditional">
-		<xpath>Defs/ThingDef[defName="SoSHologramRace"]/comps</xpath>
-		<nomatch Class="PatchOperationAdd">
-			<xpath>Defs/ThingDef[defName="SoSHologramRace"]</xpath>
-			<value>
-				<comps/>
-			</value>
-		</nomatch>
-	</Operation>
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="SoSHologramRace"]/comps</xpath>
-		<value>
-			<li>
-				<compClass>CombatExtended.CompPawnGizmo</compClass>
-			</li>
-		</value>
-	</Operation>
-
-	<!-- === Hologram Laser === -->
-	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
-		<defName>HologramLaser</defName>
-		<statBases>
-			<Bulk>0.01</Bulk>
-			<SwayFactor>1.17</SwayFactor>
-			<ShotSpread>0.06</ShotSpread>
-			<SightsEfficiency>1</SightsEfficiency>
-			<RangedWeapon_Cooldown>2.6</RangedWeapon_Cooldown>
-		</statBases>
-		<Properties>
-			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-			<hasStandardCommand>True</hasStandardCommand>
-			<defaultProjectile>Bullet_Laser_Hologram</defaultProjectile>
-			<warmupTime>0.5</warmupTime>
-			<range>16</range>
-			<soundCast>ShipCombatLaser</soundCast>
-			<soundCastTail>GunTail_Heavy</soundCastTail>
-			<muzzleFlashScale>4</muzzleFlashScale>
-		</Properties>
-		<FireModes>
-			<aiAimMode>AimedShot</aiAimMode>
-		</FireModes>
-		<weaponTags>
-			<li>CE_OneHandedWeapon</li>
-		</weaponTags>
-	</Operation>
-
-	<!-- === Hologram Sword === -->
-
-	<Operation Class="PatchOperationReplace">
-		<xpath>Defs/ThingDef[defName="HologramSword"]/tools</xpath>
-		<value>
-			<tools>
-
-				<li Class="CombatExtended.ToolCE">
-					<label>point</label>
-					<capacities>
-						<li>Stab</li>
-					</capacities>
-					<power>13</power>
-					<cooldownTime>1.1</cooldownTime>
-					<chanceFactor>1.5</chanceFactor>
-					<armorPenetrationSharp>0.5</armorPenetrationSharp>
-					<armorPenetrationBlunt>8</armorPenetrationBlunt>
-					<extraMeleeDamages>
-						<li>
-							<def>Flame</def>
-							<amount>6</amount>
-							<chance>0.4</chance>
-						</li>
-					</extraMeleeDamages>
-				</li>
-
-				<li Class="CombatExtended.ToolCE">
-					<label>edge</label>
-					<capacities>
-						<li>Cut</li>
-					</capacities>
-					<power>24</power>
-					<cooldownTime>1.1</cooldownTime>
-					<chanceFactor>1.5</chanceFactor>
-					<armorPenetrationSharp>1</armorPenetrationSharp>
-					<armorPenetrationBlunt>6</armorPenetrationBlunt>
-					<extraMeleeDamages>
-						<li>
-							<def>Flame</def>
-							<amount>10</amount>
-							<chance>0.6</chance>
-						</li>
-					</extraMeleeDamages>
-				</li>
-			</tools>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="HologramSword"]/statBases</xpath>
-		<value>
-			<MeleeCounterParryBonus>0.8</MeleeCounterParryBonus>
-			<Bulk>0.01</Bulk>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/ThingDef[defName="HologramSword"]</xpath>
-		<value>
-			<equippedStatOffsets>
-				<MeleeCritChance>1.00</MeleeCritChance>
-				<MeleeParryChance>0.60</MeleeParryChance>
-				<MeleeDodgeChance>0.40</MeleeDodgeChance>
-			</equippedStatOffsets>
-		</value>
-	</Operation>
-
-	<!-- === Archo Hologram Blast === -->
-	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
-		<defName>HologramLaserArchotech</defName>
-		<statBases>
-			<Bulk>0.01</Bulk>
-			<SwayFactor>1.17</SwayFactor>
-			<ShotSpread>0.06</ShotSpread>
-			<SightsEfficiency>1</SightsEfficiency>
-			<RangedWeapon_Cooldown>2.85</RangedWeapon_Cooldown>
-		</statBases>
-		<Properties>
-			<verbClass>CombatExtended.Verb_ShootCE</verbClass>
-			<hasStandardCommand>True</hasStandardCommand>
-			<defaultProjectile>Bullet_Archoblast</defaultProjectile>
-			<warmupTime>0.5</warmupTime>
-			<range>26</range>
-			<soundCast>ShipCombatLaser</soundCast>
-			<soundCastTail>GunTail_Heavy</soundCastTail>
-			<muzzleFlashScale>0</muzzleFlashScale>
-		</Properties>
-		<FireModes>
-			<aiAimMode>AimedShot</aiAimMode>
-		</FireModes>
-		<weaponTags>
-			<li>CE_OneHandedWeapon</li>
-		</weaponTags>
-	</Operation>
-</Patch>
\ No newline at end of file
diff --git a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Ships_SOS2.xml b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Ships_SOS2.xml
deleted file mode 100644
index 3f45f9aeae..0000000000
--- a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/Ships_SOS2.xml	
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Patch>
-
-	<!-- Because the starting ships can generate with charge rifles, they should really generate with ammo for them, too. -->
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/EnemyShipDef[defName="StartShipA"]/symbolTable</xpath>
-		<value>
-			<li>
-				<key>/</key>
-				<value>
-					<shapeOrDef>Ammo_6x24mmCharged</shapeOrDef>
-				</value>
-			</li>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/EnemyShipDef[defName="StartShipB"]/symbolTable</xpath>
-		<value>
-			<li>
-				<key>*</key>
-				<value>
-					<shapeOrDef>Ammo_6x24mmCharged</shapeOrDef>
-				</value>
-			</li>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/EnemyShipDef[defName="StartShipC"]/symbolTable</xpath>
-		<value>
-			<li>
-				<key>*</key>
-				<value>
-					<shapeOrDef>Ammo_6x24mmCharged</shapeOrDef>
-				</value>
-			</li>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/EnemyShipDef[defName="StartShipD"]/symbolTable</xpath>
-		<value>
-			<li>
-				<key>*</key>
-				<value>
-					<shapeOrDef>Ammo_6x24mmCharged</shapeOrDef>
-				</value>
-			</li>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/EnemyShipDef[defName="StartShipE"]/symbolTable</xpath>
-		<value>
-			<li>
-				<key>*</key>
-				<value>
-					<shapeOrDef>Ammo_6x24mmCharged</shapeOrDef>
-				</value>
-			</li>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/EnemyShipDef[defName="StartShipF"]/symbolTable</xpath>
-		<value>
-			<li>
-				<key>*</key>
-				<value>
-					<shapeOrDef>Ammo_6x24mmCharged</shapeOrDef>
-				</value>
-			</li>
-		</value>
-	</Operation>
-
-	<Operation Class="PatchOperationAdd">
-		<xpath>Defs/EnemyShipDef[defName="StartShipK_Infested"]/symbolTable</xpath>
-		<value>
-			<li>
-				<key>*</key>
-				<value>
-					<shapeOrDef>Ammo_6x24mmCharged</shapeOrDef>
-				</value>
-			</li>
-		</value>
-	</Operation>
-
-</Patch>
\ No newline at end of file
diff --git a/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/UpgradeTree.xml b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/UpgradeTree.xml
new file mode 100644
index 0000000000..f6fe237d7d
--- /dev/null
+++ b/ModPatches/Save Our Ship 2/Patches/Save Our Ship 2/UpgradeTree.xml	
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Patch>
+	<!-- === Projectiles === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="SoS2ShuttlePlasma"]/projectile </xpath>
+		<value>
+			<projectile>Bullet_Shuttle_Plasma_CE</projectile>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.VehicleTurretDef[defName="SoS2ShuttleLaser"]/projectile </xpath>
+		<value>
+			<projectile>Bullet_Shuttle_Laser_CE</projectile>
+		</value>
+	</Operation>
+
+	<!-- === Aromr === -->
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.UpgradeTreeDef[defName="SoS2ShuttleUpgradeTree"]/nodes/li[1]/upgrades/li[@Class="Vehicles.StatUpgrade"]/stats </xpath>
+		<value>
+			<stats>
+				<li>
+					<def>ArmorRating_Blunt</def>
+					<value>-5</value>
+					<type>Add</type>
+				</li>
+				<li>
+					<def>ArmorRating_Sharp</def>
+					<value>-3</value>
+					<type>Add</type>
+				</li>
+			</stats>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.UpgradeTreeDef[defName="SoS2ShuttleUpgradeTree"]/nodes/li[2]/upgrades/li[@Class="Vehicles.StatUpgrade"]/stats </xpath>
+		<value>
+			<stats>
+				<li>
+					<def>ArmorRating_Blunt</def>
+					<value>12</value>
+					<type>Add</type>
+				</li>
+				<li>
+					<def>ArmorRating_Sharp</def>
+					<value>8</value>
+					<type>Add</type>
+				</li>
+			</stats>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.UpgradeTreeDef[defName="SoS2ShuttleUpgradeTree"]/nodes/li[3]/upgrades/li[@Class="Vehicles.StatUpgrade"]/stats </xpath>
+		<value>
+			<stats>
+				<li>
+					<def>ArmorRating_Blunt</def>
+					<value>6</value>
+					<type>Add</type>
+				</li>
+				<li>
+					<def>ArmorRating_Sharp</def>
+					<value>4</value>
+					<type>Add</type>
+				</li>
+			</stats>
+		</value>
+	</Operation>
+
+	<Operation Class="PatchOperationReplace">
+		<xpath>Defs/Vehicles.UpgradeTreeDef[defName="SoS2ShuttleUpgradeTree"]/nodes/li[4]/upgrades/li[@Class="Vehicles.StatUpgrade"]/stats </xpath>
+		<value>
+			<stats>
+				<li>
+					<def>ArmorRating_Blunt</def>
+					<value>45</value>
+					<type>Add</type>
+				</li>
+				<li>
+					<def>ArmorRating_Sharp</def>
+					<value>13</value>
+					<type>Add</type>
+				</li>
+			</stats>
+		</value>
+	</Operation>
+</Patch>
\ No newline at end of file