diff --git a/1.6/Common/Defs/ModSettingDefs.xml b/1.6/Common/Defs/ModSettingDefs.xml
index 3a5db963..b01a013b 100644
--- a/1.6/Common/Defs/ModSettingDefs.xml
+++ b/1.6/Common/Defs/ModSettingDefs.xml
@@ -261,7 +261,7 @@
         <defName>BOR_Setting_EML</defName>
         <settingLabel>[Even More Linkables] Adds support for Even More Linkables mod</settingLabel>
         <settingDesc>Adds linkable support to most benches in BoR and 2 additional power linkables for solar and quasar technology tiers.</settingDesc>
-        <dependingModPackageID>hobbes.bamba.evenmorelinkables</dependingModPackageID>
+        <dependingModPackageID>hobbes.bamba.evenmorelinkables16</dependingModPackageID>
     </BeyondOurReachModSettings.ModSettingDef>
 
     <BeyondOurReachModSettings.ModSettingDef>
diff --git a/1.6/Common/Defs/ThingDefs_Buildings/tier1/Buildings_Production.xml b/1.6/Common/Defs/ThingDefs_Buildings/tier1/Buildings_Production.xml
index 01beeb45..07102e83 100644
--- a/1.6/Common/Defs/ThingDefs_Buildings/tier1/Buildings_Production.xml
+++ b/1.6/Common/Defs/ThingDefs_Buildings/tier1/Buildings_Production.xml
@@ -171,7 +171,7 @@
     <researchPrerequisites>
       <li>BOR_Research_Production_I</li>
     </researchPrerequisites>
-    <rotatable>false</rotatable>
+    <rotatable>true</rotatable>
     <designatorDropdown>BOR_Workbenches</designatorDropdown>
   </ThingDef>
 
diff --git a/1.6/Common/Defs/ThingDefs_Buildings/tier2/Buildings_Production.xml b/1.6/Common/Defs/ThingDefs_Buildings/tier2/Buildings_Production.xml
index 71a311ec..f877a115 100644
--- a/1.6/Common/Defs/ThingDefs_Buildings/tier2/Buildings_Production.xml
+++ b/1.6/Common/Defs/ThingDefs_Buildings/tier2/Buildings_Production.xml
@@ -158,7 +158,7 @@
 		<researchPrerequisites>
 			<li>BOR_Research_Production_II</li>
 		</researchPrerequisites>
-		<rotatable>false</rotatable>
+		<rotatable>true</rotatable>
 		<designatorDropdown>BOR_Workbenches</designatorDropdown>
 	</ThingDef>
 	<ThingDef ParentName="BenchBase">
diff --git a/1.6/Common/Defs/ThingDefs_Buildings/tier4/Buildings_Production.xml b/1.6/Common/Defs/ThingDefs_Buildings/tier4/Buildings_Production.xml
index d9e2fb9f..25b3f8bd 100644
--- a/1.6/Common/Defs/ThingDefs_Buildings/tier4/Buildings_Production.xml
+++ b/1.6/Common/Defs/ThingDefs_Buildings/tier4/Buildings_Production.xml
@@ -12,7 +12,7 @@
 			<drawOffset>(0, 0, 0.2)</drawOffset>
 			<drawRotated>false</drawRotated>
 		</graphicData>
-		<rotatable>false</rotatable>
+		<rotatable>true</rotatable>
 		<castEdgeShadows>true</castEdgeShadows>
 		<staticSunShadowHeight>0.20</staticSunShadowHeight>
 		<costList>
diff --git a/1.6/Mods/ArchotechExpanded/Patches/aeresearchpatches.xml b/1.6/Mods/ArchotechExpanded/Patches/aeresearchpatches.xml
deleted file mode 100644
index cbfe0e5c..00000000
--- a/1.6/Mods/ArchotechExpanded/Patches/aeresearchpatches.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Patch>
-
-    <Operation Class="PatchOperationReplace">
-        <xpath>Defs/ThingDef[defName = "ArchotechEye" or defName="ArchotechArm" or defName="ArchotechLeg"]/recipeMaker/researchPrerequisite</xpath>
-        <value>
-            <researchPrerequisite>BOR_ArchotechBionics</researchPrerequisite>
-        </value>
-    </Operation>
-
-    <Operation Class="PatchOperationReplace">
-        <xpath>Defs/ThingDef[@Name="ArchoPartNormal" or @Name="ArchoPartAdvanced"]/recipeMaker/researchPrerequisite</xpath>
-        <value>
-            <researchPrerequisite>BOR_ArchotechBionics</researchPrerequisite>
-        </value>
-    </Operation>
-
-    <Operation Class="PatchOperationReplace">
-        <xpath>Defs/ResearchProjectDef[defName="ArchotechMimicry"]/prerequisites</xpath>
-        <value>
-            <prerequisites>
-                <li>BOR_Research_Production_III</li>
-            </prerequisites>
-        </value>
-    </Operation>
-
-    <Operation Class="PatchOperationReplace">
-        <xpath>Defs/ResearchProjectDef[defName="ArchotechMimicry"]/baseCost</xpath>
-        <value>
-            <baseCost>1000000</baseCost>
-        </value>
-    </Operation>
-
-    <Operation Class="PatchOperationAdd">
-        <xpath>Defs/ResearchProjectDef[defName="ArchotechMimicry"]/requiredResearchFacilities</xpath>
-        <value>
-            <li>BOR_Research_Unlocker_III</li>
-        </value>
-    </Operation>
-
-    <Operation Class="PatchOperationAdd">
-        <xpath>Defs/ResearchProjectDef[defName="ArchotechMimicry"]</xpath>
-        <value>
-            <tab>BOR_Research_Tab</tab>
-        </value>
-    </Operation>
-
-
-    <Operation Class="PatchOperationReplace">
-        <xpath>Defs/ResearchProjectDef[defName="ArchotechMimicry"]/researchViewX</xpath>
-        <value>
-            <researchViewX>12.00</researchViewX>
-        </value>
-    </Operation>
-
-    <Operation Class="PatchOperationReplace">
-        <xpath>Defs/ResearchProjectDef[defName="ArchotechMimicry"]/researchViewY</xpath>
-        <value>
-            <researchViewY>1.25</researchViewY>
-        </value>
-    </Operation>
-</Patch>
\ No newline at end of file
diff --git a/1.6/Mods/ArchotechExpanded/Patches/archotechexpandedresearch.xml b/1.6/Mods/ArchotechExpanded/Patches/archotechexpandedresearch.xml
index 79379846..903cdb38 100644
--- a/1.6/Mods/ArchotechExpanded/Patches/archotechexpandedresearch.xml
+++ b/1.6/Mods/ArchotechExpanded/Patches/archotechexpandedresearch.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <Patch>
 	<Operation Class="BeyondOurReachModSettings.PatchOperationModSettings">
 		<modSettingDef>BOR_Setting_AddArcotechBionicResearch</modSettingDef>
@@ -24,7 +24,66 @@
 						</ResearchProjectDef>
 					</value>
 				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[defName = "ArchotechEye" or defName="ArchotechArm" or defName="ArchotechLeg"]/recipeMaker/researchPrerequisite</xpath>
+					<value>
+						<researchPrerequisite>BOR_ArchotechBionics</researchPrerequisite>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ThingDef[@Name="ArchoPartNormal" or @Name="ArchoPartAdvanced"]/recipeMaker/researchPrerequisite</xpath>
+					<value>
+						<researchPrerequisite>BOR_ArchotechBionics</researchPrerequisite>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ResearchProjectDef[defName="ArchotechMimicry"]/prerequisites</xpath>
+					<value>
+						<prerequisites>
+							<li>BOR_Research_Production_III</li>
+						</prerequisites>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ResearchProjectDef[defName="ArchotechMimicry"]/baseCost</xpath>
+					<value>
+						<baseCost>1000000</baseCost>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ResearchProjectDef[defName="ArchotechMimicry"]/requiredResearchFacilities</xpath>
+					<value>
+						<li>BOR_Research_Unlocker_III</li>
+					</value>
+				</li>
+
+				<li Class="PatchOperationAdd">
+					<xpath>Defs/ResearchProjectDef[defName="ArchotechMimicry"]</xpath>
+					<value>
+						<tab>BOR_Research_Tab</tab>
+					</value>
+				</li>
+
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ResearchProjectDef[defName="ArchotechMimicry"]/researchViewX</xpath>
+					<value>
+						<researchViewX>12.00</researchViewX>
+					</value>
+				</li>
+
+				<li Class="PatchOperationReplace">
+					<xpath>Defs/ResearchProjectDef[defName="ArchotechMimicry"]/researchViewY</xpath>
+					<value>
+						<researchViewY>1.25</researchViewY>
+					</value>
+				</li>
 			</operations>
 		</enabled>
 	</Operation>
-</Patch>
+</Patch>
\ No newline at end of file
diff --git a/1.6/Mods/CombatExtended/Patches/base/CE_Gun_patches/gun_gen_3.xml b/1.6/Mods/CombatExtended/Patches/base/CE_Gun_patches/gun_gen_3.xml
index 7f7f0a31..1aa033e8 100644
--- a/1.6/Mods/CombatExtended/Patches/base/CE_Gun_patches/gun_gen_3.xml
+++ b/1.6/Mods/CombatExtended/Patches/base/CE_Gun_patches/gun_gen_3.xml
@@ -116,7 +116,7 @@
                     <weaponTags>
                         <li>CE_AI_AR</li>
                     </weaponTags>
-                    <researchPrerequisite>BOR_Research_Weapons_II</researchPrerequisite>
+                    <researchPrerequisite>BOR_Research_Weapons_III</researchPrerequisite>
                 </li>
 
 
@@ -159,7 +159,7 @@
                         <li>CE_AI_SR</li>
                         <li>Bipod_DMR</li>
                     </weaponTags>
-                    <researchPrerequisite>BOR_Research_Weapons_II</researchPrerequisite>
+                    <researchPrerequisite>BOR_Research_Weapons_III</researchPrerequisite>
                     <AllowWithRunAndGun>false</AllowWithRunAndGun>
                 </li>
 
@@ -204,7 +204,7 @@
                     <weaponTags>
                         <li>CE_AI_BROOM</li>
                     </weaponTags>
-                    <researchPrerequisite>BOR_Research_Weapons_II</researchPrerequisite>
+                    <researchPrerequisite>BOR_Research_Weapons_III</researchPrerequisite>
                 </li>
 
 
@@ -248,7 +248,7 @@
                         <li>CE_AI_BROOM</li>
                         <li>CE_OneHandedWeapon</li>
                     </weaponTags>
-                    <researchPrerequisite>BOR_Research_Weapons_II</researchPrerequisite>
+                    <researchPrerequisite>BOR_Research_Weapons_III</researchPrerequisite>
                 </li>
 
             </operations>
diff --git a/1.6/Mods/Rimsenal/Patches/Defs/tier1_satchel.xml b/1.6/Mods/Rimsenal/Patches/Defs/tier1_satchel.xml
index 95241bf8..e476131b 100644
--- a/1.6/Mods/Rimsenal/Patches/Defs/tier1_satchel.xml
+++ b/1.6/Mods/Rimsenal/Patches/Defs/tier1_satchel.xml
@@ -1,337 +1,332 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Patch>
 
