diff --git a/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml b/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml
index 6525dfd33d..8b6fafffae 100644
--- a/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml	
+++ b/ModPatches/Rimsenal Federation/Defs/Rimsenal Federation/ThingDefs_Misc/Ammo_Fed.xml	
@@ -4,7 +4,7 @@
 	<!-- ==========  Bases =========== -->
 	
 	<ThingDef Name="BaseOpticBoltCE" ParentName="BaseBulletCE" Abstract="true">
-		<label>energy bolt</label>
+		<label>optical energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/Mlaser</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -17,7 +17,7 @@
 	</ThingDef>
 	
 	<ThingDef Name="BaseCrucibleBoltCE" ParentName="BaseBulletCE" Abstract="true">
-		<label>energy bolt</label>
+		<label>crucible energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/Cruciblebolt</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -51,7 +51,6 @@
 	<ThingDef ParentName="BaseOpticBoltCE">
 		<defName>Bullet_HarvesterCannon</defName>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-		<label>energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/Laser</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -67,7 +66,6 @@
 	<ThingDef ParentName="BaseExplosiveBullet">
 		<defName>Bullet_PlasmaTurretBombard</defName>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-		<label>energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/Plasma</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -93,7 +91,6 @@
 	<ThingDef ParentName="BaseExplosiveBullet">
 		<defName>Bullet_Federation_PlasmaBlast</defName>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-		<label>energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/MFlux</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -118,7 +115,6 @@
 	<ThingDef ParentName="BaseExplosiveBullet">
 		<defName>Bullet_Federation_PlasmaCluster</defName>
 		<thingClass>CombatExtended.ProjectileCE_HeightFuse</thingClass>
-		<label>energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/MFlux</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -154,7 +150,6 @@
 	<ThingDef ParentName="BaseExplosiveBullet">
 		<defName>Bullet_Federation_PlasmaSub</defName>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-		<label>energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/Plasma</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -176,7 +171,6 @@
 	<ThingDef ParentName="BaseCrucibleBoltCE">
 		<defName>Bullet_CrucibleCannon_CE</defName>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-		<label>energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/Mlaser</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -216,7 +210,6 @@
 	<ThingDef ParentName="BasePlasmaBombCE">
 		<defName>Bullet_PlasmaRifle_Fed</defName>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-		<label>plasma sphere</label>
 		<graphicData>
 			<texPath>Things/Projectile/Plasma</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -256,13 +249,12 @@
 
 	<ThingDef ParentName="BaseOpticBoltCE">
 		<defName>Bullet_AuxiliaryPistol</defName>
-		<label>energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/Laser</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<damageAmountBase>8</damageAmountBase>
+			<damageAmountBase>5</damageAmountBase>
 		</projectile>
 	</ThingDef>
 
@@ -270,7 +262,6 @@
 
 	<ThingDef ParentName="BaseOpticBoltCE">
 		<defName>Bullet_MakeshiftCrucibleRifle</defName>
-		<label>energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/Laser</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -279,7 +270,7 @@
 			<damageDef>Optic</damageDef>
 			<speed>90</speed>
 			<dropsCasings>false</dropsCasings>
-			<damageAmountBase>13</damageAmountBase>
+			<damageAmountBase>8</damageAmountBase>
 		</projectile>
 	</ThingDef>
 
@@ -299,7 +290,7 @@
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<damageAmountBase>12</damageAmountBase>
+			<damageAmountBase>9</damageAmountBase>
 		</projectile>
 	</ThingDef>
 
@@ -319,7 +310,7 @@
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<damageAmountBase>10</damageAmountBase>
+			<damageAmountBase>7</damageAmountBase>
 		</projectile>
 	</ThingDef>
 
@@ -359,7 +350,7 @@
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<damageAmountBase>20</damageAmountBase>
+			<damageAmountBase>14</damageAmountBase>
 		</projectile>
 	</ThingDef>
 
@@ -368,7 +359,6 @@
 	<ThingDef ParentName="BasePlasmaBombCE">
 		<defName>Bullet_PlasmaCaster</defName>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-		<label>plasma sphere</label>
 		<graphicData>
 			<texPath>Things/Projectile/Plasma</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -390,7 +380,6 @@
 	<ThingDef ParentName="BasePlasmaBombCE">
 		<defName>Bullet_PlasmaCaster_Fed</defName>
 		<thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-		<label>plasma sphere</label>
 		<graphicData>
 			<texPath>Things/Projectile/Flux</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
@@ -432,13 +421,12 @@
 
 	<ThingDef ParentName="BaseOpticBoltCE">
 		<defName>Bullet_CrucibleCarbine_CE</defName>
-		<label>energy bolt</label>
 		<graphicData>
 			<texPath>Things/Projectile/Mlaser</texPath>
 			<graphicClass>Graphic_Single</graphicClass>
 		</graphicData>
 		<projectile Class="CombatExtended.ProjectilePropertiesCE">
-			<damageAmountBase>10</damageAmountBase>
+			<damageAmountBase>7</damageAmountBase>
 		</projectile>
 	</ThingDef>
 
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_DamageDefs.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_DamageDefs.xml
index ae0bb7b31a..ff8554bcb7 100644
--- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_DamageDefs.xml	
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_DamageDefs.xml	
@@ -12,4 +12,22 @@
 			</li>
 		</value>
 	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/DamageDef[defName="Optic"]</xpath>
+		<value>
+			<defaultArmorPenetration>0.8</defaultArmorPenetration>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/DamageDef[defName="Crucible"]</xpath>
+		<value>
+			<defaultArmorPenetration>0.4</defaultArmorPenetration>
+		</value>
+	</Operation>
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/DamageDef[defName="Plasma"]</xpath>
+		<value>
+			<defaultArmorPenetration>0.30</defaultArmorPenetration>
+		</value>
+	</Operation>
 </Patch>