-  <Operation Class="BeyondOurReachModSettings.PatchOperationModSettings">
-    <modSettingDef>BOR_Setting_RimsenalSatchelVariants</modSettingDef>
-    <enabled Class="PatchOperationSequence">
-	  <operations>
-	  
-	  <!-- patch sequence to patch in defs while proceeding to check for CE -->
-	  <li Class="PatchOperationAdd">
-      <xpath>Defs</xpath>
-      
-            <value>
-
-                <ThingDef ParentName="BaseGrenadeProjectile">
-                    <defName>BOR_Proj_Dunder_I</defName>
-                    <label>Satchel charge</label>
-                    <thingClass>Projectile_Explosive</thingClass>
-                    <graphicData>
-                        <color>(0, 0.75, 0.9)</color>
-                        <texPath>Things/Projectile/Dunder</texPath>
-                        <graphicClass>Graphic_Single</graphicClass>
-                    </graphicData>
-                    <projectile>
-                        <explosionRadius>9</explosionRadius>
-                        <damageDef>Bomb</damageDef>
-                        <damageAmountBase>450</damageAmountBase>
-                        <explosionDelay>350</explosionDelay>
-                    </projectile>
-                </ThingDef>
-
-                <ThingDef ParentName="BaseRSGrenade">
-                    <defName>BOR_JI_Dunder_I</defName>
-                    <equipmentType>Primary</equipmentType>
-                    <label>solar satchel charge</label>
-                    <description>A "Dunder II" solar Satchel charge. Combat engineer's best friend.</description>
-                    <graphicData>
-                        <color>(0, 0.75, 0.9)</color>
-                        <texPath>Things/A16/Dunder</texPath>
-                        <graphicClass>Graphic_Single</graphicClass>
-                    </graphicData>
-                    <soundInteract>Interact_Grenade</soundInteract>
-                    <techLevel>Ultra</techLevel>
-                    <statBases>
-                        <Mass>3</Mass>
-                        <RangedWeapon_Cooldown>1.85</RangedWeapon_Cooldown>
-                    </statBases>
-                    <thingCategories>
-                        <li>Grenades</li>
-                    </thingCategories>
-                    <recipeMaker>
-                        <researchPrerequisite>BOR_Research_Weapons_I</researchPrerequisite>
-                        <skillRequirements>
-                            <Crafting>13</Crafting>
-                        </skillRequirements>
-                        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-                        <workSkill>Crafting</workSkill>
-                        <effectWorking>Smith</effectWorking>
-                        <soundWorking>Recipe_Smith</soundWorking>
-                        <recipeUsers>
-                            <li>BOR_Bench_I</li>
-                            <li>BOR_Bench_IV</li>
-                        </recipeUsers>
-                        <unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
-                    </recipeMaker>
-                    <costList>
-                        <ComponentSpacer>5</ComponentSpacer>
-                        <BOR_Sunsteel>55</BOR_Sunsteel>
-                        <BOR_Neutronium>150</BOR_Neutronium>
-                    </costList>
-                    <verbs>
-                        <li>
-                            <label>throw solar satchel charge</label>
-                            <verbClass>Verb_LaunchProjectile</verbClass>
-                            <hasStandardCommand>true</hasStandardCommand>
-                            <range>13.275</range>
-                            <forcedMissRadius>0.5</forcedMissRadius>
-                            <warmupTime>2.22</warmupTime>
-                            <noiseRadius>5.55</noiseRadius>
-                            <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-                            <soundCast>ThrowGrenade</soundCast>
-                            <targetParams>
-                                <canTargetLocations>true</canTargetLocations>
-                            </targetParams>
-                            <defaultProjectile>BOR_Proj_Dunder_I</defaultProjectile>
-                        </li>
-                    </verbs>
-                    <tradeTags>
-                        <li>BOR_Tech_I</li>
-                    </tradeTags>
-                </ThingDef>
-
-            </value>
-
-	  </li>
-	  
-	  <!-- check to see if CombatExtended is loaded as well, then modify the patched in defs to CE standards -->
-	  <li Class="PatchOperationFindMod">
-		<mods>
-		  <li>Combat Extended</li>
-		</mods>
-			<match Class="PatchOperationSequence">
-				<operations>
-
-                    <!-- ========== Remove Recipe Maker & Verbs ========== -->
-                    <li Class="PatchOperationRemove">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/recipeMaker </xpath>
-                    </li>
-
-                    <li Class="PatchOperationRemove">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/costList </xpath>
-                    </li>
-
-                    <!-- Without this mod, Grief and Bobcat don't work, and it logs at ForcedMissRadius error.-->
-                    <li Class="PatchOperationRemove">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/verbs </xpath>
-                    </li>
-
-                    <!-- Change TickerType.-->
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"] </xpath>
-                        <value>
-                            <tickerType>Normal</tickerType>
-                        </value>
-                    </li>
-
-                    <!-- ========== Projectile thingClass ========== -->
-
-                    <li Class="PatchOperationReplace">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_I"]/thingClass </xpath>
-                        <value>
-                            <thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-                        </value>
-                    </li>
-
-                    <!-- ========== Projectile ========== -->
-
-
-                    <li Class="PatchOperationReplace">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_I"]/projectile</xpath>
-                        <value>
-                            <projectile Class="CombatExtended.ProjectilePropertiesCE">
-                                <explosionRadius>6.75</explosionRadius>
+    <Operation Class="BeyondOurReachModSettings.PatchOperationModSettings">
+        <modSettingDef>BOR_Setting_RimsenalSatchelVariants</modSettingDef>
+        <enabled Class="PatchOperationSequence">
+            <operations>
+
+                <!-- patch sequence to patch in defs while proceeding to check for CE -->
+                <li Class="PatchOperationAdd">
+                    <xpath>Defs</xpath>
+
+                    <value>
+
+                        <ThingDef ParentName="BaseGrenadeProjectile">
+                            <defName>BOR_Proj_Dunder_I</defName>
+                            <label>Satchel charge</label>
+                            <thingClass>Projectile_Explosive</thingClass>
+                            <graphicData>
+                                <color>(0, 0.75, 0.9)</color>
+                                <texPath>Things/Projectile/Dunder</texPath>
+                                <graphicClass>Graphic_Single</graphicClass>
+                            </graphicData>
+                            <projectile>
+                                <explosionRadius>9</explosionRadius>
                                 <damageDef>Bomb</damageDef>
-                                <damageAmountBase>300</damageAmountBase>
-                                <explosionDelay>400</explosionDelay>
-                                <dropsCasings>false</dropsCasings>
-                                <speed>15</speed>
-                                <casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-                                <casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-                                <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+                                <damageAmountBase>450</damageAmountBase>
+                                <explosionDelay>350</explosionDelay>
                             </projectile>
-                        </value>
-                    </li>
-                    <!-- ========== Check Comp ========== -->
-
+                        </ThingDef>
 
-                    <li Class="PatchOperationConditional">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_I"]/comps</xpath>
-                        <nomatch Class="PatchOperationAdd">
-                            <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_I"]</xpath>
-                            <value>
-                                <comps />
-                            </value>
-                        </nomatch>
-                    </li>
-
-                    <!-- ========== Add Fragmentation ========== -->
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_I"]/comps</xpath>
-                        <value>
-                            <li Class="CombatExtended.CompProperties_Fragments">
-                                <fragments>
-                                    <Fragment_Solar>0</Fragment_Solar>
-                                </fragments>
-                            </li>
-                        </value>
-                    </li>
-
-                    <!-- Weapon Stack and Appearance -->
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/graphicData </xpath>
-                        <value>
-                            <onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-                        </value>
-                    </li>
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"] </xpath>
-                        <value>
-                            <thingClass>CombatExtended.AmmoThing</thingClass>
-                            <stackLimit>75</stackLimit>
-                            <resourceReadoutPriority>First</resourceReadoutPriority>
-                        </value>
-                    </li>
-
-                    <li Class="PatchOperationAttributeSet">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"] </xpath>
-                        <attribute>Class</attribute>
-                        <value>CombatExtended.AmmoDef</value>
-                    </li>
-
-                    <!-- Weapon Check Comps -->
-
-                    <li Class="PatchOperationConditional">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/comps</xpath>
-                        <nomatch Class="PatchOperationAdd">
-                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]</xpath>
-                            <value>
-                                <comps />
-                            </value>
-                        </nomatch>
-                    </li>
-                    <!-- Weapon Values -->
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/comps</xpath>
-                        <value>
-                            <li Class="CombatExtended.CompProperties_ExplosiveCE">
-                                <damageAmountBase>60</damageAmountBase>
-                                <explosiveDamageType>Bomb</explosiveDamageType>
-                                <explosiveRadius>2.75</explosiveRadius>
-
-                            </li>
-                            <li Class="CombatExtended.CompProperties_Fragments">
-                                <fragments>
-                                    <Fragment_Solar>50</Fragment_Solar>
-                                </fragments>
-                            </li>
-                        </value>
-                    </li>
-
-                    <li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-                        <defName>BOR_JI_Dunder_I</defName>
-                        <statBases>
-                            <Mass>2.08</Mass>
-                            <MarketValue>10.875</MarketValue>
-                            <RangedWeapon_Cooldown>0.83</RangedWeapon_Cooldown>
-                            <SightsEfficiency>1.5</SightsEfficiency>
-                        </statBases>
-                        <Properties>
-                            <label>throw solar satchel charge</label>
-                            <verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-                            <hasStandardCommand>true</hasStandardCommand>
-                            <range>15.0</range>
-                            <minRange>3</minRange>
-                            <warmupTime>0.65</warmupTime>
-                            <noiseRadius>3</noiseRadius>
-                            <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-                            <soundCast>ThrowGrenade</soundCast>
-                            <targetParams>
-                                <canTargetLocations>true</canTargetLocations>
-                            </targetParams>
-                            <defaultProjectile>BOR_Proj_Dunder_I</defaultProjectile>
-                            <onlyManualCast>true</onlyManualCast>
-                            <ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-                        </Properties>
-                        <weaponTags>
-                            <li>CE_AI_Grenade</li>
-                            <li>CE_OneHandedWeapon</li>
-                        </weaponTags>
-                    </li>
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs</xpath>
-                        <value>
-                            <RecipeDef ParentName="RSExplosive_RecipeBase">
-                                <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-                                <effectWorking>Cook</effectWorking>
-                                <soundWorking>Recipe_Smith</soundWorking>
-                                <workSkill>Crafting</workSkill>
-                                <unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
-                                <defName>BOR_Craft_10_Dunder_I</defName>
-                                <label>Craft 10 solar satchel charges</label>
-                                <description>Craft 10 Dunder II solar satchel charges.</description>
-                                <jobString>Crafting solar satchel charges</jobString>
-                                <ingredients>
-                                    <li>
-                                        <filter>
-                                            <thingDefs>
-                                                <li>ComponentSpacer</li>
-                                            </thingDefs>
-                                        </filter>
-                                        <count>2</count>
-                                    </li>
-                                    <li>
-                                        <filter>
-                                            <thingDefs>
-                                                <li>Plasteel</li>
-                                            </thingDefs>
-                                        </filter>
-                                        <count>30</count>
-                                    </li>
-                                    <li>
-                                        <filter>
-                                            <thingDefs>
-                                                <li>FSX</li>
-                                            </thingDefs>
-                                        </filter>
-                                        <count>20</count>
-                                    </li>
-                                </ingredients>
-                                <fixedIngredientFilter>
-                                    <thingDefs>
-                                        <li>Plasteel</li>
-                                        <li>ComponentSpacer</li>
-                                        <li>FSX</li>
-                                    </thingDefs>
-                                </fixedIngredientFilter>
-                                <researchPrerequisites>
-                                    <li>BOR_Research_Weapons_I</li>
-                                    <li>MoltenTech</li>
-                                </researchPrerequisites>
+                        <ThingDef ParentName="BaseRSGrenade">
+                            <defName>BOR_JI_Dunder_I</defName>
+                            <equipmentType>Primary</equipmentType>
+                            <label>solar satchel charge</label>
+                            <description>A "Dunder II" solar Satchel charge. Combat engineer's best friend.</description>
+                            <graphicData>
+                                <color>(0, 0.75, 0.9)</color>
+                                <texPath>Things/A16/Dunder</texPath>
+                                <graphicClass>Graphic_Single</graphicClass>
+                            </graphicData>
+                            <soundInteract>Interact_Grenade</soundInteract>
+                            <techLevel>Ultra</techLevel>
+                            <statBases>
+                                <Mass>3</Mass>
+                                <RangedWeapon_Cooldown>1.85</RangedWeapon_Cooldown>
+                            </statBases>
+                            <thingCategories>
+                                <li>Grenades</li>
+                            </thingCategories>
+                            <recipeMaker>
+                                <researchPrerequisite>BOR_Research_Weapons_I</researchPrerequisite>
                                 <skillRequirements>
-                                    <Crafting>12</Crafting>
+                                    <Crafting>13</Crafting>
                                 </skillRequirements>
-                                <products>
-                                    <BOR_JI_Dunder_I>10</BOR_JI_Dunder_I>
-                                </products>
-                                <workAmount>35000</workAmount>
+                                <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+                                <workSkill>Crafting</workSkill>
+                                <effectWorking>Smith</effectWorking>
+                                <soundWorking>Recipe_Smith</soundWorking>
                                 <recipeUsers>
                                     <li>BOR_Bench_I</li>
                                     <li>BOR_Bench_IV</li>
                                 </recipeUsers>
-                            </RecipeDef>
-                        </value>
-                    </li>
-
-				</operations>
-			</match>
-	  </li>
-	 </operations>
-    </enabled>
-  </Operation>
+                                <unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
+                            </recipeMaker>
+                            <costList>
+                                <ComponentSpacer>5</ComponentSpacer>
+                                <BOR_Sunsteel>55</BOR_Sunsteel>
+                                <BOR_Neutronium>150</BOR_Neutronium>
+                            </costList>
+                            <verbs>
+                                <li>
+                                    <label>throw solar satchel charge</label>
+                                    <verbClass>Verb_LaunchProjectile</verbClass>
+                                    <hasStandardCommand>true</hasStandardCommand>
+                                    <range>13.275</range>
+                                    <forcedMissRadius>0.5</forcedMissRadius>
+                                    <warmupTime>2.22</warmupTime>
+                                    <noiseRadius>5.55</noiseRadius>
+                                    <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+                                    <soundCast>ThrowGrenade</soundCast>
+                                    <targetParams>
+                                        <canTargetLocations>true</canTargetLocations>
+                                    </targetParams>
+                                    <defaultProjectile>BOR_Proj_Dunder_I</defaultProjectile>
+                                </li>
+                            </verbs>
+                            <tradeTags>
+                                <li>BOR_Tech_I</li>
+                            </tradeTags>
+                        </ThingDef>
+
+                    </value>
+
+                </li>
+
+                <!-- check to see if CombatExtended is loaded as well, then modify the patched in defs to CE standards -->
+                <li MayRequire="ceteam.combatextended" Class="PatchOperationSequence">
+                    <operations>
+
+                        <!-- ========== Remove Recipe Maker & Verbs ========== -->
+                        <li Class="PatchOperationRemove">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/recipeMaker </xpath>
+                        </li>
+
+                        <li Class="PatchOperationRemove">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/costList </xpath>
+                        </li>
+
+                        <!-- Without this mod, Grief and Bobcat don't work, and it logs at ForcedMissRadius error.-->
+                        <li Class="PatchOperationRemove">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/verbs </xpath>
+                        </li>
+
+                        <!-- Change TickerType.-->
+                        <li Class="PatchOperationAdd">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"] </xpath>
+                            <value>
+                                <tickerType>Normal</tickerType>
+                            </value>
+                        </li>
+
+                        <!-- ========== Projectile thingClass ========== -->
+
+                        <li Class="PatchOperationReplace">
+                            <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_I"]/thingClass </xpath>
+                            <value>
+                                <thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+                            </value>
+                        </li>
+
+                        <!-- ========== Projectile ========== -->
+
+
+                        <li Class="PatchOperationReplace">
+                            <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_I"]/projectile</xpath>
+                            <value>
+                                <projectile Class="CombatExtended.ProjectilePropertiesCE">
+                                    <explosionRadius>6.75</explosionRadius>
+                                    <damageDef>Bomb</damageDef>
+                                    <damageAmountBase>300</damageAmountBase>
+                                    <explosionDelay>400</explosionDelay>
+                                    <dropsCasings>false</dropsCasings>
+                                    <speed>15</speed>
+                                    <casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+                                    <casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+                                    <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+                                </projectile>
+                            </value>
+                        </li>
+                        <!-- ========== Check Comp ========== -->
+
+
+                        <li Class="PatchOperationConditional">
+                            <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_I"]/comps</xpath>
+                            <nomatch Class="PatchOperationAdd">
+                                <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_I"]</xpath>
+                                <value>
+                                    <comps />
+                                </value>
+                            </nomatch>
+                        </li>
+
+                        <!-- ========== Add Fragmentation ========== -->
+
+                        <li Class="PatchOperationAdd">
+                            <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_I"]/comps</xpath>
+                            <value>
+                                <li Class="CombatExtended.CompProperties_Fragments">
+                                    <fragments>
+                                        <Fragment_Solar>0</Fragment_Solar>
+                                    </fragments>
+                                </li>
+                            </value>
+                        </li>
+
+                        <!-- Weapon Stack and Appearance -->
+
+                        <li Class="PatchOperationAdd">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/graphicData </xpath>
+                            <value>
+                                <onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+                            </value>
+                        </li>
+
+                        <li Class="PatchOperationAdd">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"] </xpath>
+                            <value>
+                                <thingClass>CombatExtended.AmmoThing</thingClass>
+                                <stackLimit>75</stackLimit>
+                                <resourceReadoutPriority>First</resourceReadoutPriority>
+                            </value>
+                        </li>
+
+                        <li Class="PatchOperationAttributeSet">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"] </xpath>
+                            <attribute>Class</attribute>
+                            <value>CombatExtended.AmmoDef</value>
+                        </li>
+
+                        <!-- Weapon Check Comps -->
+
+                        <li Class="PatchOperationConditional">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/comps</xpath>
+                            <nomatch Class="PatchOperationAdd">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]</xpath>
+                                <value>
+                                    <comps />
+                                </value>
+                            </nomatch>
+                        </li>
+                        <!-- Weapon Values -->
+
+                        <li Class="PatchOperationAdd">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_I"]/comps</xpath>
+                            <value>
+                                <li Class="CombatExtended.CompProperties_ExplosiveCE">
+                                    <damageAmountBase>60</damageAmountBase>
+                                    <explosiveDamageType>Bomb</explosiveDamageType>
+                                    <explosiveRadius>2.75</explosiveRadius>
+
+                                </li>
+                                <li Class="CombatExtended.CompProperties_Fragments">
+                                    <fragments>
+                                        <Fragment_Solar>50</Fragment_Solar>
+                                    </fragments>
+                                </li>
+                            </value>
+                        </li>
+
+                        <li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+                            <defName>BOR_JI_Dunder_I</defName>
+                            <statBases>
+                                <Mass>2.08</Mass>
+                                <MarketValue>10.875</MarketValue>
+                                <RangedWeapon_Cooldown>0.83</RangedWeapon_Cooldown>
+                                <SightsEfficiency>1.5</SightsEfficiency>
+                            </statBases>
+                            <Properties>
+                                <label>throw solar satchel charge</label>
+                                <verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+                                <hasStandardCommand>true</hasStandardCommand>
+                                <range>15.0</range>
+                                <minRange>3</minRange>
+                                <warmupTime>0.65</warmupTime>
+                                <noiseRadius>3</noiseRadius>
+                                <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+                                <soundCast>ThrowGrenade</soundCast>
+                                <targetParams>
+                                    <canTargetLocations>true</canTargetLocations>
+                                </targetParams>
+                                <defaultProjectile>BOR_Proj_Dunder_I</defaultProjectile>
+                                <onlyManualCast>true</onlyManualCast>
+                                <ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+                            </Properties>
+                            <weaponTags>
+                                <li>CE_AI_Grenade</li>
+                                <li>CE_OneHandedWeapon</li>
+                            </weaponTags>
+                        </li>
+                        <li Class="PatchOperationAdd">
+                            <xpath>Defs</xpath>
+                            <value>
+                                <RecipeDef ParentName="RSExplosive_RecipeBase">
+                                    <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+                                    <effectWorking>Cook</effectWorking>
+                                    <soundWorking>Recipe_Smith</soundWorking>
+                                    <workSkill>Crafting</workSkill>
+                                    <unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
+                                    <defName>BOR_Craft_10_Dunder_I</defName>
+                                    <label>Craft 10 solar satchel charges</label>
+                                    <description>Craft 10 Dunder II solar satchel charges.</description>
+                                    <jobString>Crafting solar satchel charges</jobString>
+                                    <ingredients>
+                                        <li>
+                                            <filter>
+                                                <thingDefs>
+                                                    <li>ComponentSpacer</li>
+                                                </thingDefs>
+                                            </filter>
+                                            <count>2</count>
+                                        </li>
+                                        <li>
+                                            <filter>
+                                                <thingDefs>
+                                                    <li>Plasteel</li>
+                                                </thingDefs>
+                                            </filter>
+                                            <count>30</count>
+                                        </li>
+                                        <li>
+                                            <filter>
+                                                <thingDefs>
+                                                    <li>FSX</li>
+                                                </thingDefs>
+                                            </filter>
+                                            <count>20</count>
+                                        </li>
+                                    </ingredients>
+                                    <fixedIngredientFilter>
+                                        <thingDefs>
+                                            <li>Plasteel</li>
+                                            <li>ComponentSpacer</li>
+                                            <li>FSX</li>
+                                        </thingDefs>
+                                    </fixedIngredientFilter>
+                                    <researchPrerequisites>
+                                        <li>BOR_Research_Weapons_I</li>
+                                        <li>MoltenTech</li>
+                                    </researchPrerequisites>
+                                    <skillRequirements>
+                                        <Crafting>12</Crafting>
+                                    </skillRequirements>
+                                    <products>
+                                        <BOR_JI_Dunder_I>10</BOR_JI_Dunder_I>
+                                    </products>
+                                    <workAmount>35000</workAmount>
+                                    <recipeUsers>
+                                        <li>BOR_Bench_I</li>
+                                        <li>BOR_Bench_IV</li>
+                                    </recipeUsers>
+                                </RecipeDef>
+                            </value>
+                        </li>
+
+                    </operations>
+                </li>
+            </operations>
+        </enabled>
+    </Operation>
 
 </Patch>
\ No newline at end of file
diff --git a/1.6/Mods/Rimsenal/Patches/Defs/tier2_satchel.xml b/1.6/Mods/Rimsenal/Patches/Defs/tier2_satchel.xml
index 3c61362c..69619312 100644
--- a/1.6/Mods/Rimsenal/Patches/Defs/tier2_satchel.xml
+++ b/1.6/Mods/Rimsenal/Patches/Defs/tier2_satchel.xml
@@ -1,349 +1,344 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Patch>
 