\ No newline at end of file
diff --git a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml
index b36f63f8a7..a0f16a62b6 100644
--- a/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml	
+++ b/ModPatches/Rimsenal Federation/Patches/Rimsenal Federation/ThingDefs_Misc/Fed_RangedWeapons.xml	
@@ -223,6 +223,49 @@
 			<reloadTime>4</reloadTime>
 		</AmmoUser>
 	</Operation>
+	
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AD_CrucibleRifle"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AD_CrucibleRifle"]</xpath>
+			<value>
+				<comps />
+			</value>
+		</nomatch>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AD_CrucibleRifle"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to high-output crucible mode</standardLabel>
+				<underBarrelLabel>switch to high-penetration optical mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>15</magazineSize>
+					<reloadTime>4</reloadTime>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>0.78</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_CrucibleRifleAD</defaultProjectile>
+					<warmupTime>1.6</warmupTime>
+					<burstShotCount>5</burstShotCount>
+					<ticksBetweenBurstShots>25</ticksBetweenBurstShots>
+					<range>55</range>
+					<soundCast>RS_ShotCR</soundCast>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+					<noSingleShot>false</noSingleShot>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+					<aiUseBurstMode>TRUE</aiUseBurstMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
 
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>AD_FedRifle</defName>
@@ -294,6 +337,49 @@
 			<reloadTime>3</reloadTime>
 		</AmmoUser>
 	</Operation>
+	
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AD_CruciblePistol"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AD_CruciblePistol"]</xpath>
+			<value>
+				<comps />
+			</value>
+		</nomatch>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AD_CruciblePistol"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to high-output crucible mode</standardLabel>
+				<underBarrelLabel>switch to high-penetration optical mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>15</magazineSize>
+					<reloadTime>3</reloadTime>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>0.89</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_CruciblePistolAD</defaultProjectile>
+					<warmupTime>0.7</warmupTime>
+					<burstShotCount>5</burstShotCount>
+					<ticksBetweenBurstShots>15</ticksBetweenBurstShots>
+					<range>21</range>
+					<soundCast>RS_ShotCP</soundCast>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+					<noSingleShot>false</noSingleShot>
+					<aimedBurstShotCount>3</aimedBurstShotCount>
+					<aiUseBurstMode>FALSE</aiUseBurstMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
 
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>AD_FedPistol</defName>
@@ -431,6 +517,46 @@
 			<reloadTime>4</reloadTime>
 		</AmmoUser>
 	</Operation>
+	
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AD_CruciblePresicionRifle"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AD_CruciblePresicionRifle"]</xpath>
+			<value>
+				<comps />
+			</value>
+		</nomatch>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AD_CruciblePresicionRifle"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to high-output crucible mode</standardLabel>
+				<underBarrelLabel>switch to high-penetration optical mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>15</magazineSize>
+					<reloadTime>4</reloadTime>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>0.53</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_CruciblePrecisionRifleAD</defaultProjectile>
+					<warmupTime>1.6</warmupTime>
+					<range>75</range>
+					<soundCast>RS_ShotCPR</soundCast>
+					<muzzleFlashScale>12</muzzleFlashScale>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+					<noSingleShot>false</noSingleShot>
+					<aimedBurstShotCount>1</aimedBurstShotCount>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
 
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>AD_FedSniperRifle</defName>
@@ -494,6 +620,50 @@
 			<reloadTime>5</reloadTime>
 		</AmmoUser>
 	</Operation>
+	
+	<Operation Class="PatchOperationConditional">
+		<xpath>Defs/ThingDef[defName="AD_PlasmaCaliver"]/comps</xpath>
+		<nomatch Class="PatchOperationAdd">
+			<xpath>Defs/ThingDef[defName="AD_PlasmaCaliver"]</xpath>
+			<value>
+				<comps />
+			</value>
+		</nomatch>
+	</Operation>
+	
+	<Operation Class="PatchOperationAdd">
+		<xpath>Defs/ThingDef[defName="AD_PlasmaCaliver"]/comps</xpath>
+		<value>
+			<li Class="CombatExtended.CompProperties_UnderBarrel">
+				<standardLabel>switch to cluster mode</standardLabel>
+				<underBarrelLabel>switch to siege mode</underBarrelLabel>
+				<oneAmmoHolder>True</oneAmmoHolder>
+				<propsUnderBarrel>
+					<magazineSize>3</magazineSize>
+					<reloadTime>5</reloadTime>
+				</propsUnderBarrel>
+				<verbPropsUnderBarrel>
+					<recoilAmount>0.50</recoilAmount>
+					<verbClass>CombatExtended.Verb_ShootCE</verbClass>
+					<hasStandardCommand>true</hasStandardCommand>
+					<defaultProjectile>Bullet_PlasmaCaster_Fed</defaultProjectile>
+					<warmupTime>1.9</warmupTime>
+					<minRange>3</minRange>
+					<range>35</range>
+					<soundCast>RS_ShotHarmonizer</soundCast>
+					<soundCastTail>GunTail_Heavy</soundCastTail>
+					<muzzleFlashScale>18</muzzleFlashScale>
+					<targetParams>
+						<canTargetLocations>true</canTargetLocations>
+					</targetParams>
+					<ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+				</verbPropsUnderBarrel>
+				<propsFireModesUnderBarrel>
+					<aiAimMode>AimedShot</aiAimMode>
+				</propsFireModesUnderBarrel>
+			</li>
+		</value>
+	</Operation>
 
 	<Operation Class="CombatExtended.PatchOperationMakeGunCECompatible">
 		<defName>AD_FedPlasmaCaster</defName>