-  <Operation Class="BeyondOurReachModSettings.PatchOperationModSettings">
-    <modSettingDef>BOR_Setting_RimsenalSatchelVariants</modSettingDef>
-    <enabled Class="PatchOperationSequence">
-	  <operations>
-	  
-	  <!-- patch sequence to patch in defs while proceeding to check for CE -->
-	  <li Class="PatchOperationAdd">
-      <xpath>Defs</xpath>
-      
-            <value>
-
-                <ThingDef ParentName="BaseGrenadeProjectile">
-                    <defName>BOR_Proj_Dunder_II</defName>
-                    <label>Satchel charge</label>
-                    <thingClass>Projectile_Explosive</thingClass>
-                    <graphicData>
-                        <color>(0.36, 0.5, 0.7)</color>
-                        <texPath>Things/Projectile/Dunder</texPath>
-                        <graphicClass>Graphic_Single</graphicClass>
-                    </graphicData>
-                    <projectile>
-                        <explosionRadius>13</explosionRadius>
-                        <damageDef>Bomb</damageDef>
-                        <damageAmountBase>675</damageAmountBase>
-                        <explosionDelay>291</explosionDelay>
-                    </projectile>
-                </ThingDef>
-
-                <ThingDef ParentName="BaseRSGrenade">
-                    <defName>BOR_JI_Dunder_II</defName>
-                    <equipmentType>Primary</equipmentType>
-                    <label>kwazaari satchel charge</label>
-                    <description>A "Dunder III" kwazaari Satchel charge. Combat engineer's best friend.</description>
-                    <graphicData>
-                        <color>(0.36, 0.5, 0.7)</color>
-                        <texPath>Things/A16/Dunder</texPath>
-                        <graphicClass>Graphic_Single</graphicClass>
-                    </graphicData>
-                    <tradeTags>
-                        <li>BOR_Tech_II</li>
-                    </tradeTags>
-                    <soundInteract>Interact_Grenade</soundInteract>
-                    <techLevel>Ultra</techLevel>
-                    <statBases>
-                        <Mass>2.5</Mass>
-                        <RangedWeapon_Cooldown>1.55</RangedWeapon_Cooldown>
-
-                        <RoyalFavorValue>3</RoyalFavorValue>
-                    </statBases>
-                    <thingCategories>
-                        <li>Grenades</li>
-                    </thingCategories>
-                    <recipeMaker>
-                        <researchPrerequisite>BOR_Research_Weapons_II</researchPrerequisite>
-                        <skillRequirements>
-                            <Crafting>17</Crafting>
-                        </skillRequirements>
-                        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-                        <workSkill>Crafting</workSkill>
-                        <effectWorking>Smith</effectWorking>
-                        <soundWorking>Recipe_Smith</soundWorking>
-                        <recipeUsers>
-                            <li>BOR_Bench_II</li>
-                            <li>BOR_Bench_IV</li>
-                        </recipeUsers>
-                        <unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
-                    </recipeMaker>
-                    <costList>
-                        <BOR_ComponentII>5</BOR_ComponentII>
-                        <BOR_QuasarAlloy>55</BOR_QuasarAlloy>
-                        <BOR_Neutronium>225</BOR_Neutronium>
-                    </costList>
-                    <verbs>
-                        <li>
-                            <label>throw kwazaari satchel charge</label>
-                            <verbClass>Verb_LaunchProjectile</verbClass>
-                            <hasStandardCommand>true</hasStandardCommand>
-                            <range>19</range>
-                            <forcedMissRadius>0.5</forcedMissRadius>
-                            <warmupTime>1.85</warmupTime>
-                            <noiseRadius>4.625</noiseRadius>
-                            <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-                            <soundCast>ThrowGrenade</soundCast>
-                            <targetParams>
-                                <canTargetLocations>true</canTargetLocations>
-                            </targetParams>
-                            <defaultProjectile>BOR_Proj_Dunder_II</defaultProjectile>
-                        </li>
-                    </verbs>
-                </ThingDef>
-
-            </value>
-
-	  </li>
-	  
-	  <!-- check to see if CombatExtended is loaded as well, then modify the patched in defs to CE standards -->
-	  <li Class="PatchOperationFindMod">
-		<mods>
-		  <li>Combat Extended</li>
-		</mods>
-			<match Class="PatchOperationSequence">
-                <operations>
-
-
-                    <!-- ========== Remove Recipe Maker & Verbs ========== -->
-                    <li Class="PatchOperationRemove">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/recipeMaker </xpath>
-                    </li>
-
-                    <li Class="PatchOperationRemove">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/costList </xpath>
-                    </li>
-
-                    <!-- Without this mod, Grief and Bobcat don't work, and it logs at ForcedMissRadius error.-->
-                    <li Class="PatchOperationRemove">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/verbs </xpath>
-                    </li>
-
-                    <!-- Change TickerType.-->
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"] </xpath>
-                        <value>
-                            <tickerType>Normal</tickerType>
-                        </value>
-                    </li>
-
-                    <!-- ========== Projectile thingClass ========== -->
-
-                    <li Class="PatchOperationReplace">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_II"]/thingClass </xpath>
-                        <value>
-                            <thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-                        </value>
-                    </li>
-
-                    <!-- ========== Projectile ========== -->
-
-
-                    <li Class="PatchOperationReplace">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_II"]/projectile</xpath>
-                        <value>
-                            <projectile Class="CombatExtended.ProjectilePropertiesCE">
-                                <explosionRadius>10.125</explosionRadius>
+    <Operation Class="BeyondOurReachModSettings.PatchOperationModSettings">
+        <modSettingDef>BOR_Setting_RimsenalSatchelVariants</modSettingDef>
+        <enabled Class="PatchOperationSequence">
+            <operations>
+
+                <!-- patch sequence to patch in defs while proceeding to check for CE -->
+                <li Class="PatchOperationAdd">
+                    <xpath>Defs</xpath>
+
+                    <value>
+
+                        <ThingDef ParentName="BaseGrenadeProjectile">
+                            <defName>BOR_Proj_Dunder_II</defName>
+                            <label>Satchel charge</label>
+                            <thingClass>Projectile_Explosive</thingClass>
+                            <graphicData>
+                                <color>(0.36, 0.5, 0.7)</color>
+                                <texPath>Things/Projectile/Dunder</texPath>
+                                <graphicClass>Graphic_Single</graphicClass>
+                            </graphicData>
+                            <projectile>
+                                <explosionRadius>13</explosionRadius>
                                 <damageDef>Bomb</damageDef>
-                                <damageAmountBase>450</damageAmountBase>
-                                <explosionDelay>300</explosionDelay>
-                                <dropsCasings>false</dropsCasings>
-                                <speed>22</speed>
-                                <casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-                                <casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-                                <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+                                <damageAmountBase>675</damageAmountBase>
+                                <explosionDelay>291</explosionDelay>
                             </projectile>
-                        </value>
-                    </li>
-                    <!-- ========== Check Comp ========== -->
+                        </ThingDef>
 
+                        <ThingDef ParentName="BaseRSGrenade">
+                            <defName>BOR_JI_Dunder_II</defName>
+                            <equipmentType>Primary</equipmentType>
+                            <label>kwazaari satchel charge</label>
+                            <description>A "Dunder III" kwazaari Satchel charge. Combat engineer's best friend.</description>
+                            <graphicData>
+                                <color>(0.36, 0.5, 0.7)</color>
+                                <texPath>Things/A16/Dunder</texPath>
+                                <graphicClass>Graphic_Single</graphicClass>
+                            </graphicData>
+                            <tradeTags>
+                                <li>BOR_Tech_II</li>
+                            </tradeTags>
+                            <soundInteract>Interact_Grenade</soundInteract>
+                            <techLevel>Ultra</techLevel>
+                            <statBases>
+                                <Mass>2.5</Mass>
+                                <RangedWeapon_Cooldown>1.55</RangedWeapon_Cooldown>
 
-                    <li Class="PatchOperationConditional">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_II"]/comps</xpath>
-                        <nomatch Class="PatchOperationAdd">
-                            <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_II"]</xpath>
-                            <value>
-                                <comps />
-                            </value>
-                        </nomatch>
-                    </li>
-
-                    <!-- ========== Add Fragmentation ========== -->
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_II"]/comps</xpath>
-                        <value>
-                            <li Class="CombatExtended.CompProperties_Fragments">
-                                <fragments>
-                                    <Fragment_Quasar>0</Fragment_Quasar>
-                                </fragments>
-                            </li>
-                        </value>
-                    </li>
-
-                    <!-- Weapon Stack and Appearance -->
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/graphicData </xpath>
-                        <value>
-                            <onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-                        </value>
-                    </li>
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"] </xpath>
-                        <value>
-                            <thingClass>CombatExtended.AmmoThing</thingClass>
-                            <stackLimit>75</stackLimit>
-                            <resourceReadoutPriority>First</resourceReadoutPriority>
-                        </value>
-                    </li>
-
-                    <li Class="PatchOperationAttributeSet">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"] </xpath>
-                        <attribute>Class</attribute>
-                        <value>CombatExtended.AmmoDef</value>
-                    </li>
-
-                    <!-- Weapon Check Comps -->
-
-                    <li Class="PatchOperationConditional">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/comps</xpath>
-                        <nomatch Class="PatchOperationAdd">
-                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]</xpath>
-                            <value>
-                                <comps />
-                            </value>
-                        </nomatch>
-                    </li>
-                    <!-- Weapon Values -->
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/comps</xpath>
-                        <value>
-                            <li Class="CombatExtended.CompProperties_ExplosiveCE">
-                                <damageAmountBase>90</damageAmountBase>
-                                <explosiveDamageType>Bomb</explosiveDamageType>
-                                <explosiveRadius>4.125</explosiveRadius>
-
-                            </li>
-                            <li Class="CombatExtended.CompProperties_Fragments">
-                                <fragments>
-                                    <Fragment_Quasar>50</Fragment_Quasar>
-                                </fragments>
-                            </li>
-                        </value>
-                    </li>
-
-                    <li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-                        <defName>BOR_JI_Dunder_II</defName>
-                        <statBases>
-                            <Mass>1.73</Mass>
-                            <MarketValue>16.3125</MarketValue>
-                            <RangedWeapon_Cooldown>0.69</RangedWeapon_Cooldown>
-                            <SightsEfficiency>2.25</SightsEfficiency>
-                        </statBases>
-                        <Properties>
-                            <label>throw quasar satchel charge</label>
-                            <verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-                            <hasStandardCommand>true</hasStandardCommand>
-                            <range>22.5</range>
-                            <minRange>3</minRange>
-                            <warmupTime>0.45</warmupTime>
-                            <noiseRadius>3</noiseRadius>
-                            <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-                            <soundCast>ThrowGrenade</soundCast>
-                            <targetParams>
-                                <canTargetLocations>true</canTargetLocations>
-                            </targetParams>
-                            <defaultProjectile>BOR_Proj_Dunder_II</defaultProjectile>
-                            <onlyManualCast>true</onlyManualCast>
-                            <ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-                        </Properties>
-                        <weaponTags>
-                            <li>CE_AI_Grenade</li>
-                            <li>CE_OneHandedWeapon</li>
-                        </weaponTags>
-                    </li>
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs</xpath>
-                        <value>
-                            <RecipeDef ParentName="RSExplosive_RecipeBase">
-                                <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-                                <effectWorking>Cook</effectWorking>
-                                <soundWorking>Recipe_Smith</soundWorking>
-                                <workSkill>Crafting</workSkill>
-                                <unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
-                                <defName>BOR_Craft_10_Dunder_II</defName>
-                                <label>Craft 10 quasar satchel charges</label>
-                                <description>Craft 10 Dunder III quasar satchel charges.</description>
-                                <jobString>Crafting quasar satchel charges</jobString>
-                                <ingredients>
-                                    <li>
-                                        <filter>
-                                            <thingDefs>
-                                                <li>BOR_ComponentII</li>
-                                            </thingDefs>
-                                        </filter>
-                                        <count>2</count>
-                                    </li>
-                                    <li>
-                                        <filter>
-                                            <thingDefs>
-                                                <li>BOR_Sunsteel</li>
-                                            </thingDefs>
-                                        </filter>
-                                        <count>10</count>
-                                    </li>
-                                    <li>
-                                        <filter>
-                                            <thingDefs>
-                                                <li>BOR_QuasarAlloy</li>
-                                            </thingDefs>
-                                        </filter>
-                                        <count>20</count>
-                                    </li>
-                                    <li>
-                                        <filter>
-                                            <thingDefs>
-                                                <li>BOR_Neutronium</li>
-                                            </thingDefs>
-                                        </filter>
-                                        <count>35</count>
-                                    </li>
-                                </ingredients>
-                                <fixedIngredientFilter>
-                                    <thingDefs>
-                                        <li>BOR_Sunsteel</li>
-                                        <li>BOR_QuasarAlloy</li>
-                                        <li>BOR_ComponentII</li>
-                                        <li>BOR_Neutronium</li>
-                                    </thingDefs>
-                                </fixedIngredientFilter>
-                                <researchPrerequisites>
-                                    <li>BOR_Research_Weapons_II</li>
-                                    <li>MoltenTech</li>
-                                </researchPrerequisites>
+                                <RoyalFavorValue>3</RoyalFavorValue>
+                            </statBases>
+                            <thingCategories>
+                                <li>Grenades</li>
+                            </thingCategories>
+                            <recipeMaker>
+                                <researchPrerequisite>BOR_Research_Weapons_II</researchPrerequisite>
                                 <skillRequirements>
-                                    <Crafting>15</Crafting>
+                                    <Crafting>17</Crafting>
                                 </skillRequirements>
-                                <products>
-                                    <BOR_JI_Dunder_II>10</BOR_JI_Dunder_II>
-                                </products>
-                                <workAmount>47500</workAmount>
+                                <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+                                <workSkill>Crafting</workSkill>
+                                <effectWorking>Smith</effectWorking>
+                                <soundWorking>Recipe_Smith</soundWorking>
                                 <recipeUsers>
                                     <li>BOR_Bench_II</li>
                                     <li>BOR_Bench_IV</li>
                                 </recipeUsers>
-                            </RecipeDef>
-                        </value>
-                    </li>
-                </operations>
-
-			</match>
-	  </li>
-	 </operations>
-    </enabled>
-  </Operation>
+                                <unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
+                            </recipeMaker>
+                            <costList>
+                                <BOR_ComponentII>5</BOR_ComponentII>
+                                <BOR_QuasarAlloy>55</BOR_QuasarAlloy>
+                                <BOR_Neutronium>225</BOR_Neutronium>
+                            </costList>
+                            <verbs>
+                                <li>
+                                    <label>throw kwazaari satchel charge</label>
+                                    <verbClass>Verb_LaunchProjectile</verbClass>
+                                    <hasStandardCommand>true</hasStandardCommand>
+                                    <range>19</range>
+                                    <forcedMissRadius>0.5</forcedMissRadius>
+                                    <warmupTime>1.85</warmupTime>
+                                    <noiseRadius>4.625</noiseRadius>
+                                    <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+                                    <soundCast>ThrowGrenade</soundCast>
+                                    <targetParams>
+                                        <canTargetLocations>true</canTargetLocations>
+                                    </targetParams>
+                                    <defaultProjectile>BOR_Proj_Dunder_II</defaultProjectile>
+                                </li>
+                            </verbs>
+                        </ThingDef>
+
+                    </value>
+
+                </li>
+
+                <!-- check to see if CombatExtended is loaded as well, then modify the patched in defs to CE standards -->
+                <li MayRequire="ceteam.combatextended" Class="PatchOperationSequence">
+                    <operations>
+
+
+                        <!-- ========== Remove Recipe Maker & Verbs ========== -->
+                        <li Class="PatchOperationRemove">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/recipeMaker </xpath>
+                        </li>
+
+                        <li Class="PatchOperationRemove">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/costList </xpath>
+                        </li>
+
+                        <!-- Without this mod, Grief and Bobcat don't work, and it logs at ForcedMissRadius error.-->
+                        <li Class="PatchOperationRemove">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/verbs </xpath>
+                        </li>
+
+                        <!-- Change TickerType.-->
+                        <li Class="PatchOperationAdd">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"] </xpath>
+                            <value>
+                                <tickerType>Normal</tickerType>
+                            </value>
+                        </li>
+
+                        <!-- ========== Projectile thingClass ========== -->
+
+                        <li Class="PatchOperationReplace">
+                            <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_II"]/thingClass </xpath>
+                            <value>
+                                <thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+                            </value>
+                        </li>
+
+                        <!-- ========== Projectile ========== -->
+
+
+                        <li Class="PatchOperationReplace">
+                            <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_II"]/projectile</xpath>
+                            <value>
+                                <projectile Class="CombatExtended.ProjectilePropertiesCE">
+                                    <explosionRadius>10.125</explosionRadius>
+                                    <damageDef>Bomb</damageDef>
+                                    <damageAmountBase>450</damageAmountBase>
+                                    <explosionDelay>300</explosionDelay>
+                                    <dropsCasings>false</dropsCasings>
+                                    <speed>22</speed>
+                                    <casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+                                    <casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+                                    <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+                                </projectile>
+                            </value>
+                        </li>
+                        <!-- ========== Check Comp ========== -->
+
+
+                        <li Class="PatchOperationConditional">
+                            <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_II"]/comps</xpath>
+                            <nomatch Class="PatchOperationAdd">
+                                <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_II"]</xpath>
+                                <value>
+                                    <comps />
+                                </value>
+                            </nomatch>
+                        </li>
+
+                        <!-- ========== Add Fragmentation ========== -->
+
+                        <li Class="PatchOperationAdd">
+                            <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_II"]/comps</xpath>
+                            <value>
+                                <li Class="CombatExtended.CompProperties_Fragments">
+                                    <fragments>
+                                        <Fragment_Quasar>0</Fragment_Quasar>
+                                    </fragments>
+                                </li>
+                            </value>
+                        </li>
+
+                        <!-- Weapon Stack and Appearance -->
+
+                        <li Class="PatchOperationAdd">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/graphicData </xpath>
+                            <value>
+                                <onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+                            </value>
+                        </li>
+
+                        <li Class="PatchOperationAdd">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"] </xpath>
+                            <value>
+                                <thingClass>CombatExtended.AmmoThing</thingClass>
+                                <stackLimit>75</stackLimit>
+                                <resourceReadoutPriority>First</resourceReadoutPriority>
+                            </value>
+                        </li>
+
+                        <li Class="PatchOperationAttributeSet">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"] </xpath>
+                            <attribute>Class</attribute>
+                            <value>CombatExtended.AmmoDef</value>
+                        </li>
+
+                        <!-- Weapon Check Comps -->
+
+                        <li Class="PatchOperationConditional">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/comps</xpath>
+                            <nomatch Class="PatchOperationAdd">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]</xpath>
+                                <value>
+                                    <comps />
+                                </value>
+                            </nomatch>
+                        </li>
+                        <!-- Weapon Values -->
+
+                        <li Class="PatchOperationAdd">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_II"]/comps</xpath>
+                            <value>
+                                <li Class="CombatExtended.CompProperties_ExplosiveCE">
+                                    <damageAmountBase>90</damageAmountBase>
+                                    <explosiveDamageType>Bomb</explosiveDamageType>
+                                    <explosiveRadius>4.125</explosiveRadius>
+
+                                </li>
+                                <li Class="CombatExtended.CompProperties_Fragments">
+                                    <fragments>
+                                        <Fragment_Quasar>50</Fragment_Quasar>
+                                    </fragments>
+                                </li>
+                            </value>
+                        </li>
+
+                        <li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+                            <defName>BOR_JI_Dunder_II</defName>
+                            <statBases>
+                                <Mass>1.73</Mass>
+                                <MarketValue>16.3125</MarketValue>
+                                <RangedWeapon_Cooldown>0.69</RangedWeapon_Cooldown>
+                                <SightsEfficiency>2.25</SightsEfficiency>
+                            </statBases>
+                            <Properties>
+                                <label>throw quasar satchel charge</label>
+                                <verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+                                <hasStandardCommand>true</hasStandardCommand>
+                                <range>22.5</range>
+                                <minRange>3</minRange>
+                                <warmupTime>0.45</warmupTime>
+                                <noiseRadius>3</noiseRadius>
+                                <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+                                <soundCast>ThrowGrenade</soundCast>
+                                <targetParams>
+                                    <canTargetLocations>true</canTargetLocations>
+                                </targetParams>
+                                <defaultProjectile>BOR_Proj_Dunder_II</defaultProjectile>
+                                <onlyManualCast>true</onlyManualCast>
+                                <ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+                            </Properties>
+                            <weaponTags>
+                                <li>CE_AI_Grenade</li>
+                                <li>CE_OneHandedWeapon</li>
+                            </weaponTags>
+                        </li>
+                        <li Class="PatchOperationAdd">
+                            <xpath>Defs</xpath>
+                            <value>
+                                <RecipeDef ParentName="RSExplosive_RecipeBase">
+                                    <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+                                    <effectWorking>Cook</effectWorking>
+                                    <soundWorking>Recipe_Smith</soundWorking>
+                                    <workSkill>Crafting</workSkill>
+                                    <unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
+                                    <defName>BOR_Craft_10_Dunder_II</defName>
+                                    <label>Craft 10 quasar satchel charges</label>
+                                    <description>Craft 10 Dunder III quasar satchel charges.</description>
+                                    <jobString>Crafting quasar satchel charges</jobString>
+                                    <ingredients>
+                                        <li>
+                                            <filter>
+                                                <thingDefs>
+                                                    <li>BOR_ComponentII</li>
+                                                </thingDefs>
+                                            </filter>
+                                            <count>2</count>
+                                        </li>
+                                        <li>
+                                            <filter>
+                                                <thingDefs>
+                                                    <li>BOR_Sunsteel</li>
+                                                </thingDefs>
+                                            </filter>
+                                            <count>10</count>
+                                        </li>
+                                        <li>
+                                            <filter>
+                                                <thingDefs>
+                                                    <li>BOR_QuasarAlloy</li>
+                                                </thingDefs>
+                                            </filter>
+                                            <count>20</count>
+                                        </li>
+                                        <li>
+                                            <filter>
+                                                <thingDefs>
+                                                    <li>BOR_Neutronium</li>
+                                                </thingDefs>
+                                            </filter>
+                                            <count>35</count>
+                                        </li>
+                                    </ingredients>
+                                    <fixedIngredientFilter>
+                                        <thingDefs>
+                                            <li>BOR_Sunsteel</li>
+                                            <li>BOR_QuasarAlloy</li>
+                                            <li>BOR_ComponentII</li>
+                                            <li>BOR_Neutronium</li>
+                                        </thingDefs>
+                                    </fixedIngredientFilter>
+                                    <researchPrerequisites>
+                                        <li>BOR_Research_Weapons_II</li>
+                                        <li>MoltenTech</li>
+                                    </researchPrerequisites>
+                                    <skillRequirements>
+                                        <Crafting>15</Crafting>
+                                    </skillRequirements>
+                                    <products>
+                                        <BOR_JI_Dunder_II>10</BOR_JI_Dunder_II>
+                                    </products>
+                                    <workAmount>47500</workAmount>
+                                    <recipeUsers>
+                                        <li>BOR_Bench_II</li>
+                                        <li>BOR_Bench_IV</li>
+                                    </recipeUsers>
+                                </RecipeDef>
+                            </value>
+                        </li>
+                    </operations>
+
+                </li>
+            </operations>
+        </enabled>
+    </Operation>
 
 </Patch>
\ No newline at end of file
diff --git a/1.6/Mods/Rimsenal/Patches/Defs/tier3_satchel.xml b/1.6/Mods/Rimsenal/Patches/Defs/tier3_satchel.xml
index 2e39d4bc..14796576 100644
--- a/1.6/Mods/Rimsenal/Patches/Defs/tier3_satchel.xml
+++ b/1.6/Mods/Rimsenal/Patches/Defs/tier3_satchel.xml
@@ -1,347 +1,342 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Patch>
 
-  <Operation Class="BeyondOurReachModSettings.PatchOperationModSettings">
-    <modSettingDef>BOR_Setting_RimsenalSatchelVariants</modSettingDef>
-    <enabled Class="PatchOperationSequence">
-	  <operations>
-	  
-	  <!-- patch sequence to patch in defs while proceeding to check for CE -->
-	  <li Class="PatchOperationAdd">
-      <xpath>Defs</xpath>
-      
-	  <value>
-	  
-                <ThingDef ParentName="BaseGrenadeProjectile">
-                    <defName>BOR_Proj_Dunder_III</defName>
-                    <label>tenebral Satchel charge</label>
-                    <thingClass>Projectile_Explosive</thingClass>
-                    <graphicData>
-                        <color>(0.2, 0.2, 0.2)</color>
-                        <texPath>Things/Projectile/Dunder</texPath>
-                        <graphicClass>Graphic_Single</graphicClass>
-                    </graphicData>
-                    <projectile>
-                        <explosionRadius>19</explosionRadius>
-                        <damageDef>Bomb</damageDef>
-                        <damageAmountBase>1000</damageAmountBase>
-                        <explosionDelay>242</explosionDelay>
-                    </projectile>
-                </ThingDef>
-
-                <ThingDef ParentName="BaseRSGrenade">
-                    <defName>BOR_JI_Dunder_III</defName>
-                    <equipmentType>Primary</equipmentType>
-                    <label>tenebral satchel charge</label>
-                    <description>A "Dunder IV" tenebral Satchel charge. Combat engineer's best friend.</description>
-                    <graphicData>
-                        <color>(0.2, 0.2, 0.2)</color>
-                        <texPath>Things/A16/Dunder</texPath>
-                        <graphicClass>Graphic_Single</graphicClass>
-                    </graphicData>
-                    <tradeTags>
-                        <li>BOR_Tech_III</li>
-                    </tradeTags>
-                    <soundInteract>Interact_Grenade</soundInteract>
-                    <techLevel>Archotech</techLevel>
-                    <statBases>
-                        <Mass>2.08</Mass>
-                        <RangedWeapon_Cooldown>1.29</RangedWeapon_Cooldown>
-
-                        <RoyalFavorValue>6</RoyalFavorValue>
-                    </statBases>
-                    <thingCategories>
-                        <li>Grenades</li>
-                    </thingCategories>
-                    <recipeMaker>
-                        <researchPrerequisite>BOR_Research_Weapons_III</researchPrerequisite>
-                        <skillRequirements>
-                            <Crafting>20</Crafting>
-                        </skillRequirements>
-                        <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-                        <workSkill>Crafting</workSkill>
-                        <effectWorking>Smith</effectWorking>
-                        <soundWorking>Recipe_Smith</soundWorking>
-                        <recipeUsers>
-                            <li>BOR_Bench_III</li>
-                            <li>BOR_Bench_IV</li>
-                        </recipeUsers>
-                        <unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
-                    </recipeMaker>
-                    <costList>
-                        <BOR_ComponentIII>5</BOR_ComponentIII>
-                        <BOR_Tenebrite>55</BOR_Tenebrite>
-                        <BOR_Neutronium>337</BOR_Neutronium>
-                    </costList>
-                    <verbs>
-                        <li>
-                            <label>throw kwazaari satchel charge</label>
-                            <verbClass>Verb_LaunchProjectile</verbClass>
-                            <hasStandardCommand>true</hasStandardCommand>
-                            <range>28</range>
-                            <forcedMissRadius>0.5</forcedMissRadius>
-                            <warmupTime>1.55</warmupTime>
-                            <noiseRadius>3.85</noiseRadius>
-                            <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-                            <soundCast>ThrowGrenade</soundCast>
-                            <targetParams>
-                                <canTargetLocations>true</canTargetLocations>
-                            </targetParams>
-                            <defaultProjectile>BOR_Proj_Dunder_III</defaultProjectile>
-                        </li>
-                    </verbs>
-                </ThingDef>
-
-      </value>
-	  </li>
-	  
-	  <!-- check to see if CombatExtended is loaded as well, then modify the patched in defs to CE standards -->
-	  <li Class="PatchOperationFindMod">
-		<mods>
-		  <li>Combat Extended</li>
-		</mods>
-			<match Class="PatchOperationSequence">
-                <operations>
-
-
-                    <!-- ========== Remove Recipe Maker & Verbs ========== -->
-                    <li Class="PatchOperationRemove">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/recipeMaker </xpath>
-                    </li>
-
-                    <li Class="PatchOperationRemove">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/costList </xpath>
-                    </li>
-
-                    <!-- Without this mod, Grief and Bobcat don't work, and it logs at ForcedMissRadius error.-->
-                    <li Class="PatchOperationRemove">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/verbs </xpath>
-                    </li>
-
-                    <!-- Change TickerType.-->
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"] </xpath>
-                        <value>
-                            <tickerType>Normal</tickerType>
-                        </value>
-                    </li>
-
-                    <!-- ========== Projectile thingClass ========== -->
-
-                    <li Class="PatchOperationReplace">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_III"]/thingClass </xpath>
-                        <value>
-                            <thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
-                        </value>
-                    </li>
-
-                    <!-- ========== Projectile ========== -->
-
-
-                    <li Class="PatchOperationReplace">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_III"]/projectile</xpath>
-                        <value>
-                            <projectile Class="CombatExtended.ProjectilePropertiesCE">
-                                <explosionRadius>15.875</explosionRadius>
+    <Operation Class="BeyondOurReachModSettings.PatchOperationModSettings">
+        <modSettingDef>BOR_Setting_RimsenalSatchelVariants</modSettingDef>
+        <enabled Class="PatchOperationSequence">
+            <operations>
+
+                <!-- patch sequence to patch in defs while proceeding to check for CE -->
+                <li Class="PatchOperationAdd">
+                    <xpath>Defs</xpath>
+
+                    <value>
+
+                        <ThingDef ParentName="BaseGrenadeProjectile">
+                            <defName>BOR_Proj_Dunder_III</defName>
+                            <label>tenebral Satchel charge</label>
+                            <thingClass>Projectile_Explosive</thingClass>
+                            <graphicData>
+                                <color>(0.2, 0.2, 0.2)</color>
+                                <texPath>Things/Projectile/Dunder</texPath>
+                                <graphicClass>Graphic_Single</graphicClass>
+                            </graphicData>
+                            <projectile>
+                                <explosionRadius>19</explosionRadius>
                                 <damageDef>Bomb</damageDef>
-                                <damageAmountBase>675</damageAmountBase>
-                                <explosionDelay>250</explosionDelay>
-                                <dropsCasings>false</dropsCasings>
-                                <speed>33</speed>
-                                <casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
-                                <casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
-                                <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+                                <damageAmountBase>1000</damageAmountBase>
+                                <explosionDelay>242</explosionDelay>
                             </projectile>
-                        </value>
-                    </li>
-                    <!-- ========== Check Comp ========== -->
+                        </ThingDef>
 
+                        <ThingDef ParentName="BaseRSGrenade">
+                            <defName>BOR_JI_Dunder_III</defName>
+                            <equipmentType>Primary</equipmentType>
+                            <label>tenebral satchel charge</label>
+                            <description>A "Dunder IV" tenebral Satchel charge. Combat engineer's best friend.</description>
+                            <graphicData>
+                                <color>(0.2, 0.2, 0.2)</color>
+                                <texPath>Things/A16/Dunder</texPath>
+                                <graphicClass>Graphic_Single</graphicClass>
+                            </graphicData>
+                            <tradeTags>
+                                <li>BOR_Tech_III</li>
+                            </tradeTags>
+                            <soundInteract>Interact_Grenade</soundInteract>
+                            <techLevel>Archotech</techLevel>
+                            <statBases>
+                                <Mass>2.08</Mass>
+                                <RangedWeapon_Cooldown>1.29</RangedWeapon_Cooldown>
 
-                    <li Class="PatchOperationConditional">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_III"]/comps</xpath>
-                        <nomatch Class="PatchOperationAdd">
-                            <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_III"]</xpath>
-                            <value>
-                                <comps />
-                            </value>
-                        </nomatch>
-                    </li>
-
-                    <!-- ========== Add Fragmentation ========== -->
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_III"]/comps</xpath>
-                        <value>
-                            <li Class="CombatExtended.CompProperties_Fragments">
-                                <fragments>
-                                    <Fragment_Tenebral>0</Fragment_Tenebral>
-                                </fragments>
-                            </li>
-                        </value>
-                    </li>
-
-                    <!-- Weapon Stack and Appearance -->
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/graphicData </xpath>
-                        <value>
-                            <onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
-                        </value>
-                    </li>
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"] </xpath>
-                        <value>
-                            <thingClass>CombatExtended.AmmoThing</thingClass>
-                            <stackLimit>75</stackLimit>
-                            <resourceReadoutPriority>First</resourceReadoutPriority>
-                        </value>
-                    </li>
-
-                    <li Class="PatchOperationAttributeSet">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"] </xpath>
-                        <attribute>Class</attribute>
-                        <value>CombatExtended.AmmoDef</value>
-                    </li>
-
-                    <!-- Weapon Check Comps -->
-
-                    <li Class="PatchOperationConditional">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/comps</xpath>
-                        <nomatch Class="PatchOperationAdd">
-                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]</xpath>
-                            <value>
-                                <comps />
-                            </value>
-                        </nomatch>
-                    </li>
-                    <!-- Weapon Values -->
-
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/comps</xpath>
-                        <value>
-                            <li Class="CombatExtended.CompProperties_ExplosiveCE">
-                                <damageAmountBase>135</damageAmountBase>
-                                <explosiveDamageType>Bomb</explosiveDamageType>
-                                <explosiveRadius>6.4</explosiveRadius>
-
-                            </li>
-                            <li Class="CombatExtended.CompProperties_Fragments">
-                                <fragments>
-                                    <Fragment_Tenebral>50</Fragment_Tenebral>
-                                </fragments>
-                            </li>
-                        </value>
-                    </li>
-
-                    <li Class="CombatExtended.PatchOperationMakeGunCECompatible">
-                        <defName>BOR_JI_Dunder_III</defName>
-                        <statBases>
-                            <Mass>1.4</Mass>
-                            <MarketValue>24.5</MarketValue>
-                            <RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
-                            <SightsEfficiency>3.125</SightsEfficiency>
-                        </statBases>
-                        <Properties>
-                            <label>throw tenebral satchel charge</label>
-                            <verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
-                            <hasStandardCommand>true</hasStandardCommand>
-                            <range>33.75</range>
-                            <minRange>3</minRange>
-                            <warmupTime>0.35</warmupTime>
-                            <noiseRadius>2</noiseRadius>
-                            <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
-                            <soundCast>ThrowGrenade</soundCast>
-                            <targetParams>
-                                <canTargetLocations>true</canTargetLocations>
-                            </targetParams>
-                            <defaultProjectile>BOR_Proj_Dunder_III</defaultProjectile>
-                            <onlyManualCast>true</onlyManualCast>
-                            <ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
-                        </Properties>
-                        <weaponTags>
-                            <li>CE_AI_Grenade</li>
-                            <li>CE_OneHandedWeapon</li>
-                        </weaponTags>
-                    </li>
-                    <li Class="PatchOperationAdd">
-                        <xpath>Defs</xpath>
-                        <value>
-                            <RecipeDef ParentName="RSExplosive_RecipeBase">
-                                <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
-                                <effectWorking>Cook</effectWorking>
-                                <soundWorking>Recipe_Smith</soundWorking>
-                                <workSkill>Crafting</workSkill>
-                                <unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
-                                <defName>BOR_Craft_10_Dunder_III</defName>
-                                <label>Craft 10 tenebral satchel charges</label>
-                                <description>Craft 10 Dunder IV tenebral satchel charges.</description>
-                                <jobString>Crafting tenebral satchel charges</jobString>
-                                <ingredients>
-                                    <li>
-                                        <filter>
-                                            <thingDefs>
-                                                <li>BOR_ComponentIII</li>
-                                            </thingDefs>
-                                        </filter>
-                                        <count>2</count>
-                                    </li>
-                                    <li>
-                                        <filter>
-                                            <thingDefs>
-                                                <li>BOR_Sunsteel</li>
-                                            </thingDefs>
-                                        </filter>
-                                        <count>10</count>
-                                    </li>
-                                    <li>
-                                        <filter>
-                                            <thingDefs>
-                                                <li>BOR_Tenebrite</li>
-                                            </thingDefs>
-                                        </filter>
-                                        <count>20</count>
-                                    </li>
-                                    <li>
-                                        <filter>
-                                            <thingDefs>
-                                                <li>BOR_Neutronium</li>
-                                            </thingDefs>
-                                        </filter>
-                                        <count>47</count>
-                                    </li>
-                                </ingredients>
-                                <fixedIngredientFilter>
-                                    <thingDefs>
-                                        <li>BOR_Sunsteel</li>
-                                        <li>BOR_ComponentIII</li>
-                                        <li>BOR_Neutronium</li>
-                                    </thingDefs>
-                                </fixedIngredientFilter>
-                                <researchPrerequisites>
-                                    <li>BOR_Research_Weapons_III</li>
-                                    <li>MoltenTech</li>
-                                </researchPrerequisites>
+                                <RoyalFavorValue>6</RoyalFavorValue>
+                            </statBases>
+                            <thingCategories>
+                                <li>Grenades</li>
+                            </thingCategories>
+                            <recipeMaker>
+                                <researchPrerequisite>BOR_Research_Weapons_III</researchPrerequisite>
                                 <skillRequirements>
-                                    <Crafting>18</Crafting>
+                                    <Crafting>20</Crafting>
                                 </skillRequirements>
-                                <products>
-                                    <BOR_JI_Dunder_III>10</BOR_JI_Dunder_III>
-                                </products>
-                                <workAmount>65000</workAmount>
+                                <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+                                <workSkill>Crafting</workSkill>
+                                <effectWorking>Smith</effectWorking>
+                                <soundWorking>Recipe_Smith</soundWorking>
                                 <recipeUsers>
                                     <li>BOR_Bench_III</li>
                                     <li>BOR_Bench_IV</li>
                                 </recipeUsers>
-                            </RecipeDef>
-                        </value>
-                    </li>
-                </operations>
-
-			</match>
-	  </li>
-	 </operations>
-    </enabled>
-  </Operation>
+                                <unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
+                            </recipeMaker>
+                            <costList>
+                                <BOR_ComponentIII>5</BOR_ComponentIII>
+                                <BOR_Tenebrite>55</BOR_Tenebrite>
+                                <BOR_Neutronium>337</BOR_Neutronium>
+                            </costList>
+                            <verbs>
+                                <li>
+                                    <label>throw kwazaari satchel charge</label>
+                                    <verbClass>Verb_LaunchProjectile</verbClass>
+                                    <hasStandardCommand>true</hasStandardCommand>
+                                    <range>28</range>
+                                    <forcedMissRadius>0.5</forcedMissRadius>
+                                    <warmupTime>1.55</warmupTime>
+                                    <noiseRadius>3.85</noiseRadius>
+                                    <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+                                    <soundCast>ThrowGrenade</soundCast>
+                                    <targetParams>
+                                        <canTargetLocations>true</canTargetLocations>
+                                    </targetParams>
+                                    <defaultProjectile>BOR_Proj_Dunder_III</defaultProjectile>
+                                </li>
+                            </verbs>
+                        </ThingDef>
+
+                    </value>
+                </li>
+
+                <!-- check to see if CombatExtended is loaded as well, then modify the patched in defs to CE standards -->
+                <li MayRequire="ceteam.combatextended" Class="PatchOperationSequence">
+                    <operations>
+
+
+                        <!-- ========== Remove Recipe Maker & Verbs ========== -->
+                        <li Class="PatchOperationRemove">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/recipeMaker </xpath>
+                        </li>
+
+                        <li Class="PatchOperationRemove">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/costList </xpath>
+                        </li>
+
+                        <!-- Without this mod, Grief and Bobcat don't work, and it logs at ForcedMissRadius error.-->
+                        <li Class="PatchOperationRemove">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/verbs </xpath>
+                        </li>
+
+                        <!-- Change TickerType.-->
+                        <li Class="PatchOperationAdd">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"] </xpath>
+                            <value>
+                                <tickerType>Normal</tickerType>
+                            </value>
+                        </li>
+
+                        <!-- ========== Projectile thingClass ========== -->
+
+                        <li Class="PatchOperationReplace">
+                            <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_III"]/thingClass </xpath>
+                            <value>
+                                <thingClass>CombatExtended.ProjectileCE_Explosive</thingClass>
+                            </value>
+                        </li>
+
+                        <!-- ========== Projectile ========== -->
+
+
+                        <li Class="PatchOperationReplace">
+                            <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_III"]/projectile</xpath>
+                            <value>
+                                <projectile Class="CombatExtended.ProjectilePropertiesCE">
+                                    <explosionRadius>15.875</explosionRadius>
+                                    <damageDef>Bomb</damageDef>
+                                    <damageAmountBase>675</damageAmountBase>
+                                    <explosionDelay>250</explosionDelay>
+                                    <dropsCasings>false</dropsCasings>
+                                    <speed>33</speed>
+                                    <casingMoteDefname>Fleck_GrenadePin</casingMoteDefname>
+                                    <casingFilthDefname>Filth_GrenadeAmmoCasings</casingFilthDefname>
+                                    <applyDamageToExplosionCellsNeighbors>true</applyDamageToExplosionCellsNeighbors>
+                                </projectile>
+                            </value>
+                        </li>
+                        <!-- ========== Check Comp ========== -->
+
+
+                        <li Class="PatchOperationConditional">
+                            <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_III"]/comps</xpath>
+                            <nomatch Class="PatchOperationAdd">
+                                <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_III"]</xpath>
+                                <value>
+                                    <comps />
+                                </value>
+                            </nomatch>
+                        </li>
+
+                        <!-- ========== Add Fragmentation ========== -->
+
+                        <li Class="PatchOperationAdd">
+                            <xpath>Defs/ThingDef[defName="BOR_Proj_Dunder_III"]/comps</xpath>
+                            <value>
+                                <li Class="CombatExtended.CompProperties_Fragments">
+                                    <fragments>
+                                        <Fragment_Tenebral>0</Fragment_Tenebral>
+                                    </fragments>
+                                </li>
+                            </value>
+                        </li>
+
+                        <!-- Weapon Stack and Appearance -->
+
+                        <li Class="PatchOperationAdd">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/graphicData </xpath>
+                            <value>
+                                <onGroundRandomRotateAngle>0</onGroundRandomRotateAngle>
+                            </value>
+                        </li>
+
+                        <li Class="PatchOperationAdd">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"] </xpath>
+                            <value>
+                                <thingClass>CombatExtended.AmmoThing</thingClass>
+                                <stackLimit>75</stackLimit>
+                                <resourceReadoutPriority>First</resourceReadoutPriority>
+                            </value>
+                        </li>
+
+                        <li Class="PatchOperationAttributeSet">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"] </xpath>
+                            <attribute>Class</attribute>
+                            <value>CombatExtended.AmmoDef</value>
+                        </li>
+
+                        <!-- Weapon Check Comps -->
+
+                        <li Class="PatchOperationConditional">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/comps</xpath>
+                            <nomatch Class="PatchOperationAdd">
+                                <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]</xpath>
+                                <value>
+                                    <comps />
+                                </value>
+                            </nomatch>
+                        </li>
+                        <!-- Weapon Values -->
+
+                        <li Class="PatchOperationAdd">
+                            <xpath>Defs/ThingDef[defName="BOR_JI_Dunder_III"]/comps</xpath>
+                            <value>
+                                <li Class="CombatExtended.CompProperties_ExplosiveCE">
+                                    <damageAmountBase>135</damageAmountBase>
+                                    <explosiveDamageType>Bomb</explosiveDamageType>
+                                    <explosiveRadius>6.4</explosiveRadius>
+
+                                </li>
+                                <li Class="CombatExtended.CompProperties_Fragments">
+                                    <fragments>
+                                        <Fragment_Tenebral>50</Fragment_Tenebral>
+                                    </fragments>
+                                </li>
+                            </value>
+                        </li>
+
+                        <li Class="CombatExtended.PatchOperationMakeGunCECompatible">
+                            <defName>BOR_JI_Dunder_III</defName>
+                            <statBases>
+                                <Mass>1.4</Mass>
+                                <MarketValue>24.5</MarketValue>
+                                <RangedWeapon_Cooldown>0.58</RangedWeapon_Cooldown>
+                                <SightsEfficiency>3.125</SightsEfficiency>
+                            </statBases>
+                            <Properties>
+                                <label>throw tenebral satchel charge</label>
+                                <verbClass>CombatExtended.Verb_ShootCEOneUse</verbClass>
+                                <hasStandardCommand>true</hasStandardCommand>
+                                <range>33.75</range>
+                                <minRange>3</minRange>
+                                <warmupTime>0.35</warmupTime>
+                                <noiseRadius>2</noiseRadius>
+                                <ai_IsBuildingDestroyer>true</ai_IsBuildingDestroyer>
+                                <soundCast>ThrowGrenade</soundCast>
+                                <targetParams>
+                                    <canTargetLocations>true</canTargetLocations>
+                                </targetParams>
+                                <defaultProjectile>BOR_Proj_Dunder_III</defaultProjectile>
+                                <onlyManualCast>true</onlyManualCast>
+                                <ignorePartialLoSBlocker>true</ignorePartialLoSBlocker>
+                            </Properties>
+                            <weaponTags>
+                                <li>CE_AI_Grenade</li>
+                                <li>CE_OneHandedWeapon</li>
+                            </weaponTags>
+                        </li>
+                        <li Class="PatchOperationAdd">
+                            <xpath>Defs</xpath>
+                            <value>
+                                <RecipeDef ParentName="RSExplosive_RecipeBase">
+                                    <workSpeedStat>GeneralLaborSpeed</workSpeedStat>
+                                    <effectWorking>Cook</effectWorking>
+                                    <soundWorking>Recipe_Smith</soundWorking>
+                                    <workSkill>Crafting</workSkill>
+                                    <unfinishedThingDef>UnfinishedGun</unfinishedThingDef>
+                                    <defName>BOR_Craft_10_Dunder_III</defName>
+                                    <label>Craft 10 tenebral satchel charges</label>
+                                    <description>Craft 10 Dunder IV tenebral satchel charges.</description>
+                                    <jobString>Crafting tenebral satchel charges</jobString>
+                                    <ingredients>
+                                        <li>
+                                            <filter>
+                                                <thingDefs>
+                                                    <li>BOR_ComponentIII</li>
+                                                </thingDefs>
+                                            </filter>
+                                            <count>2</count>
+                                        </li>
+                                        <li>
+                                            <filter>
+                                                <thingDefs>
+                                                    <li>BOR_Sunsteel</li>
+                                                </thingDefs>
+                                            </filter>
+                                            <count>10</count>
+                                        </li>
+                                        <li>
+                                            <filter>
+                                                <thingDefs>
+                                                    <li>BOR_Tenebrite</li>
+                                                </thingDefs>
+                                            </filter>
+                                            <count>20</count>
+                                        </li>
+                                        <li>
+                                            <filter>
+                                                <thingDefs>
+                                                    <li>BOR_Neutronium</li>
+                                                </thingDefs>
+                                            </filter>
+                                            <count>47</count>
+                                        </li>
+                                    </ingredients>
+                                    <fixedIngredientFilter>
+                                        <thingDefs>
+                                            <li>BOR_Sunsteel</li>
+                                            <li>BOR_ComponentIII</li>
+                                            <li>BOR_Neutronium</li>
+                                        </thingDefs>
+                                    </fixedIngredientFilter>
+                                    <researchPrerequisites>
+                                        <li>BOR_Research_Weapons_III</li>
+                                        <li>MoltenTech</li>
+                                    </researchPrerequisites>
+                                    <skillRequirements>
+                                        <Crafting>18</Crafting>
+                                    </skillRequirements>
+                                    <products>
+                                        <BOR_JI_Dunder_III>10</BOR_JI_Dunder_III>
+                                    </products>
+                                    <workAmount>65000</workAmount>
+                                    <recipeUsers>
+                                        <li>BOR_Bench_III</li>
+                                        <li>BOR_Bench_IV</li>
+                                    </recipeUsers>
+                                </RecipeDef>
+                            </value>
+                        </li>
+                    </operations>
+
+                </li>
+            </operations>
+        </enabled>
+    </Operation>
 
 </Patch>
\ No newline at end of file
diff --git a/1.6/Mods/vae/Patches/royalty/Tier1_Royal_Armour.xml b/1.6/Mods/vae/Patches/royalty/Tier1_Royal_Armour.xml
index b83a36e3..357109d0 100644
--- a/1.6/Mods/vae/Patches/royalty/Tier1_Royal_Armour.xml
+++ b/1.6/Mods/vae/Patches/royalty/Tier1_Royal_Armour.xml
@@ -332,8 +332,8 @@
                         </recipeUsers>
                     </recipeMaker>
                     <comps>
-                        <li Class="VFECore.CompProperties_ShieldBubble">
-                            <compClass>VFECore.CompShieldBubble</compClass>
+                        <li Class="VEF.Apparels.CompProperties_ShieldBubble">
+                            <compClass>VEF.Apparels.CompProperties_ShieldBubble</compClass>
                             <blockRangedAttack>true</blockRangedAttack>
                             <blockMeleeAttack>false</blockMeleeAttack>
                             <showWhenDrafted>true</showWhenDrafted>
@@ -724,14 +724,14 @@
 					</li>
 
 					<li Class="PatchOperationReplace" MayRequire="ludeon.rimworld.royalty">
-						<xpath>Defs/ThingDef[defName="BOR_Solar_Apparel_RoyalSiegeArmor"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
+						<xpath>Defs/ThingDef[defName="BOR_Solar_Apparel_RoyalSiegeArmor"]/comps/li[@Class="VEF.Apparels.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
 						<value>
 							<EnergyShieldRechargeRate>0.45</EnergyShieldRechargeRate>
 						</value>
 					</li>
 
 					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="BOR_Solar_Apparel_RoyalSiegeArmor"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
+						<xpath>Defs/ThingDef[defName="BOR_Solar_Apparel_RoyalSiegeArmor"]/comps/li[@Class="VEF.Apparels.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
 						<value>
 							<EnergyShieldEnergyMax>225</EnergyShieldEnergyMax>
 						</value>
diff --git a/1.6/Mods/vae/Patches/royalty/Tier2_Royal_Armour.xml b/1.6/Mods/vae/Patches/royalty/Tier2_Royal_Armour.xml
index 58231ecf..b318059a 100644
--- a/1.6/Mods/vae/Patches/royalty/Tier2_Royal_Armour.xml
+++ b/1.6/Mods/vae/Patches/royalty/Tier2_Royal_Armour.xml
@@ -340,8 +340,8 @@
                         </recipeUsers>
                     </recipeMaker>
                     <comps>
-                        <li Class="VFECore.CompProperties_ShieldBubble">
-                            <compClass>VFECore.CompShieldBubble</compClass>
+                        <li Class="VEF.Apparels.CompProperties_ShieldBubble">
+                            <compClass>VEF.Apparels.CompProperties_ShieldBubble</compClass>
                             <blockRangedAttack>true</blockRangedAttack>
                             <blockMeleeAttack>false</blockMeleeAttack>
                             <showWhenDrafted>true</showWhenDrafted>
@@ -732,14 +732,14 @@
 					</li>
 
 					<li Class="PatchOperationReplace" MayRequire="ludeon.rimworld.royalty">
-						<xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_RoyalSiegeArmor"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
+						<xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_RoyalSiegeArmor"]/comps/li[@Class="VEF.Apparels.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
 						<value>
 							<EnergyShieldRechargeRate>0.675</EnergyShieldRechargeRate>
 						</value>
 					</li>
 
 					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_RoyalSiegeArmor"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
+						<xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_RoyalSiegeArmor"]/comps/li[@Class="VEF.Apparels.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
 						<value>
 							<EnergyShieldEnergyMax>337</EnergyShieldEnergyMax>
 						</value>
diff --git a/1.6/Mods/vae/Patches/royalty/Tier3_Royal_Armour.xml b/1.6/Mods/vae/Patches/royalty/Tier3_Royal_Armour.xml
index ae57fddc..c346b0da 100644
--- a/1.6/Mods/vae/Patches/royalty/Tier3_Royal_Armour.xml
+++ b/1.6/Mods/vae/Patches/royalty/Tier3_Royal_Armour.xml
@@ -340,8 +340,8 @@
                         </recipeUsers>
                     </recipeMaker>
                     <comps>
-                        <li Class="VFECore.CompProperties_ShieldBubble">
-                            <compClass>VFECore.CompShieldBubble</compClass>
+                        <li Class="VEF.Apparels.CompProperties_ShieldBubble">
+                            <compClass>VEF.Apparels.CompProperties_ShieldBubble</compClass>
                             <blockRangedAttack>true</blockRangedAttack>
                             <blockMeleeAttack>false</blockMeleeAttack>
                             <showWhenDrafted>true</showWhenDrafted>
@@ -738,14 +738,14 @@
 					</li>
 
 					<li Class="PatchOperationReplace" MayRequire="ludeon.rimworld.royalty">
-						<xpath>Defs/ThingDef[defName="BOR_Tenebral_Apparel_RoyalSiegeArmor"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
+						<xpath>Defs/ThingDef[defName="BOR_Tenebral_Apparel_RoyalSiegeArmor"]/comps/li[@Class="VEF.Apparels.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
 						<value>
 							<EnergyShieldRechargeRate>1.013</EnergyShieldRechargeRate>
 						</value>
 					</li>
 
 					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="BOR_Tenebral_Apparel_RoyalSiegeArmor"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
+						<xpath>Defs/ThingDef[defName="BOR_Tenebral_Apparel_RoyalSiegeArmor"]/comps/li[@Class="VEF.Apparels.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
 						<value>
 							<EnergyShieldEnergyMax>505</EnergyShieldEnergyMax>
 						</value>
diff --git a/1.6/Mods/vae/Patches/tier1_armour.xml b/1.6/Mods/vae/Patches/tier1_armour.xml
index 7776593f..b1e4ad1f 100644
--- a/1.6/Mods/vae/Patches/tier1_armour.xml
+++ b/1.6/Mods/vae/Patches/tier1_armour.xml
@@ -322,8 +322,8 @@
 						</recipeUsers>
 					</recipeMaker>
 					<comps>
-						<li Class="VFECore.CompProperties_ShieldBubble">
-							<compClass>VFECore.CompShieldBubble</compClass>
+						<li Class="VEF.Apparels.CompProperties_ShieldBubble">
+							<compClass>VEF.Apparels.CompProperties_ShieldBubble</compClass>
 							<blockRangedAttack>true</blockRangedAttack>
 							<blockMeleeAttack>false</blockMeleeAttack>
 							<showWhenDrafted>true</showWhenDrafted>
@@ -841,14 +841,14 @@
 					</li>
 
 					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="BOR_Solar_Apparel_HeavyMarineArmor"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
+						<xpath>Defs/ThingDef[defName="BOR_Solar_Apparel_HeavyMarineArmor"]/comps/li[@Class="VEF.Apparels.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
 						<value>
 							<EnergyShieldRechargeRate>0.225</EnergyShieldRechargeRate>
 						</value>
 					</li>
 
 					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="BOR_Solar_Apparel_HeavyMarineArmor"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
+						<xpath>Defs/ThingDef[defName="BOR_Solar_Apparel_HeavyMarineArmor"]/comps/li[@Class="VEF.Apparels.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
 						<value>
 							<EnergyShieldEnergyMax>225</EnergyShieldEnergyMax>
 						</value>
diff --git a/1.6/Mods/vae/Patches/tier2_armour.xml b/1.6/Mods/vae/Patches/tier2_armour.xml
index 0a66f1e4..a5ca5b19 100644
--- a/1.6/Mods/vae/Patches/tier2_armour.xml
+++ b/1.6/Mods/vae/Patches/tier2_armour.xml
@@ -330,8 +330,8 @@
 						</recipeUsers>
 					</recipeMaker>
 					<comps>
-						<li Class="VFECore.CompProperties_ShieldBubble">
-							<compClass>VFECore.CompShieldBubble</compClass>
+						<li Class="VEF.Apparels.CompProperties_ShieldBubble">
+							<compClass>VEF.Apparels.CompProperties_ShieldBubble</compClass>
 							<blockRangedAttack>true</blockRangedAttack>
 							<blockMeleeAttack>false</blockMeleeAttack>
 							<showWhenDrafted>true</showWhenDrafted>
@@ -848,14 +848,14 @@
 					</li>
 
 					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_HeavyMarineArmor"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
+						<xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_HeavyMarineArmor"]/comps/li[@Class="VEF.Apparels.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
 						<value>
 							<EnergyShieldRechargeRate>0.338</EnergyShieldRechargeRate>
 						</value>
 					</li>
 
 					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_HeavyMarineArmor"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
+						<xpath>Defs/ThingDef[defName="BOR_Quasar_Apparel_HeavyMarineArmor"]/comps/li[@Class="VEF.Apparels.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
 						<value>
 							<EnergyShieldEnergyMax>337</EnergyShieldEnergyMax>
 						</value>
diff --git a/1.6/Mods/vae/Patches/tier3_armour.xml b/1.6/Mods/vae/Patches/tier3_armour.xml
index 04e6d507..4cc21fce 100644
--- a/1.6/Mods/vae/Patches/tier3_armour.xml
+++ b/1.6/Mods/vae/Patches/tier3_armour.xml
@@ -329,8 +329,8 @@
 						</recipeUsers>
 					</recipeMaker>
 					<comps>
-						<li Class="VFECore.CompProperties_ShieldBubble">
-							<compClass>VFECore.CompShieldBubble</compClass>
+						<li Class="VEF.Apparels.CompProperties_ShieldBubble">
+							<compClass>VEF.Apparels.CompProperties_ShieldBubble</compClass>
 							<blockRangedAttack>true</blockRangedAttack>
 							<blockMeleeAttack>false</blockMeleeAttack>
 							<showWhenDrafted>true</showWhenDrafted>
@@ -856,14 +856,14 @@
 					</li>
 
 					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="BOR_Tenebral_Apparel_HeavyMarineArmor"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
+						<xpath>Defs/ThingDef[defName="BOR_Tenebral_Apparel_HeavyMarineArmor"]/comps/li[@Class="VEF.Apparels.CompProperties_ShieldBubble"]/EnergyShieldRechargeRate</xpath>
 						<value>
 							<EnergyShieldRechargeRate>0.507</EnergyShieldRechargeRate>
 						</value>
 					</li>
 
 					<li Class="PatchOperationReplace">
-						<xpath>Defs/ThingDef[defName="BOR_Tenebral_Apparel_HeavyMarineArmor"]/comps/li[@Class="VFECore.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
+						<xpath>Defs/ThingDef[defName="BOR_Tenebral_Apparel_HeavyMarineArmor"]/comps/li[@Class="VEF.Apparels.CompProperties_ShieldBubble"]/EnergyShieldEnergyMax</xpath>
 						<value>
 							<EnergyShieldEnergyMax>505</EnergyShieldEnergyMax>
 						</value>
diff --git a/About/About.xml b/About/About.xml
index 603750fe..e0437cac 100644
--- a/About/About.xml
+++ b/About/About.xml
@@ -35,6 +35,7 @@
   <loadAfter>
     <li>hobbes.terrapumps</li>
     <li>hobbes.bamba.evenmorelinkables</li>
+    <li>hobbes.bamba.evenmorelinkables16</li>
     <li>rimsenal.federation</li>
     <li>V1024.EBFramework</li>
     <li>CETeam.CombatExtended</li>
diff --git a/LoadFolders.xml b/LoadFolders.xml
index 399a5f72..978c7e17 100644
--- a/LoadFolders.xml
+++ b/LoadFolders.xml
@@ -68,7 +68,7 @@
 		<li IfModActive="bucko.royalarsenal">1.6/Mods/RoyalArsenal</li>
 		<li IfModActive="AKRI.StarcraftersArmory">1.6/Mods/scarmory</li>
 		<li IfModActive="vanillaexpanded.varme">1.6/Mods/vae</li>
-		<li IfModActive="hobbes.bamba.evenmorelinkables">1.6/Mods/eml</li>
+		<li IfModActive="hobbes.bamba.evenmorelinkables16">1.6/Mods/eml</li>
 		<li IfModActive="ceteam.combatextended">1.6/Mods/CombatExtended</li>
 		<li IfModActive="blackmarket420.kraltechindustries">1.6/Mods/Kraltech</li>
 		<li IfModActive="blackmarket420.kraltechindustrieslite">1.6/Mods/Kraltech</li>