diff --git a/data/forcegenerator/faction_rules/CB.xml b/data/forcegenerator/faction_rules/CB.xml
index fbb08668f..16601513f 100644
--- a/data/forcegenerator/faction_rules/CB.xml
+++ b/data/forcegenerator/faction_rules/CB.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-# MegaMek Data (C) 2025 by The MegaMek Team is licensed under CC BY-NC-SA 4.0.
+# MegaMek Data (C) 2025-2026 by The MegaMek Team is licensed under CC BY-NC-SA 4.0.
 # To view a copy of this license, visit https://creativecommons.org/licenses/by-nc-sa/4.0/
 #
 # NOTICE: The MegaMek organization is a non-profit group of volunteers
@@ -35,7 +35,7 @@
         <echelon>
             <option ifUnitType="">%TOUMAN%,%GALAXY%,%CLUSTER%</option>
             <option ifUnitType="Mek" ifDateBetween="2870,">%TRINARY%^,%TRINARY%,%BINARY%^,%BINARY%,%STAR%^,%STAR%</option>
-            <option ifUnitType="Warship">%CLUSTER%</option>
+            <option ifUnitType="Warship">%STAR%</option>
             <option ifUnitType="Dropship|Jumpship">%STAR%</option>
             <option>%TRINARY%,%BINARY%,%STAR%</option>
         </echelon>
@@ -96,7 +96,7 @@
         </subforces>
 
         <attachedForces>
-            <subforce unitType="Warship">%CLUSTER%</subforce>
+            <subforce unitType="Warship">%STAR%</subforce>
         </attachedForces>
     </force>
 
@@ -132,9 +132,9 @@
         </subforces>
     </force>
 
-    <force echelon="%CLUSTER%" eschName="Fleet" ifUnitType="Warship">
-        <name>Naval Assets</name>
-        <co>%GALAXY_CMDR%</co>
+    <force echelon="%STAR%" eschName="Naval Star" ifUnitType="Warship">
+        <name>Burrock Naval Star</name>
+        <co>%STAR_CMDR%</co>
 
         <subforces ifDateBetween=",3059">
             <subforce chassis="Avatar Heavy Cruiser" ifDateBetween=",3024"
@@ -143,10 +143,16 @@
             <subforce chassis="Liberator Cruiser" ifDateBetween="3025,"
                       fluffName="CB Constantineau">%ELEMENT%
             </subforce>
+            <!-- Pre-Absorption Clan Burrock fielded the Constantineau (its lone WarShip and,
+                 as the largest, the command vessel) plus an unknown number of supporting
+                 JumpShips - making a 5-6 vessel naval star. The 3072 Rebirth fleet below is
+                 NOT this fleet - those hulls came from SLDF boneyards / The Society, not
+                 Burrock's own pre-3059 ships (e.g. the Prinz Eugen was an SLDF
+                 boneyard/prison ship given to the reborn Burrock in 3072). -->
             <subforceOption>
-                <option num="4">%ELEMENT%</option>
-                <option num="5">%ELEMENT%</option>
-                <option num="6">%ELEMENT%</option>
+                <option num="4" unitType="Jumpship">%ELEMENT%</option>
+                <option num="5" unitType="Jumpship">%ELEMENT%</option>
+                <option num="6" unitType="Jumpship">%ELEMENT%</option>
             </subforceOption>
         </subforces>
 
@@ -172,6 +178,9 @@
             <subforce fluffName="CB Second Coming"
                       chassis="McKenna Battleship">%ELEMENT%
             </subforce>
+            <!-- The canon Rebirth fleet also included the Prinz Eugen (Texas-class),
+                 but the Texas is extinct by 3072-3073 and cannot be generated at that
+                 date, so it is omitted rather than left as an empty WarShip point. -->
         </subforces>
     </force>
 
diff --git a/data/forcegenerator/faction_rules/CBS.xml b/data/forcegenerator/faction_rules/CBS.xml
index beff36125..7619e2617 100644
--- a/data/forcegenerator/faction_rules/CBS.xml
+++ b/data/forcegenerator/faction_rules/CBS.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-# MegaMek Data (C) 2025 by The MegaMek Team is licensed under CC BY-NC-SA 4.0.
+# MegaMek Data (C) 2025-2026 by The MegaMek Team is licensed under CC BY-NC-SA 4.0.
 # To view a copy of this license, visit https://creativecommons.org/licenses/by-nc-sa/4.0/
 #
 # NOTICE: The MegaMek organization is a non-profit group of volunteers
@@ -34,7 +34,7 @@
 
         <echelon>
             <option ifUnitType="">%TOUMAN%,%GALAXY%,%CLUSTER%</option>
-            <option ifUnitType="Warship">%GALAXY%</option>
+            <option ifUnitType="Warship">%GALAXY%,%STAR%</option>
             <option ifUnitType="Dropship|Jumpship">%STAR%</option>
             <option ifUnitType="AeroSpaceFighter">%CLUSTER%,%TRINARY%,%BINARY%,%STAR%</option>
             <option>%TRINARY%,%BINARY%,%STAR%</option>
@@ -106,7 +106,20 @@
         <co position="1">%GALAXY_CMDR%</co>
 
         <subforces>
-            <subforce ifDateBetween=",3059" num="2">%ELEMENT%</subforce>
+            <subforce name="Blood Naval Star" unitType="Warship">%STAR%</subforce>
+        </subforces>
+    </force>
+
+    <!-- The naval reserve as a Clan naval star (5-6 vessels) nested under the Blood Galaxy,
+         rather than ships loose under the galaxy. -->
+    <force echelon="%STAR%" eschName="Naval Star" ifUnitType="Warship">
+        <name>Blood Naval Star</name>
+        <co>%STAR_CMDR%</co>
+
+        <subforces>
+            <!-- Supporting JumpShips keep the naval reserve a 5-6 vessel formation across the
+                 Clan's life as the named WarShip fleet is whittled down by losses. -->
+            <subforce unitType="Jumpship" num="2">%ELEMENT%</subforce>
             <subforce chassis="Black Lion II Battlecruiser"
                       fluffName="CBS Rocinante"
                       ifDateBetween=",3072">%ELEMENT%
@@ -128,31 +141,6 @@
                       ifDateBetween="3070,3084">%ELEMENT%
             </subforce>
         </subforces>
-
-        <attachedForces>
-            <subforceOption>
-                <option num="3" ifDateBetween="3061,"
-                        rating="FL" unitType="AeroSpaceFighter">%CLUSTER%
-                </option>
-                <option num="4" rating="FL"
-                        unitType="AeroSpaceFighter">%CLUSTER%
-                </option>
-                <option num="5" ifDateBetween=",3060"
-                        rating="FL" unitType="AeroSpaceFighter">%CLUSTER%
-                </option>
-            </subforceOption>
-            <subforceOption>
-                <option num="2" ifDateBetween="3061,"
-                        rating="SL" unitType="AeroSpaceFighter">%CLUSTER%
-                </option>
-                <option num="3" rating="SL"
-                        unitType="AeroSpaceFighter">%CLUSTER%
-                </option>
-                <option num="4" ifDateBetween=",3060"
-                        rating="SL" unitType="AeroSpaceFighter">%CLUSTER%
-                </option>
-            </subforceOption>
-        </attachedForces>
     </force>
 
     <force echelon="%GALAXY%" eschName="Galaxy">
@@ -164,6 +152,14 @@
                 <option num="6">%CLUSTER%</option>
                 <option num="5">%CLUSTER%</option>
             </subforceOption>
+            <!-- Aerospace lives with the combat galaxies now (one ASF cluster per front-line
+                 galaxy) rather than pooled in the naval reserve. Wrapped in a subforceOption so
+                 the engine generates it AFTER the combat clusters: SubForcesNode emits all plain
+                 <subforce> elements before any <subforceOption>, so a plain aero subforce would
+                 sort to the top of the galaxy regardless of XML order. -->
+            <subforceOption>
+                <option unitType="AeroSpaceFighter">%CLUSTER%</option>
+            </subforceOption>
         </subforces>
 
         <subforces ifRating="SL">
@@ -175,8 +171,8 @@
     </force>
 
     <!--All Blood Spirit clusters include three trinaries of Meks,
-    one BA/infantry, and one vehicle. ASFs are attached to the naval
-    reserve.-->
+    one BA/infantry, and one vehicle. Each front-line galaxy also fields
+    one Aerospace Cluster (aero was previously pooled in the naval reserve).-->
 
     <force echelon="%CLUSTER%" eschName="Cluster" ifUnitType="AeroSpaceFighter">
         <name>Aerospace Cluster</name>
diff --git a/data/forcegenerator/faction_rules/CCC.xml b/data/forcegenerator/faction_rules/CCC.xml
index e6cccbe48..94e09017d 100644
--- a/data/forcegenerator/faction_rules/CCC.xml
+++ b/data/forcegenerator/faction_rules/CCC.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-# MegaMek Data (C) 2025 by The MegaMek Team is licensed under CC BY-NC-SA 4.0.
+# MegaMek Data (C) 2025-2026 by The MegaMek Team is licensed under CC BY-NC-SA 4.0.
 # To view a copy of this license, visit https://creativecommons.org/licenses/by-nc-sa/4.0/
 #
 # NOTICE: The MegaMek organization is a non-profit group of volunteers
@@ -97,16 +97,23 @@
             </subforce>
         </subforces>
 
-        <attachedForces>
-            <subforce unitType="Warship">%CLUSTER%</subforce>
-        </attachedForces>
     </force>
 
-    <force echelon="%CLUSTER%" eschName="Fleet" ifUnitType="Warship">
-        <name>Naval Reserve</name>
-        <co>%GALAXY_CMDR%</co>
+    <!-- Cloud Cobra distributes its WarShips across specific Galaxies (3061-3067
+         assignments per Clan Cloud Cobra Naval Forces, Sarna). Each galaxy with ships
+         attaches ONE Naval Star (below) that contains all of that galaxy's WarShips, so
+         the ToE reads: Galaxy -> Clusters + a Naval Star -> ships. Branched by ifName so
+         each galaxy gets the right roster. Each ship appears exactly once - no pooling,
+         no duplication. Ships inside this node inherit unitType=Warship from it (so they
+         need no explicit unitType, unlike a ship attached straight to a galaxy node). -->
+    <force echelon="%CLUSTER%" eschName="Naval Star" ifUnitType="Warship">
+        <name>Naval Star</name>
+        <co>%STAR_CMDR%</co>
 
-        <subforces>
+        <subforces ifName="Alpha Naval Star">
+            <subforce fluffName="CCS Nebulous"
+                      chassis="York Destroyer-Carrier">%ELEMENT%
+            </subforce>
             <subforce fluffName="CCS Incense" ifDateBetween=",3072"
                       chassis="Cameron Battlecruiser">%ELEMENT%
             </subforce>
@@ -122,6 +129,12 @@
             <subforce fluffName="CCS Blind Faith" ifDateBetween="2950,3072"
                       chassis="Carrack Transport">%ELEMENT%
             </subforce>
+        </subforces>
+
+        <subforces ifName="Beta Naval Star">
+            <subforce fluffName="CCS Consequence" ifDateBetween=",3075"
+                      chassis="Aegis Heavy Cruiser">%ELEMENT%
+            </subforce>
             <subforce fluffName="CCS Wisdom of the Ages"
                       chassis="Potemkin Troop Cruiser">%ELEMENT%
             </subforce>
@@ -131,29 +144,35 @@
             <subforce fluffName="CCS Hell Fury" ifDateBetween="3053,3081"
                       chassis="Fredasa (Corvette-Raider)">%ELEMENT%
             </subforce>
-            <subforce fluffName="CCS Nebulous"
-                      chassis="York Destroyer-Carrier">%ELEMENT%
-            </subforce>
-            <subforce fluffName="CCS Consequence" ifDateBetween=",3075"
-                      chassis="Aegis Heavy Cruiser">%ELEMENT%
-            </subforce>
-            <subforce fluffName="CCS Perdition&apos;s Flame"
-                      ifDateBetween="2962,3075"
-                      chassis="Fredasa (Corvette-Raider)">%ELEMENT%
+            <!-- Generic JumpShips round the formation to a 5-6 vessel naval star
+                 (DropShips are handled by the transport system, not the naval star). -->
+            <subforce unitType="Jumpship" num="2">%ELEMENT%</subforce>
+        </subforces>
+
+        <subforces ifName="Delta Naval Star">
+            <subforce fluffName="CCS Second Coming" ifDateBetween=",3073"
+                      chassis="McKenna Battleship">%ELEMENT%
             </subforce>
             <subforce fluffName="CCS Trump" ifDateBetween=",3070"
                       chassis="Vincent Corvette">%ELEMENT%
             </subforce>
-            <subforce fluffName="CCS Hertzog&apos;s Staff"
-                      ifDateBetween=",3075"
+            <subforce fluffName="CCS Hertzog&apos;s Staff" ifDateBetween=",3075"
                       chassis="Vincent Corvette">%ELEMENT%
             </subforce>
-            <subforce fluffName="CCS Second Coming" ifDateBetween=",3073"
-                      chassis="McKenna Battleship">%ELEMENT%
+            <subforce fluffName="CCS Perdition&apos;s Flame" ifDateBetween="2962,3075"
+                      chassis="Fredasa (Corvette-Raider)">%ELEMENT%
             </subforce>
+            <!-- Generic JumpShips round the formation to a 5-6 vessel naval star
+                 (DropShips are handled by the transport system, not the naval star). -->
+            <subforce unitType="Jumpship" num="2">%ELEMENT%</subforce>
+        </subforces>
+
+        <subforces ifName="Zeta Naval Star">
             <subforce fluffName="CCS Inquisitor" ifDateBetween=",3081"
                       chassis="Aegis Heavy Cruiser">%ELEMENT%
             </subforce>
+            <!-- Only one named ship; generic JumpShips make a 5-6 vessel naval star. -->
+            <subforce unitType="Jumpship" num="4">%ELEMENT%</subforce>
         </subforces>
     </force>
 
@@ -192,6 +211,24 @@
             </subforceOption>
             <subforce flags="fang">%CLUSTER%</subforce>
         </subforces>
+
+        <!-- Each galaxy with assigned WarShips attaches ONE Naval Star holding that
+             galaxy's ships (see the Naval Star node above). Structure: Galaxy ->
+             Clusters + a Naval Star -> ships. unitType=Warship routes to that node. -->
+        <attachedForces>
+            <subforce ifName="Alpha Galaxy" unitType="Warship"
+                      name="Alpha Naval Star">%CLUSTER%
+            </subforce>
+            <subforce ifName="Beta Galaxy" unitType="Warship"
+                      name="Beta Naval Star">%CLUSTER%
+            </subforce>
+            <subforce ifName="Delta Galaxy" unitType="Warship"
+                      name="Delta Naval Star">%CLUSTER%
+            </subforce>
+            <subforce ifName="Zeta Galaxy" unitType="Warship"
+                      name="Zeta Naval Star">%CLUSTER%
+            </subforce>
+        </attachedForces>
     </force>
 
     <force echelon="%CLUSTER%" eschName="Cluster" ifRating="Keshik" ifRole="command">
diff --git a/data/forcegenerator/faction_rules/CCO.xml b/data/forcegenerator/faction_rules/CCO.xml
index 791c2d262..1d94c9e8c 100644
--- a/data/forcegenerator/faction_rules/CCO.xml
+++ b/data/forcegenerator/faction_rules/CCO.xml
@@ -120,75 +120,111 @@ ranked SL units.-->
         </subforces>
 
         <attachedForces>
-            <subforce unitType="Warship">%CLUSTER%</subforce>
+            <subforce unitType="Warship" name="Naval Reserve">%CLUSTER%</subforce>
+            <subforce unitType="Warship" name="Independent Naval Assets">%CLUSTER%</subforce>
         </attachedForces>
     </force>
 
-    <force echelon="%CLUSTER%" eschName="Fleet" ifUnitType="Warship">
-        <name>Naval Reserve</name>
-        <co>%GALAXY_CMDR%</co>
+    <!-- WarShip organization per Clan Coyote Naval Forces (Sarna, 3061-67 assignments).
+         Front-line galaxies each field their flagship as a Naval Star (attached from the
+         galaxy node, branched by ifName here); the Khan's flagship plus the two Naval Reserve
+         Trinaries form the central Naval Reserve, and the remaining hulls are Independent
+         Naval Assets (both attached from the Touman). Coyote doctrine: every vessel travels
+         as a provisional naval Star (full aero complement + an Elemental Star), so each
+         formation is padded with JumpShips toward 5-6 vessels; the largest hull is the
+         command vessel (tonnage sort). Existing ship dates preserved; CCS Broken Sea
+         (York carrier, lost 3073) added from canon. -->
+    <force echelon="%CLUSTER%" eschName="Naval Star" ifUnitType="Warship">
+        <name>Naval Star</name>
+        <co>%STAR_CMDR%</co>
 
-        <subforces>
-            <subforce chassis="Nightlord Battleship"
-                      ifDateBetween="2932,3074" role="command"
-                      fluffName="CCS Great Coyote Spirit">%ELEMENT%
-            </subforce>
-            <subforce chassis="Texas Battleship"
-                      ifDateBetween=",3074"
-                      fluffName="CCS Ancestral Home">%ELEMENT%
+        <subforces ifName="Alpha Naval Star">
+            <subforce chassis="Sovetskii Soyuz Heavy Cruiser" ifDateBetween=",3075"
+                      fluffName="CCS Steel Fang">%ELEMENT%
             </subforce>
-            <subforce chassis="Cameron Battlecruiser"
-                      ifDateBetween=",3075"
+            <subforceOption>
+                <option num="4" unitType="Jumpship">%ELEMENT%</option>
+                <option num="5" unitType="Jumpship">%ELEMENT%</option>
+            </subforceOption>
+        </subforces>
+
+        <subforces ifName="Delta Naval Star">
+            <subforce chassis="Cameron Battlecruiser" ifDateBetween=",3075"
                       fluffName="CCS Blood of the Coyote">%ELEMENT%
             </subforce>
-            <subforce chassis="Sovetskii Soyuz Heavy Cruiser"
-                      ifDateBetween=",3072"
-                      fluffName="CCS Howling">%ELEMENT%
-            </subforce>
-            <subforce chassis="Sovetskii Soyuz Heavy Cruiser"
-                      ifDateBetween=",3075"
-                      fluffName="CCS Steel Fang">%ELEMENT%
-            </subforce>
-            <subforce chassis="Avatar Heavy Cruiser"
-                      ifDateBetween=",3023"
+            <subforceOption>
+                <option num="4" unitType="Jumpship">%ELEMENT%</option>
+                <option num="5" unitType="Jumpship">%ELEMENT%</option>
+            </subforceOption>
+        </subforces>
+
+        <subforces ifName="Epsilon Naval Star">
+            <subforce chassis="Avatar Heavy Cruiser" ifDateBetween=",3023"
                       fluffName="CCS Spirit in the Sky">%ELEMENT%
             </subforce>
-            <subforce chassis="Liberator Cruiser"
-                      ifDateBetween="3024,"
+            <subforce chassis="Liberator Cruiser" ifDateBetween="3024,"
                       fluffName="CCS Spirit in the Sky">%ELEMENT%
             </subforce>
-            <subforce chassis="Lola III Destroyer"
-                      ifDateBetween=",3073"
-                      fluffName="CCS Honor of Ages">%ELEMENT%
+            <subforceOption>
+                <option num="4" unitType="Jumpship">%ELEMENT%</option>
+                <option num="5" unitType="Jumpship">%ELEMENT%</option>
+            </subforceOption>
+        </subforces>
+
+        <subforces ifName="Zeta Naval Star">
+            <subforce chassis="Sovetskii Soyuz Heavy Cruiser" ifDateBetween=",3072"
+                      fluffName="CCS Howling">%ELEMENT%
             </subforce>
-            <subforce chassis="Lola III Destroyer"
-                      ifDateBetween=",3073"
+            <subforce chassis="Lola III Destroyer" ifDateBetween=",3073"
                       fluffName="CCS Courage">%ELEMENT%
             </subforce>
-            <subforce chassis="Essex II Destroyer"
-                      ifDateBetween=",3075"
+            <subforceOption>
+                <option num="3" unitType="Jumpship">%ELEMENT%</option>
+                <option num="4" unitType="Jumpship">%ELEMENT%</option>
+            </subforceOption>
+        </subforces>
+
+        <!-- Khan's flagship + Alpha and Beta Naval Reserve Trinaries. Flagship (Nightlord,
+             largest) leads as command. -->
+        <subforces ifName="Naval Reserve">
+            <subforce chassis="Nightlord Battleship" ifDateBetween="2932,3074"
+                      role="command" fluffName="CCS Great Coyote Spirit">%ELEMENT%
+            </subforce>
+            <subforce chassis="Essex II Destroyer" ifDateBetween=",3075"
                       fluffName="CCS Windrunner">%ELEMENT%
             </subforce>
-            <subforce chassis="Potemkin Troop Cruiser"
-                      ifDateBetween=",3084"
+            <subforce chassis="Lola III Destroyer" ifDateBetween=",3073"
+                      fluffName="CCS Honor of Ages">%ELEMENT%
+            </subforce>
+            <subforce chassis="Potemkin Troop Cruiser" ifDateBetween=",3084"
                       fluffName="CCS Midnight Star">%ELEMENT%
             </subforce>
-            <subforce chassis="Potemkin Troop Cruiser"
-                      ifDateBetween=",3075"
+            <subforce chassis="Carrack Transport" ifDateBetween="2950,"
+                      fluffName="CCS Solar Blaze">%ELEMENT%
+            </subforce>
+            <subforce chassis="Potemkin Troop Cruiser" ifDateBetween=",3075"
                       fluffName="CCS Morning Star">%ELEMENT%
             </subforce>
-            <subforce chassis="Carrack Transport"
-                      ifDateBetween="2950,"
-                      fluffName="CCS Solar Blaze">%ELEMENT%
+        </subforces>
+
+        <!-- Independent Assets: heavy hulls + the Clan Wolf hand-offs (3071+). -->
+        <subforces ifName="Independent Naval Assets">
+            <subforce chassis="Texas Battleship" ifDateBetween=",3074"
+                      role="command" fluffName="CCS Ancestral Home">%ELEMENT%
+            </subforce>
+            <subforce chassis="York Destroyer-Carrier" ifDateBetween="3057,3073"
+                      fluffName="CCS Broken Sea">%ELEMENT%
             </subforce>
-            <subforce chassis="Vincent Corvette"
-                      ifDateBetween="3071"
+            <subforce chassis="Vincent Corvette" ifDateBetween="3071"
                       fluffName="CCS Relentless Pursuit">%ELEMENT%
             </subforce>
-            <subforce chassis="Volga Transport"
-                      ifDateBetween="3071,3075"
+            <subforce chassis="Volga Transport" ifDateBetween="3071,3075"
                       fluffName="CCS Provider">%ELEMENT%
             </subforce>
+            <subforceOption>
+                <option num="2" unitType="Jumpship">%ELEMENT%</option>
+                <option num="3" unitType="Jumpship">%ELEMENT%</option>
+            </subforceOption>
         </subforces>
     </force>
 
@@ -237,6 +273,24 @@ ranked SL units.-->
             <subforce rating="Sol">%CLUSTER%</subforce>
         </subforces>
 
+        <!-- Each front-line galaxy with an assigned WarShip attaches ONE Naval Star (the
+             naval node above, branched by ifName) holding that galaxy's flagship plus
+             JumpShip support. Per Clan Coyote Naval Forces, Sarna (3061-67). -->
+        <attachedForces>
+            <subforce ifName="Alpha Galaxy" unitType="Warship"
+                      name="Alpha Naval Star">%CLUSTER%
+            </subforce>
+            <subforce ifName="Delta Galaxy" unitType="Warship"
+                      name="Delta Naval Star">%CLUSTER%
+            </subforce>
+            <subforce ifName="Epsilon Galaxy" unitType="Warship"
+                      name="Epsilon Naval Star">%CLUSTER%
+            </subforce>
+            <subforce ifName="Zeta Galaxy" unitType="Warship"
+                      name="Zeta Naval Star">%CLUSTER%
+            </subforce>
+        </attachedForces>
+
         <attachedForces ifRating="SL">
             <subforceOption>
                 <option num="2" rating="Sol"
@@ -339,25 +393,25 @@ ranked SL units.-->
 
     <force echelon="%CLUSTER%" eschName="Cluster">
         <name ifRating="SL"
-              ifWeightClass="A|H">{cardinalOrdinal} Reserve [Assault] Cluster
+              ifWeightClass="A">{cardinalOrdinal} Reserve [Assault] Cluster
         </name>
         <name ifRating="SL"
-              ifWeightClass="M">{cardinalOrdinal} Reserve [Battle] Cluster
+              ifWeightClass="H|M">{cardinalOrdinal} Reserve [Battle] Cluster
         </name>
         <name ifRating="SL"
               ifWeightClass="L">{cardinalOrdinal} Reserve [Strike] Cluster
         </name>
         <name ifRating="Sol"
-              ifWeightClass="A|H">{cardinalOrdinal} Solahma [Assault] Cluster
+              ifWeightClass="A">{cardinalOrdinal} Solahma [Assault] Cluster
         </name>
         <name ifRating="Sol"
-              ifWeightClass="M">{cardinalOrdinal} Solahma [Battle] Cluster
+              ifWeightClass="H|M">{cardinalOrdinal} Solahma [Battle] Cluster
         </name>
         <name ifRating="Sol"
               ifWeightClass="L">{cardinalOrdinal} Solahma [Strike] Cluster
         </name>
-        <name ifWeightClass="A|H">{cardinalOrdinal} [Assault] Cluster</name>
-        <name ifWeightClass="M">{cardinalOrdinal} [Battle] Cluster</name>
+        <name ifWeightClass="A">{cardinalOrdinal} [Assault] Cluster</name>
+        <name ifWeightClass="H|M">{cardinalOrdinal} [Battle] Cluster</name>
         <name ifWeightClass="L">{cardinalOrdinal} [Strike] Cluster</name>
 
         <!-- Per-cluster-type weight targets (budget allocator). L/M/H/A% reshape that
@@ -384,7 +438,7 @@ ranked SL units.-->
             <option weight="1">A</option>
             <option weight="4">H</option>
             <option weight="2">M</option>
-            <option ifRole="!command" weight="1">L</option>
+            <option ifRole="!command" weight="2">L</option>
         </weightClass>
 
         <!-- Front Line clusters typically have three Mek, one BA, and one
diff --git a/data/forcegenerator/faction_rules/CFM.BG.xml b/data/forcegenerator/faction_rules/CFM.BG.xml
index 1f9c65554..96fa048be 100644
--- a/data/forcegenerator/faction_rules/CFM.BG.xml
+++ b/data/forcegenerator/faction_rules/CFM.BG.xml
@@ -72,7 +72,7 @@
         </subforces>
 
         <attachedForces>
-            <subforce unitType="Warship" fluffName="CFM Anathma"
+            <subforce unitType="Warship" fluffName="CFM Anathema"
                       chassis="Lola III Destroyer">%ELEMENT%
             </subforce>
             <subforce unitType="Warship" fluffName="CFM Howler"
@@ -88,6 +88,10 @@
         <name>Mandrill Airborne</name>
         <co>%STAR_COL%</co>
 
+        <!-- The 87th Mandrill Airborne - Beyl-Grant's signature aerospace cluster. Strong, heavier
+             fighter mix (no assault-class fighters exist). -->
+        <weightTarget unitType="AeroSpaceFighter" spread="8">A:0,H:46,M:42,L:12</weightTarget>
+
         <weightClass>
             <option weight="2">H</option>
             <option weight="2">M</option>
@@ -165,10 +169,19 @@
         <name ifWeightClass="L">Striker Cluster</name>
         <co>%STAR_COL%</co>
 
+        <!-- Per-cluster-type weight targets (budget allocator). Kindraa Beyl-Grant (Clan Fire
+             Mandrill Touman, Sarna) is the aerospace-integrated, auxiliary-dependent Kindraa (the
+             87th Mandrill Airborne). Lighter Mek mix with the confederation's strongest aero. -->
+        <weightTarget ifWeightClass="H" unitType="Mek" spread="8">A:6,H:34,M:44,L:16</weightTarget>
+        <weightTarget ifWeightClass="M" unitType="Mek" spread="8">A:2,H:18,M:52,L:28</weightTarget>
+        <weightTarget ifWeightClass="L" unitType="Mek" spread="8">A:1,H:8,M:42,L:49</weightTarget>
+        <weightTarget unitType="AeroSpaceFighter" spread="8">A:0,H:46,M:42,L:12</weightTarget>
+        <weightTarget unitType="Tank" spread="8">A:0,H:12,M:40,L:48</weightTarget>
+
         <weightClass>
-            <option weight="2">H</option>
+            <option weight="1">H</option>
             <option weight="2">M</option>
-            <option weight="1">L</option>
+            <option weight="2">L</option>
         </weightClass>
 
         <subforces>
@@ -265,6 +278,9 @@
         <name>Auxiliary Cluster</name>
         <co>%STAR_COL%</co>
 
+        <!-- Beyl-Grant aero-binary auxiliary: strong fighter mix (see Mandrill Airborne note). -->
+        <weightTarget unitType="AeroSpaceFighter" spread="8">A:0,H:46,M:42,L:12</weightTarget>
+
         <weightClass>
             <option weight="2">H</option>
             <option weight="2">M</option>
@@ -378,10 +394,17 @@
         <name>Auxiliary Cluster</name>
         <co>%STAR_COL%</co>
 
+        <!-- Beyl-Grant second-line auxiliary: lighter Mek mix with strong aero (see FL note). -->
+        <weightTarget ifWeightClass="H" unitType="Mek" spread="8">A:6,H:34,M:44,L:16</weightTarget>
+        <weightTarget ifWeightClass="M" unitType="Mek" spread="8">A:2,H:18,M:52,L:28</weightTarget>
+        <weightTarget ifWeightClass="L" unitType="Mek" spread="8">A:1,H:8,M:42,L:49</weightTarget>
+        <weightTarget unitType="AeroSpaceFighter" spread="8">A:0,H:46,M:42,L:12</weightTarget>
+        <weightTarget unitType="Tank" spread="8">A:0,H:12,M:40,L:48</weightTarget>
+
         <weightClass>
-            <option weight="2">H</option>
+            <option weight="1">H</option>
             <option weight="2">M</option>
-            <option weight="1">L</option>
+            <option weight="2">L</option>
         </weightClass>
 
         <subforces>
diff --git a/data/forcegenerator/faction_rules/CFM.FT.xml b/data/forcegenerator/faction_rules/CFM.FT.xml
index d4cd2a226..b0daeecf6 100644
--- a/data/forcegenerator/faction_rules/CFM.FT.xml
+++ b/data/forcegenerator/faction_rules/CFM.FT.xml
@@ -87,6 +87,15 @@
         <name ifRating="SL">Support Cluster</name>
         <co>%STAR_COL%</co>
 
+        <!-- Per-cluster-type weight targets (budget allocator). Kindraa Faraday-Tanaga ("The Gift
+             of Foresight", Clan Fire Mandrill Touman, Sarna) is the balanced, moderate Kindraa,
+             mixing offense and support. Sits in the middle of the confederation's weight spread. -->
+        <weightTarget ifWeightClass="H" unitType="Mek" spread="8">A:12,H:44,M:36,L:8</weightTarget>
+        <weightTarget ifWeightClass="M" unitType="Mek" spread="8">A:4,H:26,M:50,L:20</weightTarget>
+        <weightTarget ifWeightClass="L" unitType="Mek" spread="8">A:1,H:12,M:44,L:43</weightTarget>
+        <weightTarget unitType="AeroSpaceFighter" spread="8">A:0,H:35,M:45,L:20</weightTarget>
+        <weightTarget unitType="Tank" spread="8">A:0,H:12,M:40,L:48</weightTarget>
+
         <weightClass>
             <option weight="2">H</option>
             <option weight="2">M</option>
diff --git a/data/forcegenerator/faction_rules/CFM.Kl.xml b/data/forcegenerator/faction_rules/CFM.Kl.xml
index 3cf6a8aa4..94cb8ecdf 100644
--- a/data/forcegenerator/faction_rules/CFM.Kl.xml
+++ b/data/forcegenerator/faction_rules/CFM.Kl.xml
@@ -89,10 +89,19 @@
         <name ifWeightClass="L">Vanguard Striker Cluster</name>
         <co>%STAR_COL%</co>
 
+        <!-- Per-cluster-type weight targets (budget allocator). Kindraa Kline ("The Extended
+             Family", Clan Fire Mandrill Touman, Sarna) is the garrison-leaning, decentralized
+             strike Kindraa - the lightest of the Fire Mandrill Kindraa. Light/strike Mek mix. -->
+        <weightTarget ifWeightClass="H" unitType="Mek" spread="8">A:5,H:38,M:40,L:17</weightTarget>
+        <weightTarget ifWeightClass="M" unitType="Mek" spread="8">A:2,H:16,M:52,L:30</weightTarget>
+        <weightTarget ifWeightClass="L" unitType="Mek" spread="8">A:1,H:6,M:38,L:55</weightTarget>
+        <weightTarget unitType="AeroSpaceFighter" spread="8">A:0,H:30,M:46,L:24</weightTarget>
+        <weightTarget unitType="Tank" spread="8">A:0,H:8,M:38,L:54</weightTarget>
+
         <weightClass>
-            <option weight="2">H</option>
+            <option weight="1">H</option>
             <option weight="2">M</option>
-            <option weight="1">L</option>
+            <option weight="3">L</option>
         </weightClass>
 
         <subforces>
@@ -180,6 +189,13 @@
         <name ifWeightClass="L">Vanguard Striker Cluster</name>
         <co>%STAR_COL%</co>
 
+        <!-- Kindraa Kline second-line: same light/strike doctrine (see FL note above). -->
+        <weightTarget ifWeightClass="H" unitType="Mek" spread="8">A:5,H:38,M:40,L:17</weightTarget>
+        <weightTarget ifWeightClass="M" unitType="Mek" spread="8">A:2,H:16,M:52,L:30</weightTarget>
+        <weightTarget ifWeightClass="L" unitType="Mek" spread="8">A:1,H:6,M:38,L:55</weightTarget>
+        <weightTarget unitType="AeroSpaceFighter" spread="8">A:0,H:30,M:46,L:24</weightTarget>
+        <weightTarget unitType="Tank" spread="8">A:0,H:8,M:38,L:54</weightTarget>
+
         <weightClass>
             <option weight="1">L</option>
             <option weight="2">M</option>
diff --git a/data/forcegenerator/faction_rules/CFM.MaC.xml b/data/forcegenerator/faction_rules/CFM.MaC.xml
index d62dfe39e..1d227aff1 100644
--- a/data/forcegenerator/faction_rules/CFM.MaC.xml
+++ b/data/forcegenerator/faction_rules/CFM.MaC.xml
@@ -88,10 +88,19 @@
         <name ifRating="SL">Firebrand Cluster</name>
         <co>%STAR_COL%</co>
 
+        <!-- Per-cluster-type weight targets (budget allocator). Kindraa Mattila-Carrol ("Up and
+             Coming", Clan Fire Mandrill Touman, Sarna) is the young, growing, mobile Kindraa.
+             Medium-led and lighter than the assault Kindraa, with little assault. -->
+        <weightTarget ifWeightClass="H" unitType="Mek" spread="8">A:6,H:40,M:40,L:14</weightTarget>
+        <weightTarget ifWeightClass="M" unitType="Mek" spread="8">A:2,H:20,M:54,L:24</weightTarget>
+        <weightTarget ifWeightClass="L" unitType="Mek" spread="8">A:1,H:8,M:42,L:49</weightTarget>
+        <weightTarget unitType="AeroSpaceFighter" spread="8">A:0,H:32,M:46,L:22</weightTarget>
+        <weightTarget unitType="Tank" spread="8">A:0,H:10,M:40,L:50</weightTarget>
+
         <weightClass>
-            <option weight="2">H</option>
+            <option weight="1">H</option>
             <option weight="2">M</option>
-            <option weight="1">L</option>
+            <option weight="2">L</option>
         </weightClass>
 
         <subforces>
diff --git a/data/forcegenerator/faction_rules/CFM.MiKr.xml b/data/forcegenerator/faction_rules/CFM.MiKr.xml
index ffbbb9ed0..a685dcd41 100644
--- a/data/forcegenerator/faction_rules/CFM.MiKr.xml
+++ b/data/forcegenerator/faction_rules/CFM.MiKr.xml
@@ -312,6 +312,16 @@
         <name ifWeightClass="L">Striker Force</name>
         <co>%STAR_COL%</co>
 
+        <!-- Per-cluster-type weight targets (budget allocator). Kindraa Mick-Kreese (Clan Fire
+             Mandrill Touman, Sarna) is the Elemental/BattleArmor specialist Kindraa ("infantry-
+             heavy"). BA emphasis is structural (dedicated BA cluster); the Mek mix is balanced,
+             medium-led with a solid heavy core to support the Elemental assault. -->
+        <weightTarget ifWeightClass="H" unitType="Mek" spread="8">A:10,H:44,M:38,L:8</weightTarget>
+        <weightTarget ifWeightClass="M" unitType="Mek" spread="8">A:4,H:26,M:50,L:20</weightTarget>
+        <weightTarget ifWeightClass="L" unitType="Mek" spread="8">A:1,H:12,M:44,L:43</weightTarget>
+        <weightTarget unitType="AeroSpaceFighter" spread="8">A:0,H:35,M:44,L:21</weightTarget>
+        <weightTarget unitType="Tank" spread="8">A:0,H:12,M:40,L:48</weightTarget>
+
         <weightClass>
             <option weight="1">L</option>
             <option weight="2">M</option>
@@ -470,6 +480,13 @@
         <name ifWeightClass="L">Vanguard Striker Cluster</name>
         <co>%STAR_COL%</co>
 
+        <!-- Kindraa Mick-Kreese second-line: same balanced Elemental-support doctrine (see FL note). -->
+        <weightTarget ifWeightClass="H" unitType="Mek" spread="8">A:10,H:44,M:38,L:8</weightTarget>
+        <weightTarget ifWeightClass="M" unitType="Mek" spread="8">A:4,H:26,M:50,L:20</weightTarget>
+        <weightTarget ifWeightClass="L" unitType="Mek" spread="8">A:1,H:12,M:44,L:43</weightTarget>
+        <weightTarget unitType="AeroSpaceFighter" spread="8">A:0,H:35,M:44,L:21</weightTarget>
+        <weightTarget unitType="Tank" spread="8">A:0,H:12,M:40,L:48</weightTarget>
+
         <weightClass>
             <option weight="1">L</option>
             <option weight="2">M</option>
diff --git a/data/forcegenerator/faction_rules/CFM.MiKrKl.xml b/data/forcegenerator/faction_rules/CFM.MiKrKl.xml
index f2ca29188..2fa0558ef 100644
--- a/data/forcegenerator/faction_rules/CFM.MiKrKl.xml
+++ b/data/forcegenerator/faction_rules/CFM.MiKrKl.xml
@@ -87,7 +87,9 @@
         </subforces>
 
         <attachedForces>
-            <subforce unitType="Warship" fluffName="CFM Jungle Fever"
+            <!-- The Potemkin CFM Fire-Eater (Kindraa Kline) was renamed Jungle Heat after Kline
+                 was absorbed into Kindraa Mick-Kreese-Kline (renamed by 3067). -->
+            <subforce unitType="Warship" fluffName="CFM Jungle Heat"
                       chassis="Potemkin Troop Cruiser"
                       ifDateBetween=",3071">%ELEMENT%
             </subforce>
diff --git a/data/forcegenerator/faction_rules/CFM.P.xml b/data/forcegenerator/faction_rules/CFM.P.xml
index a968a903a..7015ca22f 100644
--- a/data/forcegenerator/faction_rules/CFM.P.xml
+++ b/data/forcegenerator/faction_rules/CFM.P.xml
@@ -81,8 +81,19 @@
         <name ifWeightClass="L">Striker Payne</name>
         <co>%STAR_COL%</co>
 
+        <!-- Per-cluster-type weight targets (budget allocator). Kindraa Payne ("Strength of Will",
+             Clan Fire Mandrill Touman, Sarna) is an elite, assault-focused Crusader Kindraa. Heavy/
+             assault Mek mix, second only to Sainze among the Fire Mandrill Kindraa. -->
+        <weightTarget ifWeightClass="A" unitType="Mek" spread="8">A:38,H:40,M:20,L:2</weightTarget>
+        <weightTarget ifWeightClass="H" unitType="Mek" spread="8">A:20,H:46,M:28,L:6</weightTarget>
+        <weightTarget ifWeightClass="M" unitType="Mek" spread="8">A:5,H:30,M:48,L:17</weightTarget>
+        <weightTarget ifWeightClass="L" unitType="Mek" spread="8">A:1,H:14,M:45,L:40</weightTarget>
+        <weightTarget unitType="AeroSpaceFighter" spread="8">A:0,H:38,M:42,L:20</weightTarget>
+        <weightTarget unitType="Tank" spread="8">A:0,H:14,M:40,L:46</weightTarget>
+
         <weightClass>
-            <option weight="2">H</option>
+            <option weight="1">A</option>
+            <option weight="3">H</option>
             <option weight="2">M</option>
             <option weight="1">L</option>
         </weightClass>
diff --git a/data/forcegenerator/faction_rules/CFM.PBG.xml b/data/forcegenerator/faction_rules/CFM.PBG.xml
index 81dc4aa04..8106a8b65 100644
--- a/data/forcegenerator/faction_rules/CFM.PBG.xml
+++ b/data/forcegenerator/faction_rules/CFM.PBG.xml
@@ -81,7 +81,7 @@
             <subforce unitType="Warship" fluffName="CFM Reaver"
                       chassis="Sovetskii Soyuz Heavy Cruiser">%ELEMENT%
             </subforce>
-            <subforce unitType="Warship" fluffName="CFM Anathma"
+            <subforce unitType="Warship" fluffName="CFM Anathema"
                       chassis="Lola III Destroyer"
                       ifDateBetween=",3071">%ELEMENT%
             </subforce>
diff --git a/data/forcegenerator/faction_rules/CFM.S.xml b/data/forcegenerator/faction_rules/CFM.S.xml
index 353061ff5..ba87e5549 100644
--- a/data/forcegenerator/faction_rules/CFM.S.xml
+++ b/data/forcegenerator/faction_rules/CFM.S.xml
@@ -86,8 +86,23 @@
         </name>
         <co>%STAR_COL%</co>
 
+        <!-- Per-cluster-type weight targets (budget allocator). Kindraa Sainze (Clan Fire Mandrill
+             Touman, Sarna) is the battle-hardened, aggressive Crusader Kindraa - the assault arm of
+             the confederation. Heaviest Mek mix of any Fire Mandrill Kindraa, with a real assault
+             core (picker rolls assault clusters). -->
+        <!-- Targets pushed hard: Sainze's BA-paired clusters + fast cavalry Keshik make it run
+             structurally light, so the budget targets over-aim heavy/assault to land it co-heaviest
+             with Payne (verified: plain heavy targets under-delivered, H34/A10). -->
+        <weightTarget ifWeightClass="A" unitType="Mek" spread="8">A:45,H:42,M:12,L:1</weightTarget>
+        <weightTarget ifWeightClass="H" unitType="Mek" spread="8">A:28,H:50,M:20,L:2</weightTarget>
+        <weightTarget ifWeightClass="M" unitType="Mek" spread="8">A:10,H:42,M:42,L:6</weightTarget>
+        <weightTarget ifWeightClass="L" unitType="Mek" spread="8">A:3,H:24,M:45,L:28</weightTarget>
+        <weightTarget unitType="AeroSpaceFighter" spread="8">A:0,H:40,M:42,L:18</weightTarget>
+        <weightTarget unitType="Tank" spread="8">A:0,H:15,M:40,L:45</weightTarget>
+
         <weightClass>
-            <option weight="2">H</option>
+            <option weight="2">A</option>
+            <option weight="3">H</option>
             <option weight="2">M</option>
             <option weight="1">L</option>
         </weightClass>
diff --git a/data/forcegenerator/faction_rules/CFM.xml b/data/forcegenerator/faction_rules/CFM.xml
index dd8194a8d..30d6997c3 100644
--- a/data/forcegenerator/faction_rules/CFM.xml
+++ b/data/forcegenerator/faction_rules/CFM.xml
@@ -139,6 +139,16 @@
         <name ifRating="SL|Sol">Guard Cluster</name>
         <co>%STAR_COL%</co>
 
+        <!-- Per-cluster-type weight targets (budget allocator). Generic Clan Fire Mandrill fallback
+             (the specific Kindraa - Sainze, Payne, Faraday-Tanaga, Mattila-Carrol, Mick-Kreese,
+             Kline, Beyl-Grant - carry their own distinct flavor in CFM.*.xml). This is the poor,
+             fractious confederation average: balanced medium-led, modest assault. -->
+        <weightTarget ifWeightClass="H" unitType="Mek" spread="8">A:12,H:42,M:38,L:8</weightTarget>
+        <weightTarget ifWeightClass="M" unitType="Mek" spread="8">A:4,H:26,M:50,L:20</weightTarget>
+        <weightTarget ifWeightClass="L" unitType="Mek" spread="8">A:1,H:12,M:44,L:43</weightTarget>
+        <weightTarget unitType="AeroSpaceFighter" spread="8">A:0,H:36,M:44,L:20</weightTarget>
+        <weightTarget unitType="Tank" spread="8">A:0,H:12,M:40,L:48</weightTarget>
+
         <weightClass>
             <option weight="2">H</option>
             <option weight="2">M</option>
diff --git a/data/forcegenerator/faction_rules/CGB.xml b/data/forcegenerator/faction_rules/CGB.xml
index 9ad81fdbc..2598842d4 100644
--- a/data/forcegenerator/faction_rules/CGB.xml
+++ b/data/forcegenerator/faction_rules/CGB.xml
@@ -119,6 +119,7 @@ but have a smaller aerospace arm than most other Clans. -->
             </subforce>
 
             <subforce unitType="Warship" name="Naval Reserve">%CLUSTER%</subforce>
+            <subforce unitType="Warship" name="Transport Flotilla">%CLUSTER%</subforce>
         </subforces>
     </force>
 
@@ -182,22 +183,40 @@ but have a smaller aerospace arm than most other Clans. -->
         </subforces>
     </force>
 
-    <force echelon="%GALAXY%" eschName="Fleet" ifUnitType="Warship">
-        <name>Naval Reserve</name>
-        <co>%GALAXY_CMDR%</co>
+    <!-- WarShip organization per Clan Ghost Bear Naval Forces (Sarna). The two galaxy flagships
+         attach as Naval Stars from the galaxy node (branched by ifName below): Alpha fields the
+         Cameron Dieron's Run, Beta the Black Lion Bear's Den. The Touman fields the central Naval
+         Reserve (the Nightlord Ursa Major plus the destroyer/cruiser screen) and a Transport
+         Flotilla (the Carrack/Volga/Leviathan lift the Bears use to move ground forces). Largest
+         hull commands each formation (tonnage sort). Ship loss dates preserved from the prior
+         single reserve; most of the screen was destroyed at Alshain in 3067. -->
+    <force echelon="%CLUSTER%" eschName="Naval Star" ifUnitType="Warship">
+        <name>Naval Star</name>
+        <co>%STAR_CMDR%</co>
 
-        <subforces>
+        <subforces ifName="Alpha Naval Star">
             <subforce fluffName="CGB Dieron&apos;s Run" ifDateBetween=",3067"
                       chassis="Cameron Battlecruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CGB Ursa Major" ifDateBetween="2932,3100"
-                      chassis="Nightlord Battleship">%ELEMENT%
-            </subforce>
+            <subforceOption>
+                <option num="4" unitType="Jumpship">%ELEMENT%</option>
+                <option num="5" unitType="Jumpship">%ELEMENT%</option>
+            </subforceOption>
+        </subforces>
+
+        <subforces ifName="Beta Naval Star">
             <subforce fluffName="CGB Bear&apos;s Den" ifDateBetween=",3066"
                       chassis="Black Lion II Battlecruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CGB Shining Claw" ifDateBetween=",3059"
-                      chassis="Congress Frigate">%ELEMENT%
+            <subforceOption>
+                <option num="4" unitType="Jumpship">%ELEMENT%</option>
+                <option num="5" unitType="Jumpship">%ELEMENT%</option>
+            </subforceOption>
+        </subforces>
+
+        <subforces ifName="Naval Reserve">
+            <subforce fluffName="CGB Ursa Major" ifDateBetween="2932,3100"
+                      chassis="Nightlord Battleship">%ELEMENT%
             </subforce>
             <subforce fluffName="CGB Ursa Minor" ifDateBetween=",2946"
                       chassis="Riga Frigate">%ELEMENT%
@@ -211,12 +230,6 @@ but have a smaller aerospace arm than most other Clans. -->
             <subforce fluffName="CGB White Fang" ifDateBetween=",3066"
                       chassis="Essex II Destroyer">%ELEMENT%
             </subforce>
-            <subforce fluffName="CGB Fire Fang" ifDateBetween=",3059"
-                      chassis="Whirlwind Destroyer">%ELEMENT%
-            </subforce>
-            <subforce fluffName="CGB Ursus" ifDateBetween=",3059"
-                      chassis="Whirlwind Destroyer">%ELEMENT%
-            </subforce>
             <subforce fluffName="CGB Blizzard" ifDateBetween=",3066"
                       chassis="Lola III Destroyer">%ELEMENT%
             </subforce>
@@ -226,18 +239,33 @@ but have a smaller aerospace arm than most other Clans. -->
             <subforce fluffName="CGB Black Ghost" ifDateBetween=",3066"
                       chassis="Fredasa (Corvette-Raider)">%ELEMENT%
             </subforce>
+            <subforce fluffName="CGB Shining Claw" ifDateBetween=",3059"
+                      chassis="Congress Frigate">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CGB Fire Fang" ifDateBetween=",3059"
+                      chassis="Whirlwind Destroyer">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CGB Ursus" ifDateBetween=",3059"
+                      chassis="Whirlwind Destroyer">%ELEMENT%
+            </subforce>
+        </subforces>
+
+        <subforces ifName="Transport Flotilla">
             <subforce fluffName="CGB Great Bear" ifDateBetween="3055,3078"
                       chassis="Leviathan Heavy Transport">%ELEMENT%
             </subforce>
-            <subforce fluffName="CGB Ursine Boatman" ifDateBetween=",3078"
-                      chassis="Volga Transport">%ELEMENT%
+            <subforce fluffName="CGB Leviathan" ifDateBetween="3055,3077"
+                      chassis="Leviathan Heavy Transport">%ELEMENT%
             </subforce>
-            <subforce fluffName="CGB Den Mother" ifDateBetween=",3100"
+            <subforce fluffName="CGB Den Mother"
                       chassis="Carrack Transport">%ELEMENT%
             </subforce>
             <subforce fluffName="CGB Yggdrasil"
                       chassis="Carrack Transport">%ELEMENT%
             </subforce>
+            <subforce fluffName="CGB Ursine Boatman" ifDateBetween=",3078"
+                      chassis="Volga Transport">%ELEMENT%
+            </subforce>
         </subforces>
     </force>
 
@@ -268,6 +296,18 @@ but have a smaller aerospace arm than most other Clans. -->
                 <option />
             </subforceOption>
         </subforces>
+
+        <!-- Per Clan Ghost Bear Naval Forces (Sarna, 3061): Alpha fields the flagship Dieron's Run,
+             Beta the primary naval flagship Bear's Den. Each front-line galaxy attaches its Naval
+             Star (the naval node above, branched by ifName) with JumpShip support. -->
+        <attachedForces>
+            <subforce ifName="Alpha Galaxy" unitType="Warship"
+                      name="Alpha Naval Star">%CLUSTER%
+            </subforce>
+            <subforce ifName="Beta Galaxy" unitType="Warship"
+                      name="Beta Naval Star">%CLUSTER%
+            </subforce>
+        </attachedForces>
     </force>
 
     <force echelon="%CLUSTER%" eschName="Cluster" ifUnitType="BattleArmor">
@@ -307,7 +347,15 @@ but have a smaller aerospace arm than most other Clans. -->
         <name ifRating="PG">Provisional Garrison Cluster</name>
         <co>%STAR_COL%</co>
 
+        <!-- Ghost Bear is the heaviest Clan (canon +1 weight-class modifier) and fights direct
+             assaults with heavy/assault Meks. Assault clusters roll a real share (weight 2, above
+             Coyote's 1), and the per-cluster targets push assault density past what the trinary
+             rolls reach on their own. Aerospace and Battle Armor are left as-is (already canon). -->
+        <weightTarget ifWeightClass="A" unitType="Mek" spread="8">A:55,H:40,M:5,L:0</weightTarget>
+        <weightTarget ifWeightClass="H" unitType="Mek" spread="8">A:35,H:52,M:11,L:2</weightTarget>
+
         <weightClass>
+            <option weight="2">A</option>
             <option weight="4">H</option>
             <option weight="2">M</option>
             <option ifRole="!command" weight="1">L</option>
diff --git a/data/forcegenerator/faction_rules/CGS.xml b/data/forcegenerator/faction_rules/CGS.xml
index d605aa001..3aaf69bec 100644
--- a/data/forcegenerator/faction_rules/CGS.xml
+++ b/data/forcegenerator/faction_rules/CGS.xml
@@ -729,17 +729,23 @@
         <name>{phonetic:distinct} [Striker] Trinary</name>
         <co>%STAR_CAPTAIN%</co>
 
+        <!-- Strikers are recon/harassers: mobility-led, light-to-heavy but rarely heavy. Picker
+             leans light/medium (heavy is the exception), and even a heavy roll pairs one heavy
+             star with a lighter one rather than two heavies, keeping the unit fast. This is the
+             Goliath Scorpion finesse/speed doctrine; the heavy backbone lives in cuirassier
+             (battle+assault) clusters instead. -->
         <weightClass>
-            <option weight="2">H</option>
+            <option weight="1">H</option>
             <option weight="4">M</option>
-            <option weight="3">L</option>
+            <option weight="4">L</option>
         </weightClass>
 
         <subforces>
             <subforceOption ifWeightClass="H|A">
-                <option weightClass="A,L" unitType="Mek">%STAR%</option>
-                <option weightClass="H,H" weight="2" unitType="Mek">%STAR%</option>
-                <option weightClass="H,M" weight="3" unitType="Mek">%STAR%</option>
+                <option weightClass="A,L" unitType="Mek" weight="2">%STAR%</option>
+                <option weightClass="H,H" unitType="Mek">%STAR%</option>
+                <option weightClass="H,M" weight="2" unitType="Mek">%STAR%</option>
+                <option weightClass="H,L" weight="2" unitType="Mek">%STAR%</option>
             </subforceOption>
             <subforceOption ifWeightClass="M">
                 <option weightClass="H,L" unitType="Mek">%STAR%</option>
@@ -1175,6 +1181,11 @@
             <subforce fluffName="CGS Corona Borealis" ifDateBetween=",3073"
                       chassis="Aegis Heavy Cruiser">%ELEMENT%
             </subforce>
+            <!-- Osis' Pride: ex-Smoke Jaguar Potemkin that passed to the Goliath Scorpions via the
+                 Clan Ice Hellion absorption (3073); scrapped 3076. -->
+            <subforce fluffName="CGS Osis&apos; Pride" ifDateBetween="3073,3076"
+                      chassis="Potemkin Troop Cruiser">%ELEMENT%
+            </subforce>
         </subforces>
 
         <subforces ifName="Imperio Naval Reserve">
diff --git a/data/forcegenerator/faction_rules/CHH.xml b/data/forcegenerator/faction_rules/CHH.xml
index 5a9c0e491..de9a16a35 100644
--- a/data/forcegenerator/faction_rules/CHH.xml
+++ b/data/forcegenerator/faction_rules/CHH.xml
@@ -251,7 +251,10 @@
 
         <subforces>
             <subforce flags="+navalFluff" role="command">%STAR%</subforce>
-            <subforce flags="+navalFluff">%STAR%</subforce>
+            <!-- Second warship star only through 3075: the fleet had two stars in 3058-3067, but the
+                 Wars of Reaving cut it to a single ~5-ship star by 3079. Attaching it later would
+                 leave an empty star (no 3076+ ship block) that collapses into a stray default WarShip. -->
+            <subforce flags="+navalFluff" ifDateBetween=",3075">%STAR%</subforce>
             <subforce unitType="Jumpship" num="2">%STAR%</subforce>
             <subforce unitType="Dropship" role="assault">%STAR%</subforce>
         </subforces>
@@ -2233,6 +2236,12 @@
             <subforce fluffName="CHH Gold Knight"
                       chassis="Lola III Destroyer">%ELEMENT%
             </subforce>
+            <!-- Stampede: the ex-Ice Hellion York Pack Leader, claimed as isorla at Vantaa in 3072
+                 and renamed (see CIH.xml). Joins the fleet from 3072; carries on in the post-Reaving
+                 star below (still in service 3145). -->
+            <subforce fluffName="CHH Stampede" ifDateBetween="3072,3075"
+                      chassis="York Destroyer-Carrier">%ELEMENT%
+            </subforce>
         </subforces>
 
         <subforces ifRole="!command" ifDateBetween=",3075">
diff --git a/data/forcegenerator/faction_rules/CIH.xml b/data/forcegenerator/faction_rules/CIH.xml
index db61709b8..48f601fd9 100644
--- a/data/forcegenerator/faction_rules/CIH.xml
+++ b/data/forcegenerator/faction_rules/CIH.xml
@@ -42,7 +42,7 @@
 
         <echelon>
             <option ifUnitType="">%TOUMAN%,%GALAXY%,%CLUSTER%</option>
-            <option ifUnitType="Warship">%CLUSTER%</option>
+            <option ifUnitType="Warship">%CLUSTER%,%STAR%</option>
             <option ifUnitType="Dropship|Jumpship">%STAR%</option>
             <option ifUnitType="Mek" ifDateBetween="2870,">%TRINARY%^,%TRINARY%,%BINARY%^,%BINARY%,%STAR%^,%STAR%</option>
             <option>%TRINARY%,%BINARY%,%STAR%</option>
@@ -153,6 +153,17 @@
                 <option weightClass="M,L,L" role="-command"
                 >%CLUSTER%
                 </option>
+                <!-- Larger 4-cluster galaxies (canon: Ice Hellion galaxies run 3-5 clusters).
+                     Kept light/medium to preserve the speed doctrine. -->
+                <option weightClass="M,M,M,L" role="-command"
+                >%CLUSTER%
+                </option>
+                <option weightClass="M,M,L,L" role="-command"
+                >%CLUSTER%
+                </option>
+                <option weightClass="H,M,M,L" role="-command"
+                >%CLUSTER%
+                </option>
             </subforceOption>
             <subforceOption ifWeightClass="A|H">
                 <option weightClass="A,H" role="-command"
@@ -185,9 +196,28 @@
                 <option weightClass="H,M,L" role="-command"
                         weight="2">%CLUSTER%
                 </option>
+                <!-- Larger 4-cluster galaxies (canon: 3-5 clusters). Delta carries the heavier
+                     front-line equipment, so its larger forms keep more heavy weight. -->
+                <option weightClass="H,H,M,L" role="-command"
+                >%CLUSTER%
+                </option>
+                <option weightClass="H,H,M,M" role="-command"
+                >%CLUSTER%
+                </option>
+                <option weightClass="H,M,M,L" role="-command"
+                >%CLUSTER%
+                </option>
             </subforceOption>
         </subforces>
 
+        <!-- Cage's Pride is the fixed flagship of Alpha Galaxy - the one Ice Hellion WarShip that
+             does NOT rotate among the Galaxies (per the circa-3058 source); lost at Vantaa in 3072. -->
+        <attachedForces>
+            <subforce ifName="Alpha Galaxy" unitType="Warship" flags="+navalFluff"
+                      name="Alpha Naval Star" ifDateBetween=",3072">%STAR%
+            </subforce>
+        </attachedForces>
+
         <attachedForces>
             <subforce ifRating="SL|PG|Sol" ifDateBetween="3063,"
                       flags="+flurry" rating="Sol">%CLUSTER%
@@ -213,48 +243,84 @@
         </subforces>
     </force>
 
+    <!-- The fleet is organized into two Warship Stars (Alpha = capital ships, Bravo = lighter
+         combatants and transports) plus JumpShip support. The Ice Hellion fleet was annihilated
+         3071-3074 (Operation ICE STORM and the Wars of Reaving), so the star attaches are date-gated
+         to drop out as they are wiped: Alpha (gone 3072) and Bravo (gone 3074); after 3074 only the
+         JumpShip star remains, which avoids an empty warship star collapsing into a stray hull. -->
     <force echelon="%CLUSTER%" eschName="Fleet" ifUnitType="Warship">
         <name>Naval Reserve</name>
         <co>%GALAXY_CMDR%</co>
 
         <subforces>
-            <subforce name="CIH Cage&apos;s Pride" role="command"
+            <subforce flags="+navalFluff" role="command" ifDateBetween=",3072">%STAR%</subforce>
+            <subforce flags="+navalFluff" ifDateBetween=",3074">%STAR%</subforce>
+            <subforce unitType="Jumpship" num="2">%STAR%</subforce>
+        </subforces>
+    </force>
+
+    <!-- Per-ship loss dates from Clan Ice Hellion Naval Forces (Sarna). Ships with no recorded loss
+         (Impaler, Radiant, Hellion's Pride, Coterie, Maker) end at the 3074 fleet disbandment. The
+         sole survivor, the ex-Smoke Jaguar Potemkin Osis' Pride, passed to Clan Goliath Scorpion
+         (see CGS.xml). Largest hull commands each star (tonnage sort). -->
+    <force echelon="%STAR%" eschName="Naval Star" ifUnitType="Warship" ifFlags="navalFluff">
+        <name>Warship Star {phonetic}</name>
+        <co>%STAR_CMDR%</co>
+
+        <!-- Alpha Galaxy's fixed flagship (does not rotate): the McKenna Cage's Pride, lost at
+             Vantaa 3072. Attached from the Alpha Galaxy node, padded with JumpShip escorts. -->
+        <subforces ifName="Alpha Naval Star">
+            <subforce fluffName="CIH Cage&apos;s Pride" role="command" ifDateBetween=",3072"
                       chassis="McKenna Battleship">%ELEMENT%
             </subforce>
-            <subforce name="CIH Coterie"
-                      chassis="Potemkin Troop Cruiser">%ELEMENT%
-            </subforce>
-            <subforce name="CIH Taney"
+            <subforceOption>
+                <option num="3" unitType="Jumpship">%ELEMENT%</option>
+                <option num="4" unitType="Jumpship">%ELEMENT%</option>
+            </subforceOption>
+        </subforces>
+
+        <!-- Star Alpha: the heavy combatants of the rotating Naval Reserve. -->
+        <subforces ifRole="command" ifName="!Alpha Naval Star">
+            <subforce fluffName="CIH Taney" ifDateBetween=",3071"
                       chassis="Aegis Heavy Cruiser">%ELEMENT%
             </subforce>
-            <subforce name="CIH Chaos Sailor"
+            <subforce fluffName="CIH Chaos Sailor" ifDateBetween=",3072"
                       chassis="Aegis Heavy Cruiser">%ELEMENT%
             </subforce>
-            <subforce name="CIH Pack Leader" ifDateBetween="2950,"
-                      chassis="York Destroyer-Carrier">%ELEMENT%
-            </subforce>
-            <subforce name="CIH Moore&apos;s Honor"
+            <subforce fluffName="CIH Moore&apos;s Honor" ifDateBetween=",3071"
                       chassis="Essex II Destroyer">%ELEMENT%
             </subforce>
-            <subforce name="CIH Cold Hunter"
+            <!-- Pack Leader was claimed by Clan Hell's Horses as isorla at Vantaa in 3072 and
+                 renamed Stampede (see CHH.xml), so it leaves the touman after 3071. -->
+            <subforce fluffName="CIH Pack Leader" ifDateBetween="2950,3071"
+                      chassis="York Destroyer-Carrier">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CIH Cold Hunter" ifDateBetween=",3072"
                       chassis="Lola III Destroyer">%ELEMENT%
             </subforce>
-            <subforce name="CIH Impaler"
+        </subforces>
+
+        <!-- Star Bravo: lighter destroyers, corvettes, and transports. -->
+        <subforces ifRole="!command" ifName="!Alpha Naval Star">
+            <subforce fluffName="CIH Impaler" ifDateBetween=",3074"
                       chassis="Lola III Destroyer">%ELEMENT%
             </subforce>
-            <subforce name="CIH Radiant"
+            <subforce fluffName="CIH Radiant" ifDateBetween=",3074"
                       chassis="Lola III Destroyer">%ELEMENT%
             </subforce>
-            <subforce name="CIH Swift Bait" ifDateBetween="2965,"
+            <subforce fluffName="CIH Swift Bait" ifDateBetween="2965,3071"
                       chassis="Fredasa (Corvette-Raider)">%ELEMENT%
             </subforce>
-            <subforce name="CIH Hellion&apos;s Pride" ifDateBetween="2965,"
+            <subforce fluffName="CIH Hellion&apos;s Pride" ifDateBetween="2965,3074"
                       chassis="Fredasa (Corvette-Raider)">%ELEMENT%
             </subforce>
-            <subforce name="CIH Whelp" ifDateBetween="2965,"
+            <subforce fluffName="CIH Whelp" ifDateBetween="2965,3072"
                       chassis="Fredasa (Corvette-Raider)">%ELEMENT%
             </subforce>
-            <subforce name="CIH Maker" ifDateBetween="2950,"
+            <subforce fluffName="CIH Coterie" ifDateBetween=",3074"
+                      chassis="Potemkin Troop Cruiser">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CIH Maker" ifDateBetween="2950,3074"
                       chassis="Carrack Transport">%ELEMENT%
             </subforce>
         </subforces>
@@ -288,6 +354,22 @@
         <name ifRating="SL|PG|Sol">Hector Cavaliers</name>
         <co>%STAR_COL%</co>
 
+        <!-- Per-cluster-type weight targets (budget allocator). Clan Ice Hellion doctrine
+             (Clan Ice Hellion Touman, Sarna) is the lightest, fastest Clan: light-to-medium
+             OmniMeks, speed over armor. Heavy/assault machines survive mainly as fast garrison
+             units (Gargoyle, Linebacker). The galaxy/cluster structure already routes the elite
+             front line to light-medium galaxies and pushes heavies into second-line garrison;
+             these element targets reinforce the speed bias within each weight band - minimal
+             assault, light-dominant Attack (L) clusters, medium-led Lancer (M) clusters. -->
+        <weightTarget ifWeightClass="A" unitType="Mek" spread="8">A:45,H:38,M:15,L:2</weightTarget>
+        <weightTarget ifWeightClass="H" unitType="Mek" spread="8">A:8,H:45,M:37,L:10</weightTarget>
+        <weightTarget ifWeightClass="M" unitType="Mek" spread="8">A:2,H:18,M:55,L:25</weightTarget>
+        <weightTarget ifWeightClass="L" unitType="Mek" spread="8">A:1,H:7,M:37,L:55</weightTarget>
+        <!-- Aero trended heavier over time (Visigoth, Sabutai) after dogfighting losses; medium-heavy. -->
+        <weightTarget unitType="AeroSpaceFighter" spread="8">A:0,H:40,M:42,L:18</weightTarget>
+        <!-- Vehicles: speed bias (hovercraft/VTOL, incl. the freeborn Flurry Clusters) - light/medium. -->
+        <weightTarget unitType="Tank" spread="8">A:0,H:12,M:38,L:50</weightTarget>
+
         <weightClass>
             <option weight="1">H</option>
             <option weight="2">M</option>
diff --git a/data/forcegenerator/faction_rules/CJF.xml b/data/forcegenerator/faction_rules/CJF.xml
index e7652e816..558f529a3 100644
--- a/data/forcegenerator/faction_rules/CJF.xml
+++ b/data/forcegenerator/faction_rules/CJF.xml
@@ -33,15 +33,19 @@
     slightly heavier than the standard.-->
 
     <toc>
+        <!-- Jade Falcon fields no vehicles before 3055 (strict reading of the Clan's anti-vehicle
+             doctrine). Tank and VTOL only become available from 3055 on, when the reconciled
+             support/APC vehicle usage begins. Before then the touman is Mek/Elemental/aero only. -->
         <unitType>
             <option ifDateBetween="3060,3072">null,Mek,ProtoMek,Tank,VTOL,Infantry,BattleArmor,AeroSpaceFighter,Conventional Fighter,Warship,Dropship,Jumpship</option>
-            <option ifDateBetween="2870,">null,Mek,Tank,VTOL,Infantry,BattleArmor,AeroSpaceFighter,Conventional Fighter,Warship,Dropship,Jumpship</option>
-            <option ifDateBetween=",2869">null,Mek,Tank,VTOL,Infantry,AeroSpaceFighter,Conventional Fighter,Warship,Dropship,Jumpship</option>
+            <option ifDateBetween="3055,">null,Mek,Tank,VTOL,Infantry,BattleArmor,AeroSpaceFighter,Conventional Fighter,Warship,Dropship,Jumpship</option>
+            <option ifDateBetween="2870,3054">null,Mek,Infantry,BattleArmor,AeroSpaceFighter,Conventional Fighter,Warship,Dropship,Jumpship</option>
+            <option ifDateBetween=",2869">null,Mek,Infantry,AeroSpaceFighter,Conventional Fighter,Warship,Dropship,Jumpship</option>
         </unitType>
 
         <echelon>
             <option ifUnitType="">%TOUMAN%,%GALAXY%,%CLUSTER%</option>
-            <option ifUnitType="Warship">%CLUSTER%</option>
+            <option ifUnitType="Warship">%CLUSTER%,%STAR%</option>
             <option ifUnitType="Dropship|Jumpship">%STAR%</option>
             <option ifUnitType="Mek" ifDateBetween="2870,">%TRINARY%^,%TRINARY%,%BINARY%^,%BINARY%,%STAR%^,%STAR%</option>
             <option>%TRINARY%,%BINARY%,%STAR%</option>
@@ -137,40 +141,61 @@
         </attachedForces>
     </force>
 
+    <!-- The Jade Falcon naval reserve (circa 3058) is organized into two named WarShip Stars -
+         Emerald Talon (the front-line battle star around the Nightlord flagship) and Falcon Stoop
+         (a post-Revival convoy-escort star of Aegis cruisers) - plus a pooled command star (the
+         Cameron flagship, the Texas, and the Black Lion Aeries) and a support star of frigates,
+         destroyers, and transports. JumpShips pad the formation so a date-thinned star never
+         collapses into a stray hull. -->
     <force echelon="%CLUSTER%" eschName="Fleet" ifUnitType="Warship">
         <name>Naval Reserve</name>
         <co>%GALAXY_CMDR%</co>
 
         <subforces>
-            <subforce fluffName="CJF Turkina's Pride" role="command"
-                      chassis="Cameron Battlecruiser">%ELEMENT%
+            <subforce flags="+navalFluff" name="Emerald Talon Star">%STAR%</subforce>
+            <subforce flags="+navalFluff" name="Falcon Stoop Star">%STAR%</subforce>
+            <subforce flags="+navalFluff" name="Naval Reserve Command Star">%STAR%</subforce>
+            <subforce flags="+navalFluff" name="Naval Reserve Support Star">%STAR%</subforce>
+            <!-- Seven Snow Raven Aegis cruisers leased to the Falcons for Operation Revival
+                 (3050-3060), recalled to the Raven touman by 3061 (see CSR.xml). They keep their
+                 CSR registry names while in Falcon service. -->
+            <subforce flags="+navalFluff" name="Snow Raven Contract Star"
+                      ifDateBetween="3050,3060">%STAR%
             </subforce>
-            <subforce fluffName="CJF Emerald Talon"
-                      ifDateBetween="2860,3136"
+            <subforce unitType="Jumpship" num="2">%STAR%</subforce>
+        </subforces>
+    </force>
+
+    <!-- Per-ship dates from Clan Jade Falcon Naval Forces (Sarna). Largest hull commands each star
+         (tonnage sort). The two ex-Ice Hellion captures - Chaos Sailor (taken at Vantaa 3072) and
+         Swift Bait (taken 3071, renamed Jade Tornado after 3085) - join the Falcon Stoop escort
+         star (see CIH.xml). -->
+    <force echelon="%STAR%" eschName="Naval Star" ifUnitType="Warship" ifFlags="navalFluff">
+        <co>%STAR_CMDR%</co>
+
+        <!-- Emerald Talon Star: front-line battle star built around the Nightlord flagship. -->
+        <subforces ifName="Emerald Talon Star">
+            <subforce fluffName="CJF Emerald Talon" role="command" ifDateBetween="2860,3136"
                       chassis="Nightlord Battleship">%ELEMENT%
             </subforce>
-            <subforce fluffName="CJF Falcon's Nest" ifDateBetween=",3073"
-                      chassis="Texas Battleship">%ELEMENT%
-            </subforce>
-            <subforce fluffName="CJF Jade Aerie"
-                      chassis="Black Lion II Battlecruiser">%ELEMENT%
-            </subforce>
-            <subforce fluffName="CJF Blue Aerie" ifDateBetween=",3073"
-                      chassis="Black Lion II Battlecruiser">%ELEMENT%
-            </subforce>
-            <subforce fluffName="CJF White Aerie"
-                      chassis="Black Lion II Battlecruiser">%ELEMENT%
-            </subforce>
-            <subforce fluffName="CJF Hawker" ifDateBetween=",3078"
-                      chassis="Sovetskii Soyuz Heavy Cruiser">%ELEMENT%
-            </subforce>
             <subforce fluffName="CJF Jade Talon"
                       chassis="Aegis Heavy Cruiser">%ELEMENT%
             </subforce>
             <subforce fluffName="CJF Gold Talon"
                       chassis="Aegis Heavy Cruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CJF Red Talon"
+            <subforce fluffName="CJF Janice Hazen" ifDateBetween=",3072"
+                      chassis="Aegis Heavy Cruiser">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CJF Frost Falcon" ifDateBetween=",3078"
+                      chassis="Aegis Heavy Cruiser">%ELEMENT%
+            </subforce>
+        </subforces>
+
+        <!-- Falcon Stoop Star: post-Revival convoy-escort star of Aegis cruisers, plus the two
+             ex-Ice Hellion captures. -->
+        <subforces ifName="Falcon Stoop Star">
+            <subforce fluffName="CJF Red Talon" role="command"
                       chassis="Aegis Heavy Cruiser">%ELEMENT%
             </subforce>
             <subforce fluffName="CJF White Talon" ifDateBetween=",3062"
@@ -182,39 +207,91 @@
             <subforce fluffName="CJF Blue Talon"
                       chassis="Aegis Heavy Cruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CJF Janice Hazen" ifDateBetween=",3072"
+            <subforce fluffName="CJF Hawk Eye" ifDateBetween=",3073"
                       chassis="Aegis Heavy Cruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CJF Frost Falco" ifDateBetween=",3078"
-                      chassis="Aegis Heavy Cruiser">%ELEMENT%
+            <subforce fluffName="CJF Kerensky&apos;s Blues" ifDateBetween="2965,3055"
+                      chassis="Fredasa (Corvette-Raider)">%ELEMENT%
             </subforce>
-            <subforce fluffName="CJF Hawk Eye" ifDateBetween=",3073"
+            <subforce fluffName="CJF Chaos Sailor" ifDateBetween="3072,3144"
                       chassis="Aegis Heavy Cruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CJF Gauntlet" ifDateBetween="3024,3073"
-                      chassis="Liberator Cruiser">%ELEMENT%
+            <subforce fluffName="CJF Swift Bait" ifDateBetween="3072,3084"
+                      chassis="Fredasa (Corvette-Raider)">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CJF Jade Tornado" ifDateBetween="3085,"
+                      chassis="Fredasa (Corvette-Raider)">%ELEMENT%
+            </subforce>
+        </subforces>
+
+        <!-- Naval Reserve Command Star: the Cameron flagship, the Texas, and the Black Lion Aeries. -->
+        <subforces ifName="Naval Reserve Command Star">
+            <subforce fluffName="CJF Turkina&apos;s Pride" role="command"
+                      chassis="Cameron Battlecruiser">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CJF Falcon&apos;s Nest" ifDateBetween=",3073"
+                      chassis="Texas Battleship">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CJF Jade Aerie"
+                      chassis="Black Lion II Battlecruiser">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CJF Blue Aerie" ifDateBetween=",3070"
+                      chassis="Black Lion II Battlecruiser">%ELEMENT%
             </subforce>
+            <subforce fluffName="CJF White Aerie"
+                      chassis="Black Lion II Battlecruiser">%ELEMENT%
+            </subforce>
+        </subforces>
+
+        <!-- Naval Reserve Support Star: frigates, destroyers, corvettes, and transports. -->
+        <subforces ifName="Naval Reserve Support Star">
             <subforce fluffName="CJF Green Lantern" ifDateBetween=",3078"
                       chassis="Congress Frigate">%ELEMENT%
             </subforce>
             <subforce fluffName="CJF Kerensky&apos;s Pride"
                       chassis="Congress Frigate">%ELEMENT%
             </subforce>
+            <subforce fluffName="CJF Gauntlet" ifDateBetween="3024,3070"
+                      chassis="Liberator Cruiser">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CJF Hawker" ifDateBetween=",3078"
+                      chassis="Sovetskii Soyuz Heavy Cruiser">%ELEMENT%
+            </subforce>
             <subforce fluffName="CJF Emerald Tornado"
                       chassis="Whirlwind Destroyer">%ELEMENT%
             </subforce>
-            <subforce fluffName="CJF Kerensky&apos;s Blues"
-                      ifDateBetween="2965,"
-                      chassis="Fredasa (Corvette-Raider)">%ELEMENT%
-            </subforce>
             <subforce fluffName="CJF Lightning Strike" ifDateBetween=",3072"
                       chassis="Vincent Corvette">%ELEMENT%
             </subforce>
-            <subforce fluffName="CJF Ironhold Provider"
-                      ifDateBetween="2950,3070"
+            <subforce fluffName="CJF Ironhold Provider" ifDateBetween="2950,3070"
                       chassis="Carrack Transport">%ELEMENT%
             </subforce>
         </subforces>
+
+        <!-- Snow Raven Contract Star: seven leased Aegis cruisers, gated to the contract window. -->
+        <subforces ifName="Snow Raven Contract Star">
+            <subforce fluffName="CSR Scabbard" role="command" ifDateBetween="3050,3060"
+                      chassis="Aegis Heavy Cruiser">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CSR Blue Lancer" ifDateBetween="3050,3060"
+                      chassis="Aegis Heavy Cruiser">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CSR White Terror" ifDateBetween="3050,3060"
+                      chassis="Aegis Heavy Cruiser">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CSR Blue Quest" ifDateBetween="3050,3060"
+                      chassis="Aegis Heavy Cruiser">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CSR Lord Death" ifDateBetween="3050,3060"
+                      chassis="Aegis Heavy Cruiser">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CSR Black Justice" ifDateBetween="3050,3060"
+                      chassis="Aegis Heavy Cruiser">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CSR Morning Violence" ifDateBetween="3050,3055"
+                      chassis="Aegis Heavy Cruiser">%ELEMENT%
+            </subforce>
+        </subforces>
     </force>
 
     <!--Front line galaxies typically contain four FL clusters, 0-2
@@ -303,11 +380,33 @@
         <name ifWeightClass="L">Striker Cluster</name>
         <co>%STAR_COL%</co>
 
+        <!-- Per-cluster-type weight targets (budget allocator). Clan Jade Falcon doctrine
+             (Clan Jade Falcon Touman, Sarna) is aggressive and Crusader: front-line Galaxies
+             are OmniMek-heavy with a strong assault core (the Turkina Keshik especially),
+             while Beak (heavy-medium) and Eye (light-medium) Stars round out a full-spread but
+             heavy-leaning force. Talon clusters lead heavy/assault; Battle clusters heavy-medium;
+             Striker (Eye) clusters are light-medium but still Falcon-aggressive. Picker (A1/H3/M2/L1)
+             plus these targets land the faction blend ~L13/M35/H36/A16 - heavier than most Clans.
+             NOTE: Striker/Eye clusters DO appear (~14% by name, driven by the L picker roll). The
+             forcegen_weights.csv rolledWeight column logs each cluster's post-recalc AVERAGE class,
+             which never reaches Light for a combined-arms Clan (the Elemental + fighter + command
+             stars pull the average up), so "rolled=L = 0" there is expected and not a missing type. -->
+        <weightTarget ifWeightClass="A" unitType="Mek" spread="8">A:40,H:38,M:18,L:4</weightTarget>
+        <weightTarget ifWeightClass="H" unitType="Mek" spread="8">A:20,H:46,M:28,L:6</weightTarget>
+        <weightTarget ifWeightClass="M" unitType="Mek" spread="8">A:6,H:30,M:48,L:16</weightTarget>
+        <weightTarget ifWeightClass="L" unitType="Mek" spread="8">A:2,H:14,M:44,L:40</weightTarget>
+        <!-- Aerospace is a Falcon strength (heavy/medium fighters); no assault-class fighters exist. -->
+        <weightTarget unitType="AeroSpaceFighter" spread="8">A:0,H:35,M:45,L:20</weightTarget>
+        <!-- Combat vehicles are rare and disdained (post-3055 only) - light/medium 2nd-line support. -->
+        <weightTarget unitType="Tank" spread="8">A:0,H:15,M:40,L:45</weightTarget>
+
         <weightClass>
-            <option weight="2">H</option>
+            <option weight="1">A</option>
+            <option weight="3">H</option>
             <option weight="2">M</option>
             <option weight="1">L</option>
             <option ifRole="command">H</option>
+            <option ifRating="Keshik">A</option>
             <option ifRating="Keshik">H</option>
         </weightClass>
 
@@ -789,13 +888,13 @@
 
         <attachedForces ifRating="PG|Sol">
             <subforceOption>
-                <option unitType="Tank" weight="1" name="Binary Artillery"
+                <option unitType="Tank" ifDateBetween="3055," weight="1" name="Binary Artillery"
                         role="artillery">%BINARY%
                 </option>
-                <option unitType="Tank" ifDateBetween="2950,"
+                <option unitType="Tank" ifDateBetween="3055,"
                         weight="2" name="Trinary Support">%TRINARY%
                 </option>
-                <option unitType="Tank" ifDateBetween="2950,"
+                <option unitType="Tank" ifDateBetween="3055,"
                         weight="2" name="Binary Support">%BINARY%
                 </option>
                 <option weight="2" />
@@ -829,12 +928,6 @@
                 <option weightClass="M" unitType="Mek"
                         weight="1">%STAR%
                 </option>
-                <option weightClass="H" unitType="Tank"
-                        ifDateBetween=",3000" weight="2">%STAR%
-                </option>
-                <option weightClass="M" unitType="Tank"
-                        ifDateBetween=",3000" weight="1">%STAR%
-                </option>
             </subforceOption>
             <subforceOption ifWeightClass="M">
                 <option weightClass="H" unitType="Mek"
@@ -846,15 +939,6 @@
                 <option weightClass="L" unitType="Mek"
                         weight="1">%STAR%
                 </option>
-                <option weightClass="H" unitType="Tank"
-                        ifDateBetween=",3000" weight="1">%STAR%
-                </option>
-                <option weightClass="M" unitType="Tank"
-                        ifDateBetween=",3000" weight="2">%STAR%
-                </option>
-                <option weightClass="L" unitType="Tank"
-                        ifDateBetween=",3000" weight="1">%STAR%
-                </option>
             </subforceOption>
             <subforceOption ifWeightClass="L">
                 <option weightClass="M" unitType="Mek"
@@ -863,12 +947,6 @@
                 <option weightClass="L" unitType="Mek"
                         weight="2">%STAR%
                 </option>
-                <option weightClass="M" unitType="Tank"
-                        ifDateBetween=",3000" weight="1">%STAR%
-                </option>
-                <option weightClass="L" unitType="Tank"
-                        ifDateBetween=",3000" weight="2">%STAR%
-                </option>
             </subforceOption>
 
             <subforceOption ifWeightClass="H|A">
@@ -878,12 +956,6 @@
                 <option weightClass="M" unitType="Mek"
                         weight="1">%STAR%
                 </option>
-                <option weightClass="H" unitType="Tank"
-                        ifDateBetween=",2950" weight="2">%STAR%
-                </option>
-                <option weightClass="M" unitType="Tank"
-                        ifDateBetween=",2950" weight="1">%STAR%
-                </option>
                 <option unitType="Infantry"
                         weightClass="H" weight="2">%STAR%
                 </option>
@@ -907,15 +979,6 @@
                 <option weightClass="L" unitType="Mek"
                         weight="1">%STAR%
                 </option>
-                <option weightClass="H" unitType="Tank"
-                        ifDateBetween=",2950" weight="1">%STAR%
-                </option>
-                <option weightClass="M" unitType="Tank"
-                        ifDateBetween=",2950" weight="2">%STAR%
-                </option>
-                <option weightClass="L" unitType="Tank"
-                        ifDateBetween=",2950" weight="1">%STAR%
-                </option>
                 <option unitType="Infantry"
                         weightClass="H" weight="1">%STAR%
                 </option>
@@ -942,12 +1005,6 @@
                 <option weightClass="L" unitType="Mek"
                         weight="2">%STAR%
                 </option>
-                <option weightClass="M" unitType="Tank"
-                        ifDateBetween=",2950" weight="1">%STAR%
-                </option>
-                <option weightClass="L" unitType="Tank"
-                        ifDateBetween=",2950" weight="2">%STAR%
-                </option>
                 <option unitType="Infantry"
                         weightClass="M" weight="2">%STAR%
                 </option>
@@ -1298,10 +1355,10 @@
                 <option unitType="Infantry"
                         weightClass="M">%STAR%
                 </option>
-                <option unitType="Tank" role="apc"
+                <option unitType="Tank" role="apc" ifDateBetween="3055,"
                         weightClass="H" weight="2">%STAR%
                 </option>
-                <option unitType="Tank" role="apc"
+                <option unitType="Tank" role="apc" ifDateBetween="3055,"
                         weightClass="M">%STAR%
                 </option>
             </subforceOption>
@@ -1315,13 +1372,13 @@
                 <option unitType="Infantry"
                         weightClass="L" weight="1">%STAR%
                 </option>
-                <option unitType="Tank" role="apc"
+                <option unitType="Tank" role="apc" ifDateBetween="3055,"
                         weightClass="H" weight="1">%STAR%
                 </option>
-                <option unitType="Tank" role="apc"
+                <option unitType="Tank" role="apc" ifDateBetween="3055,"
                         weightClass="M" weight="2">%STAR%
                 </option>
-                <option unitType="Tank" role="apc"
+                <option unitType="Tank" role="apc" ifDateBetween="3055,"
                         weightClass="L" weight="1">%STAR%
                 </option>
             </subforceOption>
@@ -1332,10 +1389,10 @@
                 <option unitType="Infantry"
                         weightClass="L">%STAR%
                 </option>
-                <option unitType="Tank" role="apc"
+                <option unitType="Tank" role="apc" ifDateBetween="3055,"
                         weightClass="M">%STAR%
                 </option>
-                <option unitType="Tank" role="apc"
+                <option unitType="Tank" role="apc" ifDateBetween="3055,"
                         weightClass="L">%STAR%
                 </option>
             </subforceOption>
@@ -1564,10 +1621,10 @@
                 <option unitType="Infantry"
                         weightClass="M">%STAR%
                 </option>
-                <option unitType="Tank" role="apc"
+                <option unitType="Tank" role="apc" ifDateBetween="3055,"
                         weightClass="H" weight="2">%STAR%
                 </option>
-                <option unitType="Tank" role="apc"
+                <option unitType="Tank" role="apc" ifDateBetween="3055,"
                         weightClass="M">%STAR%
                 </option>
             </subforceOption>
@@ -1581,13 +1638,13 @@
                 <option unitType="Infantry"
                         weightClass="L" weight="1">%STAR%
                 </option>
-                <option unitType="Tank" role="apc"
+                <option unitType="Tank" role="apc" ifDateBetween="3055,"
                         weightClass="H" weight="1">%STAR%
                 </option>
-                <option unitType="Tank" role="apc"
+                <option unitType="Tank" role="apc" ifDateBetween="3055,"
                         weightClass="M" weight="2">%STAR%
                 </option>
-                <option unitType="Tank" role="apc"
+                <option unitType="Tank" role="apc" ifDateBetween="3055,"
                         weightClass="L" weight="1">%STAR%
                 </option>
             </subforceOption>
@@ -1598,10 +1655,10 @@
                 <option unitType="Infantry"
                         weightClass="L">%STAR%
                 </option>
-                <option unitType="Tank" role="apc"
+                <option unitType="Tank" role="apc" ifDateBetween="3055,"
                         weightClass="M">%STAR%
                 </option>
-                <option unitType="Tank" role="apc"
+                <option unitType="Tank" role="apc" ifDateBetween="3055,"
                         weightClass="L">%STAR%
                 </option>
             </subforceOption>
diff --git a/data/forcegenerator/faction_rules/CMG.xml b/data/forcegenerator/faction_rules/CMG.xml
new file mode 100644
index 000000000..66f4f88da
--- /dev/null
+++ b/data/forcegenerator/faction_rules/CMG.xml
@@ -0,0 +1,315 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+# MegaMek Data (C) 2026 by The MegaMek Team is licensed under CC BY-NC-SA 4.0.
+# To view a copy of this license, visit https://creativecommons.org/licenses/by-nc-sa/4.0/
+#
+# NOTICE: The MegaMek organization is a non-profit group of volunteers
+# creating free software for the BattleTech community.
+#
+# MechWarrior, BattleMech, `Mech and AeroTech are registered trademarks
+# of The Topps Company, Inc. All Rights Reserved.
+#
+# Catalyst Game Labs and the Catalyst Game Labs logo are trademarks of
+# InMediaRes Productions, LLC.
+#
+# MechWarrior Copyright Microsoft Corporation. MegaMek Data was created under
+# Microsoft's "Game Content Usage Rules"
+# <https://www.xbox.com/en-US/developers/rules> and it is not endorsed by or
+# affiliated with Microsoft.
+-->
+<!--
+    Clan Mongoose (CMG) - a Golden Century Clan, active 2807-2868, Absorbed by
+    Clan Smoke Jaguar in 2868. The Mongoose touman specialized in speed and
+    aggression, imitating its namesake with fast, deadly strikes. Canon (Op.
+    KLONDIKE source) notes a predominance of medium-class 'Mechs, giving an
+    innate mix of speed and firepower.
+
+    Structure follows the early-Kerensky Clan pattern (modeled on Clan Blood
+    Spirit): the file owns Touman/Galaxy/Cluster/Trinary and delegates the Star
+    fill to the generic CLAN baseline via asParent. Front-line and Keshik
+    clusters run four Mek trinaries and one infantry; second-line and garrison
+    clusters swap a Mek trinary for a vehicle trinary, since Clans field combat
+    vehicles only in reserve formations. No Elementals exist before 2869.
+
+    Weight identity: medium-dominant with fast heavies for the speed+firepower
+    mix, real light presence for the darting strikes, assault a clear minority.
+    Cluster picker rolls M~50/H~33/L~17 (no Assault cluster), yielding a faction
+    blend of roughly L18/M46/H31/A6.
+-->
+<ruleset faction="CMG" ratingSystem="CLAN" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="formationRulesetSchema.xsd">
+
+    <defaults>
+        <echelon>%CLUSTER%</echelon>
+        <rankSystem>%RANK_CLAN%</rankSystem>
+        <rating>FL</rating>
+    </defaults>
+
+    <toc>
+        <unitType>
+            <option>null,Mek,Tank,VTOL,Infantry,AeroSpaceFighter,Conventional Fighter,Warship,Dropship,Jumpship</option>
+        </unitType>
+
+        <echelon>
+            <option ifUnitType="">%TOUMAN%,%GALAXY%,%CLUSTER%</option>
+            <option ifUnitType="Dropship|Jumpship">%STAR%</option>
+            <option ifUnitType="AeroSpaceFighter">%CLUSTER%,%TRINARY%,%BINARY%,%STAR%</option>
+            <option>%TRINARY%,%BINARY%,%STAR%</option>
+        </echelon>
+
+        <rating>
+            <option ifUnitType="Tank|VTOL">Keshik,FL:Front Line,SL:Second Line,Sol:Solahma,PG:Provisional Garrison</option>
+            <option ifEschelon="%TOUMAN%"></option>
+            <option ifEschelon="%GALAXY%">FL:Front Line,SL:Second Line</option>
+            <option>Keshik,FL:Front Line,SL:Second Line,Sol:Solahma,PG:Provisional Garrison</option>
+        </rating>
+    </toc>
+
+    <force echelon="%TOUMAN%" eschName="Touman">
+        <co>%KHAN%</co>
+        <xo title="Aide" position="0">%SAKHAN%</xo>
+
+        <subforces>
+            <subforce rating="Keshik" role="command"
+                      name="Mongoose Keshik">%CLUSTER%
+            </subforce>
+            <subforce rating="FL" name="Alpha Galaxy">%GALAXY%</subforce>
+            <subforce rating="FL" name="Beta Galaxy">%GALAXY%</subforce>
+            <subforce rating="SL"
+                      name="Epsilon Provisional Galaxy">%GALAXY%
+            </subforce>
+            <subforce rating="SL"
+                      name="Kappa Provisional Galaxy">%GALAXY%
+            </subforce>
+        </subforces>
+    </force>
+
+    <force echelon="%GALAXY%" eschName="Galaxy">
+        <name>{greek} Galaxy</name>
+        <co position="0">%GALAXY_CMDR%</co>
+
+        <subforces ifRating="FL">
+            <subforceOption>
+                <option num="4">%CLUSTER%</option>
+                <option num="3">%CLUSTER%</option>
+            </subforceOption>
+        </subforces>
+
+        <subforces ifRating="SL">
+            <subforceOption>
+                <option num="3">%CLUSTER%</option>
+                <option num="2">%CLUSTER%</option>
+            </subforceOption>
+        </subforces>
+    </force>
+
+    <!-- Mongoose clusters: front-line runs four Mek trinaries plus infantry;
+         second-line/garrison swaps one for a vehicle trinary (no Elementals
+         before 2869). Aerospace is integrated as one binary per front-line
+         cluster (second-line clusters field no organic air), matching the
+         Kerensky baseline rather than a dedicated fighter cluster.
+         Medium-dominant with fast heavies. -->
+    <force echelon="%CLUSTER%" eschName="Cluster">
+        <name ifRating="Keshik">Mongoose Keshik</name>
+        <name ifRating="FL" ifWeightClass="A|H">Assault Cluster</name>
+        <name ifRating="FL" ifWeightClass="M">Battle Cluster</name>
+        <name ifRating="FL" ifWeightClass="L">Striker Cluster</name>
+        <name ifRating="SL">Garrison Cluster</name>
+        <co>%STAR_COL%</co>
+
+        <!-- Per-cluster-type weight targets (budget allocator). Clan Mongoose
+             specialized in speed and aggression: a predominance of medium 'Mechs
+             plus fast heavies for the speed+firepower mix, light 'Mechs for the
+             namesake darting strikes, assault a clear minority. Picker rolls
+             M~50/H~33/L~17 (no Assault cluster), so the M and H cluster targets
+             dominate the faction blend, giving roughly L18/M46/H31/A6. -->
+        <weightTarget ifWeightClass="A|H" unitType="Mek" spread="8">A:10,H:46,M:36,L:8</weightTarget>
+        <weightTarget ifWeightClass="M" unitType="Mek" spread="8">A:5,H:20,M:55,L:20</weightTarget>
+        <weightTarget ifWeightClass="L" unitType="Mek" spread="8">A:2,H:10,M:38,L:50</weightTarget>
+        <!-- Early second-line armor runs medium/light, cheaper than the Meks. -->
+        <weightTarget unitType="Tank" spread="8">A:2,H:20,M:43,L:35</weightTarget>
+        <!-- No assault-class fighters exist (caps at Heavy). Speed clan:
+             medium/light interceptor lean. -->
+        <weightTarget unitType="AeroSpaceFighter" spread="8">A:0,H:35,M:45,L:20</weightTarget>
+
+        <weightClass>
+            <option ifRating="Keshik" weight="1">H</option>
+            <option ifRating="!Keshik" weight="3">M</option>
+            <option ifRating="!Keshik" weight="2">H</option>
+            <option ifRating="!Keshik" weight="1">L</option>
+        </weightClass>
+
+        <subforces>
+            <subforceOption ifWeightClass="H|A">
+                <option weightClass="A,H,H" unitType="Mek" weight="2"
+                >%TRINARY%
+                </option>
+                <option weightClass="H,H,H" unitType="Mek" weight="3"
+                >%TRINARY%
+                </option>
+                <option weightClass="H,H,M" unitType="Mek" weight="3"
+                >%TRINARY%
+                </option>
+                <option weightClass="A,H,M" unitType="Mek" weight="2"
+                >%TRINARY%
+                </option>
+            </subforceOption>
+            <subforceOption ifWeightClass="M">
+                <option weightClass="M,M,M" unitType="Mek" weight="3"
+                >%TRINARY%
+                </option>
+                <option weightClass="H,M,M" unitType="Mek" weight="3"
+                >%TRINARY%
+                </option>
+                <option weightClass="H,H,M" unitType="Mek" weight="2"
+                >%TRINARY%
+                </option>
+                <option weightClass="M,M,L" unitType="Mek" weight="2"
+                >%TRINARY%
+                </option>
+            </subforceOption>
+            <subforceOption ifWeightClass="L">
+                <option weightClass="M,M,L" unitType="Mek" weight="2"
+                >%TRINARY%
+                </option>
+                <option weightClass="M,L,L" unitType="Mek" weight="3"
+                >%TRINARY%
+                </option>
+                <option weightClass="H,M,L" unitType="Mek" weight="2"
+                >%TRINARY%
+                </option>
+                <option weightClass="L,L,L" unitType="Mek" weight="1"
+                >%TRINARY%
+                </option>
+            </subforceOption>
+
+            <!-- Vehicles only in second-line and garrison clusters - Clans are
+                 Mek-centric and field combat vehicles in their reserve
+                 formations, not the front line. FL and Keshik clusters take an
+                 extra Mek trinary in the vehicle's place. The Tank weightTarget
+                 above reshapes vehicle weights, so a nominal weight suffices. -->
+            <subforceOption>
+                <option ifRating="SL|Sol|PG" weightClass="M" unitType="Tank"
+                        weight="3">%TRINARY%
+                </option>
+                <option ifRating="SL|Sol|PG" weightClass="L" unitType="Tank"
+                        weight="2">%TRINARY%
+                </option>
+                <option ifRating="SL|Sol|PG" weightClass="H" unitType="Tank"
+                        weight="1">%TRINARY%
+                </option>
+                <option ifRating="FL|Keshik" weightClass="M" unitType="Mek"
+                        weight="2">%TRINARY%
+                </option>
+                <option ifRating="FL|Keshik" weightClass="H" unitType="Mek"
+                        weight="1">%TRINARY%
+                </option>
+            </subforceOption>
+
+            <!-- A single aerospace binary attached per front-line cluster
+                 (Kerensky-style integrated air support, not a dedicated fighter
+                 cluster). A full aero trinary is too much air for a secondary
+                 arm, so a binary keeps aero present but secondary. Air is a
+                 front-line asset - second-line and garrison clusters hold
+                 ground and field no organic aerospace. The empty fallback leaves
+                 a few front-line clusters without air. -->
+            <subforceOption ifRating="FL|Keshik">
+                <option weightClass="H" unitType="AeroSpaceFighter"
+                        weight="2">%BINARY%
+                </option>
+                <option weightClass="M" unitType="AeroSpaceFighter"
+                        weight="3">%BINARY%
+                </option>
+                <option weightClass="L" unitType="AeroSpaceFighter"
+                        weight="2">%BINARY%
+                </option>
+                <option weight="2" />
+            </subforceOption>
+
+            <subforceOption>
+                <option unitType="Infantry" weight="2">%TRINARY%</option>
+            </subforceOption>
+        </subforces>
+    </force>
+
+    <force echelon="%TRINARY%" eschName="Trinary" ifUnitType="Mek">
+        <name ifRole="command">Trinary [Command]</name>
+        <name ifWeightClass="H|A"
+        >{ordinal:distinct} Trinary [Assault]
+        </name>
+        <name ifWeightClass="M">{ordinal:distinct} Trinary [Battle]</name>
+        <name ifWeightClass="L">{ordinal:distinct} Trinary [Striker]</name>
+        <co>%STAR_CAPTAIN%</co>
+
+        <weightClass>
+            <option weight="1">A</option>
+            <option weight="2">H</option>
+            <option weight="3">M</option>
+            <option weight="1">L</option>
+        </weightClass>
+
+        <subforces>
+            <subforceOption ifWeightClass="A">
+                <option weightClass="A,A,H" weight="2">%STAR%</option>
+                <option weightClass="A,H,H" weight="3">%STAR%</option>
+                <option weightClass="A,H,M" weight="2">%STAR%</option>
+            </subforceOption>
+            <subforceOption ifWeightClass="H">
+                <option weightClass="H,H,H" weight="2">%STAR%</option>
+                <option weightClass="H,H,M" weight="3">%STAR%</option>
+                <option weightClass="A,H,M" weight="2">%STAR%</option>
+                <option weightClass="H,M,M" weight="2">%STAR%</option>
+            </subforceOption>
+            <subforceOption ifWeightClass="M">
+                <option weightClass="M,M,M" weight="3">%STAR%</option>
+                <option weightClass="H,M,M" weight="2">%STAR%</option>
+                <option weightClass="H,M,L" weight="2">%STAR%</option>
+                <option weightClass="M,M,L" weight="2">%STAR%</option>
+            </subforceOption>
+            <subforceOption ifWeightClass="L">
+                <option weightClass="M,L,L" weight="3">%STAR%</option>
+                <option weightClass="M,M,L" weight="2">%STAR%</option>
+                <option weightClass="L,L,L" weight="2">%STAR%</option>
+            </subforceOption>
+        </subforces>
+    </force>
+
+    <force echelon="%STAR%" eschName="Star" ifUnitType="Mek">
+        <name>{phonetic} {name:parent} Star</name>
+        <co>%STAR_CMDR%</co>
+
+        <weightClass>
+            <option weight="1">A</option>
+            <option weight="2">H</option>
+            <option weight="3">M</option>
+            <option weight="1">L</option>
+        </weightClass>
+
+        <ruleGroup>
+            <formation ifIndex="0">
+                <option weight="20" ifWeightClass="M">Medium Battle</option>
+                <option weight="20" ifWeightClass="H|A">Battle</option>
+                <option weight="20" ifWeightClass="L">Light Battle</option>
+                <option weight="12" ifWeightClass="L|M|H">Striker/Cavalry</option>
+                <option weight="6" ifWeightClass="H|A">Heavy Battle</option>
+                <option weight="4" ifWeightClass="H|A">Assault</option>
+                <option weight="4" ifWeightClass="L">Light Striker/Cavalry</option>
+                <option weight="2" ifWeightClass="L|M|H">Pursuit</option>
+            </formation>
+
+            <formation ifIndex="!0">
+                <option weight="20">Fire</option>
+                <option weight="20" ifWeightClass="M">Medium Battle</option>
+                <option weight="16" ifWeightClass="H|A">Battle</option>
+                <option weight="16" ifWeightClass="L">Light Battle</option>
+                <option weight="10" ifWeightClass="L|M|H">Striker/Cavalry</option>
+                <option weight="6" ifWeightClass="H|A">Heavy Battle</option>
+                <option weight="3" ifWeightClass="H|A">Assault</option>
+                <option weight="12" ifWeightClass="L|M" role="+recon">Recon</option>
+            </formation>
+        </ruleGroup>
+
+        <subforces>
+            <asParent />
+        </subforces>
+    </force>
+</ruleset>
diff --git a/data/forcegenerator/faction_rules/CNC.xml b/data/forcegenerator/faction_rules/CNC.xml
index 24d52b175..332fa6c0e 100644
--- a/data/forcegenerator/faction_rules/CNC.xml
+++ b/data/forcegenerator/faction_rules/CNC.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-# MegaMek Data (C) 2025 by The MegaMek Team is licensed under CC BY-NC-SA 4.0.
+# MegaMek Data (C) 2025-2026 by The MegaMek Team is licensed under CC BY-NC-SA 4.0.
 # To view a copy of this license, visit https://creativecommons.org/licenses/by-nc-sa/4.0/
 #
 # NOTICE: The MegaMek organization is a non-profit group of volunteers
@@ -203,12 +203,6 @@
             <subforce unitType="BattleArmor" name="{phonetic} Command Trinary">%TRINARY%</subforce>
             <subforce unitType="Mek" name="{phonetic} Command Trinary">%TRINARY%</subforce>
         </subforces>
-
-        <attachedForces>
-            <subforce fluffName="NCS Thunderbolt"
-                      chassis="Black Lion II Battlecruiser" unitType="Warship">%ELEMENT%
-            </subforce>
-        </attachedForces>
     </force>
 
     <!-- The typical FL cluster is 2-3 Mek trinaries (one of which may be SN), one Mek binary,
@@ -228,12 +222,27 @@
         <name ifWeightClass="L">Striker Cluster</name>
         <co>%STAR_COL%</co>
 
+        <!-- Per-cluster-type weight targets (budget allocator). Clan Nova Cat canon
+             (Clan Nova Cat Touman, Sarna) favors MEDIUM and LIGHT OmniMeks - a mobile,
+             marksman clan - while each cluster still carries a genuine assault element.
+             Assault clusters stay heavy; Battle clusters medium-led; Striker clusters
+             light/fast. Lighter picker (A1/H2/M3/L3) + these targets land the faction
+             blend ~L26/M44/H25/A5. -->
+        <weightTarget ifWeightClass="A|H" unitType="Mek" spread="8">A:12,H:44,M:36,L:8</weightTarget>
+        <weightTarget ifWeightClass="M" unitType="Mek" spread="8">A:3,H:16,M:52,L:29</weightTarget>
+        <weightTarget ifWeightClass="L" unitType="Mek" spread="8">A:1,H:6,M:38,L:55</weightTarget>
+        <!-- Aerospace is a Nova Cat signature (they bid a higher fighter ratio than
+             most Clans); no assault-class fighters exist (caps at Heavy). -->
+        <weightTarget unitType="AeroSpaceFighter" spread="8">A:0,H:32,M:45,L:23</weightTarget>
+        <!-- Vehicles are solahma/garrison armor - light/medium. -->
+        <weightTarget unitType="Tank" spread="8">A:2,H:18,M:40,L:40</weightTarget>
+
         <ruleGroup>
             <weightClass>
                 <option weight="1">A</option>
-                <option weight="3">H</option>
+                <option weight="2">H</option>
                 <option weight="3">M</option>
-                <option weight="2">L</option>
+                <option weight="3">L</option>
                 <option ifFlags="guard" weight="2">A</option>
                 <option ifFlags="guard" weight="2">H</option>
                 <option ifFlags="lancer" weight="2">M</option>
@@ -483,10 +492,64 @@
                         flags="+testTrinary" weight="3">%TRINARY%
                 </option>
             </subforceOption>
+
+            <!-- Nova Cat bid a higher fighter ratio than most Clans; a bonus aero
+                 binary appears in roughly half of front-line clusters, making
+                 aerospace their signature arm. -->
+            <subforceOption>
+                <option weightClass="M" unitType="AeroSpaceFighter"
+                        flags="+testTrinary" weight="2">%BINARY%
+                </option>
+                <option weightClass="H" unitType="AeroSpaceFighter"
+                        flags="+testTrinary" weight="1">%BINARY%
+                </option>
+                <option weightClass="L" unitType="AeroSpaceFighter"
+                        flags="+testTrinary" weight="1">%BINARY%
+                </option>
+                <option weight="4" />
+            </subforceOption>
         </subforces>
 
+        <!-- Nova Cat reserve formations. Earlier this delegated to the generic Clan
+             garrison via asParent, which flooded Provisional Garrison clusters with
+             vehicles (~90% armor) - badly off-doctrine. Per canon the Nova Cats field
+             standard BattleMeks in second-line units and reserve combat vehicles for
+             solahma, so second-line runs Meks, while garrison (PG) and solahma (Sol)
+             carry a vehicle minority. -->
         <subforces ifRating="SL|PG|Sol">
-            <asParent />
+            <subforceOption ifWeightClass="H|A">
+                <option weightClass="H,H" unitType="Mek" weight="3">%TRINARY%</option>
+                <option weightClass="A,H" unitType="Mek" weight="2">%TRINARY%</option>
+                <option weightClass="H,M" unitType="Mek" weight="2">%TRINARY%</option>
+            </subforceOption>
+            <subforceOption ifWeightClass="M">
+                <option weightClass="M,M" unitType="Mek" weight="3">%TRINARY%</option>
+                <option weightClass="H,M" unitType="Mek" weight="2">%TRINARY%</option>
+                <option weightClass="M,L" unitType="Mek" weight="2">%TRINARY%</option>
+            </subforceOption>
+            <subforceOption ifWeightClass="L">
+                <option weightClass="M,L" unitType="Mek" weight="2">%TRINARY%</option>
+                <option weightClass="L,L" unitType="Mek" weight="3">%TRINARY%</option>
+            </subforceOption>
+
+            <!-- Third line: another Mek trinary for second-line; garrison and solahma
+                 may field a vehicle trinary instead (the reserved solahma armor). -->
+            <subforceOption>
+                <option ifRating="SL" weightClass="M" unitType="Mek" weight="3">%TRINARY%</option>
+                <option ifRating="SL" weightClass="H" unitType="Mek" weight="2">%TRINARY%</option>
+                <option ifRating="PG|Sol" weightClass="M" unitType="Mek" weight="3">%TRINARY%</option>
+                <option ifRating="PG|Sol" weightClass="L" unitType="Mek" weight="2">%TRINARY%</option>
+                <option ifRating="PG|Sol" weightClass="M" unitType="Tank" weight="2">%TRINARY%</option>
+                <option ifRating="PG|Sol" weightClass="L" unitType="Tank" weight="2">%TRINARY%</option>
+                <option ifRating="Sol" weightClass="H" unitType="Tank" weight="2">%TRINARY%</option>
+            </subforceOption>
+
+            <!-- Limited aerospace in the reserve, smaller than front-line. -->
+            <subforceOption>
+                <option weightClass="M" unitType="AeroSpaceFighter" weight="2">%BINARY%</option>
+                <option weightClass="L" unitType="AeroSpaceFighter" weight="1">%BINARY%</option>
+                <option weight="4" />
+            </subforceOption>
         </subforces>
     </force>
 
@@ -961,7 +1024,13 @@
         </subforces>
 
         <subforces ifName="Mystic Naval Star">
-            <subforce fluffName="NCS Severen Leroux" ifDateBetween="3067,3078"
+            <!-- Flagship name change captured via date-gated pair: the Black Lion II
+                 Thunderbolt was renamed Severen Leroux in 3062 (honoring Khan Severen
+                 Leroux) and destroyed 3078. Same ship, two eras. -->
+            <subforce fluffName="CNC Thunderbolt" ifDateBetween=",3061"
+                      role="command" chassis="Black Lion II Battlecruiser">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CNC Severen Leroux" ifDateBetween="3062,3077"
                       role="command" chassis="Black Lion II Battlecruiser">%ELEMENT%
             </subforce>
             <subforce fluffName="CNC Spirit Vision" ifDateBetween=",3078"
diff --git a/data/forcegenerator/faction_rules/CSA.xml b/data/forcegenerator/faction_rules/CSA.xml
index 3d2ae7579..ec5404090 100644
--- a/data/forcegenerator/faction_rules/CSA.xml
+++ b/data/forcegenerator/faction_rules/CSA.xml
@@ -34,7 +34,7 @@
 
         <echelon>
             <option ifUnitType="">%TOUMAN%,%GALAXY%,%CLUSTER%</option>
-            <option ifUnitType="Warship">%CLUSTER%</option>
+            <option ifUnitType="Warship">%CLUSTER%,%STAR%</option>
             <option ifUnitType="Dropship|Jumpship">%STAR%</option>
             <option ifUnitType="Mek" ifDateBetween="2870,">%TRINARY%^,%TRINARY%,%BINARY%^,%BINARY%,%STAR%^,%STAR%</option>
             <option>%TRINARY%,%BINARY%,%STAR%</option>
@@ -161,76 +161,101 @@
         </attachedForces>
     </force>
 
+    <!-- Star Adder maintains a substantial fleet (Clan Star Adder Naval Forces, Sarna), built around
+         two battleships - the McKenna Sovereign Right and the Nightlord Absolute Truth. Organized into
+         the Command Keshik (flagships + Command/Quasar Keshik cruisers), two Naval Reserves, the Exodus
+         York-carrier squadron, a patrol/raider squadron, and a transport star. Wars of Reaving losses
+         are date-gated out (Nygaard/Exodus Ranger/Divine Conquest gone 3075; most destroyers/cruisers
+         gone 3072). The Beta Naval Reserve and Transport star empty out by 3072, so their attaches are
+         gated ,3072 to drop rather than collapse into a stray hull; JumpShips pad the remainder. -->
     <force echelon="%CLUSTER%" eschName="Fleet" ifUnitType="Warship">
         <name>Naval Reserve</name>
         <co>%GALAXY_CMDR%</co>
 
         <subforces>
-            <subforce chassis="Sovetskii Soyuz Heavy Cruiser"
-                      ifDateBetween=",3075" role="command"
-                      fluffName="CSA Nygaard">%ELEMENT%
+            <subforce flags="+navalFluff" name="Command Keshik">%STAR%</subforce>
+            <subforce flags="+navalFluff" name="Alpha Naval Reserve">%STAR%</subforce>
+            <subforce flags="+navalFluff" name="Beta Naval Reserve"
+                      ifDateBetween=",3072">%STAR%
             </subforce>
-            <subforce chassis="Aegis Heavy Cruiser"
-                      fluffName="CSA Stellar Serpent">%ELEMENT%
+            <subforce flags="+navalFluff" name="Exodus Squadron">%STAR%</subforce>
+            <subforce flags="+navalFluff" name="Patrol Squadron">%STAR%</subforce>
+            <subforce flags="+navalFluff" name="Naval Transport Star"
+                      ifDateBetween=",3072">%STAR%
             </subforce>
-            <subforce chassis="McKenna Battleship"
-                      fluffName="CSA Sovereign Right">%ELEMENT%
-            </subforce>
-            <subforce chassis="Black Lion II Battlecruiser"
-                      fluffName="CSA Admiral William S. Preston"
-                      ifDateBetween=",3072">%ELEMENT%
-            </subforce>
-            <subforce chassis="Liberator Cruiser" ifDateBetween="3059,3068"
-                      fluffName="CSA Constantineau">%ELEMENT%
-            </subforce>
-            <subforce chassis="Aegis Heavy Cruiser"
-                      fluffName="CSA Ares&apos;s Might">%ELEMENT%
+            <subforce unitType="Jumpship" num="2">%STAR%</subforce>
+        </subforces>
+    </force>
+
+    <!-- Per-ship dates from Clan Star Adder Naval Forces (Sarna). Largest hull commands each star
+         (tonnage sort). -->
+    <force echelon="%STAR%" eschName="Naval Star" ifUnitType="Warship" ifFlags="navalFluff">
+        <co>%STAR_CMDR%</co>
+
+        <!-- Command Keshik: the battleship flagships plus the Command and Quasar Keshik cruisers. -->
+        <subforces ifName="Command Keshik">
+            <subforce fluffName="CSA Sovereign Right" role="command"
+                      chassis="McKenna Battleship">%ELEMENT%
             </subforce>
             <subforce fluffName="CSA Absolute Truth" ifDateBetween="2932,"
                       chassis="Nightlord Battleship">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSA Exodus Ranger"
-                      ifDateBetween="2950,3075"
-                      chassis="York Destroyer-Carrier">%ELEMENT%
+            <subforce fluffName="CSA Nygaard" ifDateBetween=",3075"
+                      chassis="Sovetskii Soyuz Heavy Cruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSA Hagar"
-                      chassis="Lola III Destroyer">%ELEMENT%
+            <subforce fluffName="CSA Stellar Serpent"
+                      chassis="Aegis Heavy Cruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSA Vritra" ifDateBetween=",3067"
-                      chassis="Vincent Corvette">%ELEMENT%
+            <subforce fluffName="CSA Ares&apos;s Might"
+                      chassis="Aegis Heavy Cruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSA Centaur"
-                      chassis="Vincent Corvette">%ELEMENT%
+        </subforces>
+
+        <!-- Alpha Naval Reserve: battlecruiser, cruisers, and heavy destroyers. -->
+        <subforces ifName="Alpha Naval Reserve">
+            <subforce fluffName="CSA Admiral William S. Preston" role="command" ifDateBetween=",3072"
+                      chassis="Black Lion II Battlecruiser">%ELEMENT%
             </subforce>
             <subforce fluffName="CSA Divine Conquest" ifDateBetween=",3075"
                       chassis="Sovetskii Soyuz Heavy Cruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSA Star Fire" ifDateBetween="2950,3060"
-                      chassis="York Destroyer-Carrier">%ELEMENT%
+            <subforce fluffName="CSA Constantineau" ifDateBetween="3059,3068"
+                      chassis="Liberator Cruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSA Eagle" ifDateBetween=",3072"
-                      chassis="Essex II Destroyer">%ELEMENT%
+            <subforce fluffName="CSA Hagar"
+                      chassis="Lola III Destroyer">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSA Vicious Fang" ifDateBetween="2962,"
-                      chassis="Fredasa (Corvette-Raider)">%ELEMENT%
+            <subforce fluffName="CSA Warlock"
+                      chassis="Lola III Destroyer">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSA Black Adder" ifDateBetween="2962,3072"
-                      chassis="Carrack Transport">%ELEMENT%
+        </subforces>
+
+        <!-- Beta Naval Reserve: destroyers (all lost by 3072; attach gated ,3072). -->
+        <subforces ifName="Beta Naval Reserve">
+            <subforce fluffName="CSA Eagle" role="command" ifDateBetween=",3072"
+                      chassis="Essex II Destroyer">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSA Exodus Sentinel" ifDateBetween="2950,"
-                      chassis="York Destroyer-Carrier">%ELEMENT%
+            <subforce fluffName="CSA Tehuantepec" ifDateBetween=",3072"
+                      chassis="Essex II Destroyer">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSA Warlock"
+            <subforce fluffName="CSA Yodan" ifDateBetween=",3072"
                       chassis="Lola III Destroyer">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSA Yodan" ifDateBetween=",3072"
+            <subforce fluffName="CSA Cameron&apos; Flame" ifDateBetween=",3072"
                       chassis="Lola III Destroyer">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSA Tehuantepec" ifDateBetween=",3072"
-                      chassis="Essex II Destroyer">%ELEMENT%
+            <subforce fluffName="CSA Star Fire" ifDateBetween="2950,3060"
+                      chassis="York Destroyer-Carrier">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSA Arcadian Asp" ifDateBetween="2962,"
-                      chassis="Fredasa (Corvette-Raider)">%ELEMENT%
+        </subforces>
+
+        <!-- Exodus Squadron: the York destroyer-carriers. -->
+        <subforces ifName="Exodus Squadron">
+            <subforce fluffName="CSA Exodus Ranger" role="command" ifDateBetween="2950,3075"
+                      chassis="York Destroyer-Carrier">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CSA Exodus Sentinel" ifDateBetween="2950,"
+                      chassis="York Destroyer-Carrier">%ELEMENT%
             </subforce>
             <subforce fluffName="CSA Exodus Crusader" ifDateBetween="2950,"
                       chassis="York Destroyer-Carrier">%ELEMENT%
@@ -238,21 +263,40 @@
             <subforce fluffName="CSA Exodus Avenger" ifDateBetween="2950,"
                       chassis="York Destroyer-Carrier">%ELEMENT%
             </subforce>
+        </subforces>
+
+        <!-- Patrol Squadron: Fredasa raiders and Vincent corvettes (Arcadia/Albion patrols). -->
+        <subforces ifName="Patrol Squadron">
+            <subforce fluffName="CSA Vicious Fang" role="command" ifDateBetween="2962,"
+                      chassis="Fredasa (Corvette-Raider)">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CSA Arcadian Asp" ifDateBetween="2962,"
+                      chassis="Fredasa (Corvette-Raider)">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CSA Centaur"
+                      chassis="Vincent Corvette">%ELEMENT%
+            </subforce>
             <subforce fluffName="CSA Pegasus" ifDateBetween=",3088"
                       chassis="Vincent Corvette">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSA Cho Polu" ifDateBetween=",3068"
-                      chassis="Volga Transport">%ELEMENT%
+            <subforce fluffName="CSA Vritra" ifDateBetween=",3067"
+                      chassis="Vincent Corvette">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSA Pompeii" ifDateBetween=",3072"
-                      chassis="Volga Transport">%ELEMENT%
+        </subforces>
+
+        <!-- Naval Transport Star: troop cruisers and transports (gone by 3072; attach gated ,3072). -->
+        <subforces ifName="Naval Transport Star">
+            <subforce fluffName="CSA Black Adder" role="command" ifDateBetween="2962,3072"
+                      chassis="Carrack Transport">%ELEMENT%
             </subforce>
             <subforce fluffName="CSA Renown" ifDateBetween=",3062"
                       chassis="Potemkin Troop Cruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSA Cameron&apos; Flame"
-                      ifDateBetween=",3072"
-                      chassis="Lola III Destroyer">%ELEMENT%
+            <subforce fluffName="CSA Cho Polu" ifDateBetween=",3068"
+                      chassis="Volga Transport">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CSA Pompeii" ifDateBetween=",3072"
+                      chassis="Volga Transport">%ELEMENT%
             </subforce>
         </subforces>
     </force>
@@ -368,17 +412,34 @@
         <name ifRating="Sol">Gatekeeper Cluster</name>
         <co>%STAR_COL%</co>
 
+        <!-- Per-cluster-type weight targets (budget allocator). Clan Star Adder (Clan Star Adder
+             Touman, Sarna) is a Crusader shock-assault Clan: it favors heavy and assault OmniMeks
+             "configured to inflict maximum damage" and gives little thought to aero or Elementals.
+             One of the heaviest Clan profiles - strong assault core across the Adder cluster types
+             (assault/guards roll heavy, cavalry medium, hussar light). -->
+        <weightTarget ifWeightClass="A" unitType="Mek" spread="8">A:42,H:40,M:16,L:2</weightTarget>
+        <weightTarget ifWeightClass="H" unitType="Mek" spread="8">A:24,H:48,M:24,L:4</weightTarget>
+        <weightTarget ifWeightClass="M" unitType="Mek" spread="8">A:8,H:34,M:46,L:12</weightTarget>
+        <weightTarget ifWeightClass="L" unitType="Mek" spread="8">A:2,H:18,M:44,L:36</weightTarget>
+        <!-- Aero and Elementals are minimized (sparse), not optimized - medium/older weight. -->
+        <weightTarget unitType="AeroSpaceFighter" spread="8">A:0,H:30,M:45,L:25</weightTarget>
+        <weightTarget unitType="Tank" spread="8">A:0,H:18,M:42,L:40</weightTarget>
+
         <!--Distribution is taken from FM:U, after recovery from
         Burrock absorption. -->
 
         <flags ifRating="FL" ifFlags="!assault|cavalry|cavalier|dragoon|guards|hussar">
-            <option weight="5" weightClass="H"
+            <!-- Assault and Guards clusters are the Adder shock core - route them to ASSAULT weight
+                 (was H) so they use the A weightTarget and field genuine assault Meks. Star Adder
+                 favors assault "configured to inflict maximum damage"; H-weight assault clusters
+                 only delivered ~A8 (assault spilled into heavy). -->
+            <option weight="5" weightClass="A"
                     ifTopLevel="1">assault
             </option>
             <option weight="5" weightClass="M">cavalry</option>
             <option weight="4" role="cavalry">cavalier</option>
             <option weight="4">dragoon</option>
-            <option weight="3" weightClass="H">guards</option>
+            <option weight="3" weightClass="A">guards</option>
             <option weight="1" weightClass="L"
                     role="cavalry">hussar
             </option>
@@ -389,6 +450,7 @@
 
         <ruleGroup>
             <weightClass>
+                <option weight="1">A</option>
                 <option weight="3">H</option>
                 <option weight="2" ifRole="!command">M</option>
                 <option weight="1" ifRole="!command"
diff --git a/data/forcegenerator/faction_rules/CSJ.xml b/data/forcegenerator/faction_rules/CSJ.xml
index ef3246237..5659000b1 100644
--- a/data/forcegenerator/faction_rules/CSJ.xml
+++ b/data/forcegenerator/faction_rules/CSJ.xml
@@ -37,7 +37,7 @@
 
         <echelon>
             <option ifUnitType="">%TOUMAN%,%GALAXY%,%CLUSTER%</option>
-            <option ifUnitType="Warship">%CLUSTER%</option>
+            <option ifUnitType="Warship">%CLUSTER%,%STAR%</option>
             <option ifUnitType="Dropship|Jumpship">%STAR%</option>
             <option ifUnitType="Mek" ifDateBetween="2870,">%TRINARY%^,%TRINARY%,%BINARY%^,%BINARY%,%STAR%^,%STAR%</option>
             <option>%TRINARY%,%BINARY%,%STAR%</option>
@@ -94,65 +94,75 @@
         </attachedForces>
     </force>
 
+    <!-- Smoke Jaguar maintained a strong fleet (Clan Smoke Jaguar Naval Forces, Sarna) as the
+         spearhead of Operation Revival, organized around galaxy assignments. The Clan was annihilated
+         in 3060 (Operation BULLDOG/SERPENT, fall of Huntress), so most hulls are date-gated ,3059.
+         Command Keshik holds the flagships - the Black Lion Streaking Mist and the Golden Century
+         McKenna Obsidian (lost in the 2868 Mongoose Absorption) - and the rest follow their Beta,
+         Delta, and Epsilon galaxy assignments plus a carrier squadron. JumpShips pad the formation
+         so a date-thinned star never collapses into a stray hull. -->
     <force echelon="%CLUSTER%" eschName="Fleet" ifUnitType="Warship">
         <name>Naval Reserve</name>
         <co>%GALAXY_CMDR%</co>
 
         <subforces>
-            <subforce role="command" fluffName="CSJ Obsidian"
-                      ifDateBetween=",2868"
-                      chassis="McKenna Battleship">%ELEMENT%
+            <subforce flags="+navalFluff" name="Command Keshik">%STAR%</subforce>
+            <subforce flags="+navalFluff" name="Beta Naval Star">%STAR%</subforce>
+            <subforce flags="+navalFluff" name="Delta Naval Star">%STAR%</subforce>
+            <subforce flags="+navalFluff" name="Epsilon Naval Star">%STAR%</subforce>
+            <subforce flags="+navalFluff" name="Carrier Squadron">%STAR%</subforce>
+            <subforce unitType="Jumpship" num="2">%STAR%</subforce>
+        </subforces>
+    </force>
+
+    <!-- Per-ship dates from Clan Smoke Jaguar Naval Forces (Sarna). Largest hull commands each star
+         (tonnage sort). Most hulls end ,3059 (annihilation 3060). -->
+    <force echelon="%STAR%" eschName="Naval Star" ifUnitType="Warship" ifFlags="navalFluff">
+        <co>%STAR_CMDR%</co>
+
+        <!-- Command Keshik: the flagships. Obsidian (McKenna) is the Golden Century flagship lost in
+             the Mongoose Absorption (2868); Streaking Mist (Black Lion) is the Invasion-era command. -->
+        <subforces ifName="Command Keshik">
+            <subforce fluffName="CSJ Streaking Mist" role="command"
+                      chassis="Black Lion II Battlecruiser">%ELEMENT%
             </subforce>
-            <subforce
-                    chassis="Sovetskii Soyuz Heavy Cruiser">%ELEMENT%
+            <subforce fluffName="CSJ Obsidian" ifDateBetween=",2868"
+                      chassis="McKenna Battleship">%ELEMENT%
             </subforce>
-            <subforce chassis="Vincent Corvette">%ELEMENT%</subforce>
-            <subforce chassis="Vincent Corvette">%ELEMENT%</subforce>
-            <subforce fluffName="CSJ Queen Lynx" ifDateBetween="2950,3059"
-                      chassis="York Destroyer-Carrier">%ELEMENT%
+            <subforce chassis="Sovetskii Soyuz Heavy Cruiser">%ELEMENT%</subforce>
+            <subforce fluffName="CSJ Sabre Cat"
+                      chassis="Essex II Destroyer">%ELEMENT%
             </subforce>
             <subforce chassis="Congress Frigate">%ELEMENT%</subforce>
-            <subforce ifDateBetween="2965,"
-                      chassis="Fredasa (Corvette-Raider)">%ELEMENT%
-            </subforce>
-            <subforce ifDateBetween="2965,"
-                      chassis="Fredasa (Corvette-Raider)">%ELEMENT%
-            </subforce>
+        </subforces>
 
-            <subforce fluffName="CSJ Veiled Huntress" ifDateBetween=",3059"
+        <!-- Beta Galaxy: the Texas flagship Veiled Huntress and her escorts. -->
+        <subforces ifName="Beta Naval Star">
+            <subforce fluffName="CSJ Veiled Huntress" role="command" ifDateBetween=",3059"
                       chassis="Texas Battleship">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSJ Sabre Cat"
-                      chassis="Essex II Destroyer">%ELEMENT%
-            </subforce>
-            <subforce fluffName="CSJ Korat"
-                      ifDateBetween=",3024"
-                      chassis="Avatar Heavy Cruiser">%ELEMENT%
-            </subforce>
-            <subforce fluffName="CSJ Korat"
-                      ifDateBetween="3025,"
-                      chassis="Liberator Cruiser">%ELEMENT%
-            </subforce>
-            <subforce fluffName="CSJ Griffin" ifDateBetween=",3059"
-                      chassis="Lola III Destroyer">%ELEMENT%
-            </subforce>
-            <subforce fluffName="CSJ Snow Leopard" ifDateBetween=",3059"
+            <subforce fluffName="CSJ Firecrest" ifDateBetween=",3059"
                       chassis="Congress Frigate">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSJ Storm Cat" ifDateBetween=",3059"
-                      chassis="Lola III Destroyer">%ELEMENT%
+            <subforce fluffName="CSJ The Iowa" ifDateBetween=",3059"
+                      chassis="Essex II Destroyer">%ELEMENT%
             </subforce>
             <subforce fluffName="CSJ Dark Claw" ifDateBetween=",3058"
                       chassis="Essex II Destroyer">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSJ Streaking Mist"
-                      chassis="Black Lion II Battlecruiser">%ELEMENT%
+            <subforce chassis="Whirlwind Destroyer">%ELEMENT%</subforce>
+        </subforces>
+
+        <!-- Delta Galaxy: the Korat (Avatar, then Liberator from 3025) and her corvette wing. -->
+        <subforces ifName="Delta Naval Star">
+            <subforce fluffName="CSJ Korat" role="command" ifDateBetween=",3024"
+                      chassis="Avatar Heavy Cruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSJ Firecrest" ifDateBetween=",3059"
-                      chassis="Congress Frigate">%ELEMENT%
+            <subforce fluffName="CSJ Korat" role="command" ifDateBetween="3025,"
+                      chassis="Liberator Cruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSJ The Iowa" ifDateBetween=",3059"
-                      chassis="Essex II Destroyer">%ELEMENT%
+            <subforce fluffName="CSJ Griffin" ifDateBetween=",3059"
+                      chassis="Lola III Destroyer">%ELEMENT%
             </subforce>
             <subforce fluffName="CSJ Ripper" ifDateBetween=",3059"
                       chassis="Vincent Corvette">%ELEMENT%
@@ -163,20 +173,43 @@
             <subforce fluffName="CSJ Simas Osis"
                       chassis="Vincent Corvette">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSJ Osis&apos; Pride"
-                      chassis="Potemkin Troop Cruiser">%ELEMENT%
+        </subforces>
+
+        <!-- Epsilon Galaxy: Snow Leopard (scuttled 3059), Storm Cat, and lighter escorts. -->
+        <subforces ifName="Epsilon Naval Star">
+            <subforce fluffName="CSJ Snow Leopard" role="command" ifDateBetween=",3059"
+                      chassis="Congress Frigate">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CSJ Storm Cat" ifDateBetween=",3059"
+                      chassis="Lola III Destroyer">%ELEMENT%
+            </subforce>
+            <subforce chassis="Vincent Corvette">%ELEMENT%</subforce>
+            <subforce chassis="Vincent Corvette">%ELEMENT%</subforce>
+            <subforce ifDateBetween="2965,"
+                      chassis="Fredasa (Corvette-Raider)">%ELEMENT%
+            </subforce>
+        </subforces>
+
+        <!-- Carrier Squadron: the York destroyer-carriers, troop cruiser, and raiders. -->
+        <subforces ifName="Carrier Squadron">
+            <subforce fluffName="CSJ Queen Lynx" role="command" ifDateBetween="2950,3059"
+                      chassis="York Destroyer-Carrier">%ELEMENT%
             </subforce>
             <subforce fluffName="CSJ Lioness" ifDateBetween=",3059"
                       chassis="York Destroyer-Carrier">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSJ Hunter&apos;s Pride"
-                      ifDateBetween="2950,3055"
+            <subforce fluffName="CSJ Osis&apos; Pride" ifDateBetween=",3060"
+                      chassis="Potemkin Troop Cruiser">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CSJ Hunter&apos;s Pride" ifDateBetween="2950,3055"
                       chassis="Congress Frigate">%ELEMENT%
             </subforce>
+            <subforce ifDateBetween="2965,"
+                      chassis="Fredasa (Corvette-Raider)">%ELEMENT%
+            </subforce>
             <subforce fluffName="CSJ Hell Fury" ifDateBetween="2965,3053"
                       chassis="Fredasa (Corvette-Raider)">%ELEMENT%
             </subforce>
-            <subforce chassis="Whirlwind Destroyer">%ELEMENT%</subforce>
         </subforces>
     </force>
 
@@ -213,8 +246,21 @@
         <name ifRating="Sol">Solahma Cluster</name>
         <co>%STAR_COL%</co>
 
+        <!-- Per-cluster-type weight targets (budget allocator). Clan Smoke Jaguar (Clan Smoke Jaguar
+             Touman, Sarna) is the most aggressive, brutal Crusader Clan - overwhelming firepower and
+             no-subtlety shock assault as the spearhead of Operation Revival (annihilated 3060). Heavy/
+             assault Mek mix with a real assault core; heavy Elemental use is structural (BA binary per
+             cluster). Picker rolls assault clusters (A1/H3/M2/L1). -->
+        <weightTarget ifWeightClass="A" unitType="Mek" spread="8">A:42,H:40,M:16,L:2</weightTarget>
+        <weightTarget ifWeightClass="H" unitType="Mek" spread="8">A:22,H:48,M:26,L:4</weightTarget>
+        <weightTarget ifWeightClass="M" unitType="Mek" spread="8">A:6,H:32,M:48,L:14</weightTarget>
+        <weightTarget ifWeightClass="L" unitType="Mek" spread="8">A:2,H:16,M:44,L:38</weightTarget>
+        <weightTarget unitType="AeroSpaceFighter" spread="8">A:0,H:35,M:44,L:21</weightTarget>
+        <weightTarget unitType="Tank" spread="8">A:0,H:18,M:42,L:40</weightTarget>
+
         <weightClass>
-            <option weight="2">H</option>
+            <option weight="1">A</option>
+            <option weight="3">H</option>
             <option weight="2">M</option>
             <option weight="1">L</option>
         </weightClass>
diff --git a/data/forcegenerator/faction_rules/CSR.xml b/data/forcegenerator/faction_rules/CSR.xml
index 990480e8a..a2808473d 100644
--- a/data/forcegenerator/faction_rules/CSR.xml
+++ b/data/forcegenerator/faction_rules/CSR.xml
@@ -906,10 +906,10 @@
             <subforce fluffName="CSR Wild Swan"
                       chassis="Potemkin Troop Cruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSR Lord Death"
+            <subforce fluffName="CSR Lord Death" ifDateBetween="3061,"
                       chassis="Aegis Heavy Cruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSR Blue Quest"
+            <subforce fluffName="CSR Blue Quest" ifDateBetween="3061,"
                       chassis="Aegis Heavy Cruiser">%ELEMENT%
             </subforce>
         </subforces>
@@ -924,7 +924,7 @@
             <subforce fluffName="CSR White Cloud" ifDateBetween=",3067"
                       chassis="Sovetskii Soyuz Heavy Cruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSR White Terror" ifDateBetween=",3069"
+            <subforce fluffName="CSR White Terror" ifDateBetween="3061,3069"
                       chassis="Aegis Heavy Cruiser">%ELEMENT%
             </subforce>
             <subforce fluffName="CSR Spur" ifDateBetween=",3069"
@@ -957,7 +957,7 @@
             <subforce fluffName="CSR Snowflake"
                       chassis="Potemkin Troop Cruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSR Black Justice"
+            <subforce fluffName="CSR Black Justice" ifDateBetween="3061,"
                       chassis="Aegis Heavy Cruiser">%ELEMENT%
             </subforce>
             <subforce fluffName="CSR Magpie"
@@ -972,10 +972,10 @@
             <subforce fluffName="CSR Avalanche" ifDateBetween=",3068"
                       chassis="Sovetskii Soyuz Heavy Cruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSR Morning Violence" ifDateBetween=",3068"
+            <subforce fluffName="CSR Morning Violence" ifDateBetween="3056,3068"
                       chassis="Aegis Heavy Cruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSR Scabbard"
+            <subforce fluffName="CSR Scabbard" ifDateBetween="3061,"
                       chassis="Aegis Heavy Cruiser">%ELEMENT%
             </subforce>
             <subforce fluffName="CSR Eden Rose"
@@ -1008,7 +1008,7 @@
             <subforce fluffName="CSR Ice Storm" role="command"
                       chassis="Cameron Battlecruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSR Blue Lancer"
+            <subforce fluffName="CSR Blue Lancer" ifDateBetween="3061,"
                       chassis="Aegis Heavy Cruiser">%ELEMENT%
             </subforce>
             <subforce fluffName="CSR Vision of Terra"
diff --git a/data/forcegenerator/faction_rules/CSV.xml b/data/forcegenerator/faction_rules/CSV.xml
index b20c0e33b..98f03cd4a 100644
--- a/data/forcegenerator/faction_rules/CSV.xml
+++ b/data/forcegenerator/faction_rules/CSV.xml
@@ -112,7 +112,7 @@
                 <option rating="Sol">%CLUSTER%</option>
             </subforceOption>
             <subforceOption>
-                <option role="training">%CLUSTER%</option>
+                <option role="training" rating="SL">%CLUSTER%</option>
                 <option role="training" unitType="Mek">%TRINARY%</option>
                 <option />
             </subforceOption>
@@ -148,13 +148,16 @@
             <subforce fluffName="CSV Coiled Serpent" ifDateBetween=",3070"
                       chassis="Vincent Corvette">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSV Constrictor"
+            <subforce fluffName="CSV Pit Viper" ifDateBetween=",3065"
+                      chassis="Fredasa (Corvette-Raider)">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CSV Constrictor" ifDateBetween=",3071"
                       chassis="Whirlwind Destroyer">%ELEMENT%
             </subforce>
             <subforce fluffName="CSV Snake in the Grass" ifDateBetween=",3072"
                       chassis="Whirlwind Destroyer">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSV Martial Legacy"
+            <subforce fluffName="CSV Martial Legacy" ifDateBetween=",3072"
                       chassis="Essex II Destroyer">%ELEMENT%
             </subforce>
             <subforce fluffName="CSV Snake Pit"
@@ -166,22 +169,27 @@
             <subforce fluffName="CSV Steel Python" ifDateBetween=",3072"
                       chassis="Aegis Heavy Cruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSV Snake Leader"
+            <subforce fluffName="CSV Snake Leader" ifDateBetween="3058,"
+                      chassis="Congress Frigate">%ELEMENT%
+            </subforce>
+            <!-- Garlon: ex-Goliath Scorpion frigate, captured by Snow Raven, then taken
+            by Steel Viper during the Wars of Reaving; in the fleet at annihilation. -->
+            <subforce fluffName="CSV Garlon" ifDateBetween="3072,"
                       chassis="Congress Frigate">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSV Sanra Mercer"
+            <subforce fluffName="CSV Sanra Mercer" ifDateBetween=",3072"
                       chassis="Sovetskii Soyuz Heavy Cruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSV Zalman&apos;s Endeavor"
+            <subforce fluffName="CSV Zalman&apos;s Endeavor" ifDateBetween=",3069"
                       chassis="Cameron Battlecruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSV Ophidian" ifDateBetween=",3072"
+            <subforce fluffName="CSV Ophidian" ifDateBetween=",3073"
                       chassis="Potemkin Troop Cruiser">%ELEMENT%
             </subforce>
             <subforce fluffName="CSV Serpentes" ifDateBetween=",3072"
                       chassis="Potemkin Troop Cruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CSV Dark Asp" role="command" ifDateBetween="2932,"
+            <subforce fluffName="CSV Dark Asp" role="command" ifDateBetween="2932,3074"
                       chassis="Nightlord Battleship">%ELEMENT%
             </subforce>
             <subforce fluffName="CSV Perigard Zalman" ifDateBetween="3070,3074"
@@ -254,6 +262,16 @@
         <name ifRating="FL" ifWeightClass="L">Striker Cluster</name>
         <co>%STAR_COL%</co>
 
+        <!-- Steel Viper doctrine (FM:Crusader Clans): medium and heavy 'Meks are
+        co-primary; light and assault are restricted to specialist units. Assault is
+        held to specialist levels even in the heavy "Assault Cluster" (target ~12%,
+        blending to ~6% of the touman). Heavy is pre-compensated down for the ~3-5pp
+        set-dedup offset. Aero (canonically weak) and vehicles (marginal second-line)
+        are left to structure - measure before adding targets. -->
+        <weightTarget ifWeightClass="H|A" unitType="Mek" spread="8">A:12,H:48,M:34,L:6</weightTarget>
+        <weightTarget ifWeightClass="M" unitType="Mek" spread="8">A:4,H:34,M:48,L:14</weightTarget>
+        <weightTarget ifWeightClass="L" unitType="Mek" spread="8">A:0,H:18,M:44,L:38</weightTarget>
+
         <!-- using SL flags will give Solahma units variable amounts of Meks and conventional
         infantry. -->
 
diff --git a/data/forcegenerator/faction_rules/CW.xml b/data/forcegenerator/faction_rules/CW.xml
index 9045e387c..969946df7 100644
--- a/data/forcegenerator/faction_rules/CW.xml
+++ b/data/forcegenerator/faction_rules/CW.xml
@@ -109,22 +109,42 @@
                       ifDateBetween=",3057"
                       chassis="McKenna Battleship">%ELEMENT%
             </subforce>
+            <!-- McKenna's Pride: the SLDF Great Father's flagship (Aleksandr Kerensky's,
+            holds his remains), a pan-Clan relic until Vlad Ward secreted it away in 3077
+            after Op SPATHA II. Canonically hidden/uncrewed until recovered in 3147, but
+            it is Clan Wolf's owned asset from 3077, so the faction-leader ToE fields it
+            from then (heaviest hull = flagship). Continues into the Wolf Empire (CWE). -->
+            <!-- Pin the SLDF (2652) variant by full name: McKenna's Pride IS Aleksandr
+            Kerensky's original Star League battleship, not the Clan (2851) refit. Chassis-only
+            "McKenna Battleship" fails for a Clan faction post-Jihad (Clan 2851 extinct, IS 2652
+            not Clan-legal) -> no unit, no sprite. Full-name reference resolves it directly. -->
+            <subforce role="command" fluffName="CWS McKenna&apos;s Pride"
+                      ifDateBetween="3077,"
+                      chassis="McKenna Battleship (2652)">%ELEMENT%
+            </subforce>
             <subforce fluffName="CWS Mother Jocasta"
                       ifDateBetween=",3057"
                       chassis="Cameron Battlecruiser">%ELEMENT%
             </subforce>
             <subforce fluffName="CWS Nicholas Kerensky"
-                      ifDateBetween=",3073"
+                      ifDateBetween=",3074"
                       chassis="Texas Battleship">%ELEMENT%
             </subforce>
             <subforce fluffName="CWS Bloody Fang"
                       chassis="Cameron Battlecruiser">%ELEMENT%
             </subforce>
+            <!-- Arctic Wolf served with Beta Galaxy in 3052; lost or renamed by the
+            Refusal War (not in the 3057 roster). -->
+            <subforce fluffName="CWS Arctic Wolf"
+                      ifDateBetween=",3057"
+                      chassis="Black Lion II Battlecruiser">%ELEMENT%
+            </subforce>
             <subforce fluffName="CWS Stealthy Kill"
-                      ifDateBetween=",3073"
+                      ifDateBetween=",3078"
                       chassis="Black Lion II Battlecruiser">%ELEMENT%
             </subforce>
             <subforce fluffName="CWS Blood Drinker"
+                      ifDateBetween=",3078"
                       chassis="Black Lion II Battlecruiser">%ELEMENT%
             </subforce>
             <subforce fluffName="CWS Implacable"
@@ -155,7 +175,7 @@
                       chassis="Lola III Destroyer">%ELEMENT%
             </subforce>
             <subforce fluffName="CWS Relentless Pursuit"
-                      ifDateBetween=",3070"
+                      ifDateBetween=",3073"
                       chassis="Vincent Corvette">%ELEMENT%
             </subforce>
             <subforce fluffName="CWS Trailblazer"
@@ -175,11 +195,11 @@
                       chassis="Potemkin Troop Cruiser">%ELEMENT%
             </subforce>
             <subforce fluffName="CWS Provider"
-                      ifDateBetween=",3070"
+                      ifDateBetween=",3073"
                       chassis="Volga Transport">%ELEMENT%
             </subforce>
             <subforce fluffName="CWS Night Warrior"
-                      ifDateBetween="2950,"
+                      ifDateBetween="2950,3078"
                       chassis="Carrack Transport">%ELEMENT%
             </subforce>
         </subforces>
diff --git a/data/forcegenerator/faction_rules/CWE.xml b/data/forcegenerator/faction_rules/CWE.xml
new file mode 100644
index 000000000..3e9dd472d
--- /dev/null
+++ b/data/forcegenerator/faction_rules/CWE.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+# MegaMek Data (C) 2026 by The MegaMek Team is licensed under CC BY-NC-SA 4.0.
+# To view a copy of this license, visit https://creativecommons.org/licenses/by-nc-sa/4.0/
+#
+# NOTICE: The MegaMek organization is a non-profit group of volunteers
+# creating free software for the BattleTech community.
+#
+# MechWarrior, BattleMech, `Mech and AeroTech are registered trademarks
+# of The Topps Company, Inc. All Rights Reserved.
+#
+# Catalyst Game Labs and the Catalyst Game Labs logo are trademarks of
+# InMediaRes Productions, LLC.
+#
+# MechWarrior Copyright Microsoft Corporation. MegaMek Data was created under
+# Microsoft's "Game Content Usage Rules"
+# <https://www.xbox.com/en-US/developers/rules> and it is not endorsed by or
+# affiliated with Microsoft.
+-->
+<!--
+    The Wolf Empire is Clan Wolf's Inner Sphere nation (declared 1 Jan 3142, faction
+    active 3143+). Alaric Ward conquered 60+ worlds from the Free Worlds League and
+    Lyran Commonwealth, capital Gienah, and by 3151 won the ilClan Trial and took Terra
+    (115 systems), founding the Reborn Star League. This ruleset inherits the mature
+    Clan Wolf (CW) file via parent="CW": clusters, trinaries, stars, weight composition,
+    and the Naval Reserve all come from CW. CWE overrides only the touman, replacing CW's
+    Invasion/Jihad galaxy roster with the Dark Age roster.
+
+    Naval: inherited from CW. At 3143+ every Refusal-War/Jihad loss is already date-gated
+    out, leaving the Dark Age survivors (Dire Wolf, Bloody Fang, Rogue, Jerome Winson,
+    Victoria Ward) plus McKenna's Pride (gated 3077, in CW). No CWE naval block needed.
+
+    Weight: inherited from CW (balanced-elite). Measure before adding any target; the
+    Wolf Empire trends as a strong, well-rounded power, not a one-note assault Clan.
+
+    Galaxy names (incl. nicknames and the non-greek Rufus/Lupus) are set literally in the
+    touman; the inherited CW galaxy node's {greek} template only fills in when no name is
+    set, so no override is needed. Remaining nicety (not done - high machinery, low value):
+    per-galaxy Keshik command-unit names (Golden Keshik, Silver Keshik, etc.).
+-->
+<ruleset faction="CWE" parent="CW" ratingSystem="CLAN"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="formationRulesetSchema.xsd">
+
+    <defaults>
+        <echelon>%CLUSTER%</echelon>
+        <rankSystem>%RANK_CLAN%</rankSystem>
+        <rating>FL</rating>
+    </defaults>
+
+    <toc>
+        <unitType>
+            <option>null,Mek,Tank,VTOL,Infantry,BattleArmor,AeroSpaceFighter,Conventional Fighter,Warship,Dropship,Jumpship</option>
+        </unitType>
+
+        <echelon>
+            <option ifUnitType="">%TOUMAN%,%GALAXY%,%CLUSTER%</option>
+            <option ifUnitType="Warship">%CLUSTER%</option>
+            <option ifUnitType="Jumpship|Dropship">%STAR%</option>
+            <option ifUnitType="Mek">%TRINARY%^,%TRINARY%,%BINARY%^,%BINARY%,%STAR%^,%STAR%</option>
+            <option>%TRINARY%,%BINARY%,%STAR%</option>
+        </echelon>
+
+        <rating>
+            <option ifUnitType="Tank|VTOL">SL:Second Line,PG:Garrison,Sol:Solahma</option>
+            <option ifUnitType="Infantry">PG:Garrison,Sol:Solahma</option>
+            <option ifEschelon="%TOUMAN%"></option>
+            <option ifEschelon="%GALAXY%">FL:Front Line,SL:Second Line,Sol:Solahma</option>
+            <option>Keshik,FL:Front Line,SL:Second Line,PG:Garrison,Sol:Solahma</option>
+        </rating>
+    </toc>
+
+    <!-- Dark Age touman roster (Clan Wolf Touman, 3145 table). Front-line: Alpha (Wolf
+    Spirits, command), Beta (Shadow Wolves), Gamma (Wolf Hussars), Delta (Snarling Wolves).
+    Second-line/garrison: Epsilon (Gray Wolves), Zeta, Kappa (Werewolves, formed 3063),
+    Lambda, Mu, Sigma, Tau. Lupus (front-line) and Rufus (garrison) form 3151 on Gienah
+    after the Terra conquest. Theta/Iota/Upsilon were destroyed in the ilClan Trial and are
+    excluded. The galaxy name is set literally here (ForceNode applies the inherited node's
+    {greek} template only when no name is set), so nicknames and non-greek names render. -->
+
+    <force echelon="%TOUMAN%" eschName="Touman">
+        <co>%KHAN%</co>
+        <xo>%SAKHAN%</xo>
+
+        <subforces>
+            <subforce name="Alpha Galaxy (The Wolf Spirits)" rating="FL"
+                      role="command">%GALAXY%
+            </subforce>
+            <subforce name="Beta Galaxy (The Shadow Wolves)" rating="FL">%GALAXY%</subforce>
+            <subforce name="Gamma Galaxy (The Wolf Hussars)" rating="FL">%GALAXY%</subforce>
+            <subforce name="Delta Galaxy (The Snarling Wolves)" rating="FL">%GALAXY%</subforce>
+            <subforce name="Lupus Galaxy" rating="FL"
+                      ifDateBetween="3151,">%GALAXY%
+            </subforce>
+
+            <subforce name="Epsilon Galaxy (The Gray Wolves)" rating="SL">%GALAXY%</subforce>
+            <subforce name="Zeta Galaxy" rating="SL">%GALAXY%</subforce>
+            <subforce name="Kappa Galaxy (The Werewolves)" rating="SL">%GALAXY%</subforce>
+            <subforce name="Lambda Galaxy" rating="SL">%GALAXY%</subforce>
+            <subforce name="Mu Galaxy" rating="SL">%GALAXY%</subforce>
+            <subforce name="Sigma Galaxy" rating="SL">%GALAXY%</subforce>
+            <subforce name="Tau Galaxy" rating="SL">%GALAXY%</subforce>
+            <subforce name="Rufus Galaxy" rating="SL"
+                      ifDateBetween="3151,">%GALAXY%
+            </subforce>
+        </subforces>
+
+        <attachedForces>
+            <subforce unitType="Warship">%CLUSTER%</subforce>
+        </attachedForces>
+    </force>
+</ruleset>
diff --git a/data/forcegenerator/faction_rules/CWI.xml b/data/forcegenerator/faction_rules/CWI.xml
new file mode 100644
index 000000000..29f19acce
--- /dev/null
+++ b/data/forcegenerator/faction_rules/CWI.xml
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+# MegaMek Data (C) 2026 by The MegaMek Team is licensed under CC BY-NC-SA 4.0.
+# To view a copy of this license, visit https://creativecommons.org/licenses/by-nc-sa/4.0/
+#
+# NOTICE: The MegaMek organization is a non-profit group of volunteers
+# creating free software for the BattleTech community.
+#
+# MechWarrior, BattleMech, `Mech and AeroTech are registered trademarks
+# of The Topps Company, Inc. All Rights Reserved.
+#
+# Catalyst Game Labs and the Catalyst Game Labs logo are trademarks of
+# InMediaRes Productions, LLC.
+#
+# MechWarrior Copyright Microsoft Corporation. MegaMek Data was created under
+# Microsoft's "Game Content Usage Rules"
+# <https://www.xbox.com/en-US/developers/rules> and it is not endorsed by or
+# affiliated with Microsoft.
+-->
+<!--
+    Clan Widowmaker (2807-2834): an original Clan, aggressive and ruthless (Khan Jason
+    Karrige's nuclear false-flag against Clan Wolverine). Absorbed by Clan Wolf in 2834
+    after Khan Cal Jorgensson killed ilKhan Nicholas Kerensky. The whole era predates
+    OmniMechs (2854) and Elementals (2868), so this is a pure early-Clan force: SLDF-derived
+    BattleMechs, aerospace, vehicles, infantry. Structure inherits CLAN via parent="CLAN".
+
+    This file overrides the touman only to (a) shape the small 2-galaxy Widowmaker structure
+    and (b) attach the naval reserve, which the CLAN base does not do. No weight target: the
+    2807-2834 unit pool is naturally medium-light and a target cannot pull weights that do
+    not yet exist in the era.
+
+    Doctrine note (NOT yet modeled): Widowmaker fielded "oversized, combined-arms Stars with
+    integral aerospace" - front-line Stars of 5 Meks + 2 fighters, second-line of 4 Meks +
+    2 fighters + 2 vehicles. Named clusters: 3rd Battle, 4th Fang, 194th Crusader (Alpha),
+    1st Spinner (Beta), 5th Provisional Garrison. These are a possible later polish pass.
+
+    Naval (Clan Widowmaker Naval Forces): equipment passed to Clan Wolf at the 2834
+    absorption (later Wolf's Dragoons, Bristol Cache).
+-->
+<ruleset faction="CWI" parent="CLAN" ratingSystem="CLAN"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="formationRulesetSchema.xsd">
+
+    <defaults>
+        <echelon>%CLUSTER%</echelon>
+        <rankSystem>%RANK_CLAN%</rankSystem>
+        <rating>FL</rating>
+    </defaults>
+
+    <toc>
+        <unitType>
+            <option>null,Mek,Tank,VTOL,Infantry,AeroSpaceFighter,Conventional Fighter,Warship,Dropship,Jumpship</option>
+        </unitType>
+
+        <echelon>
+            <option ifUnitType="">%TOUMAN%,%GALAXY%,%CLUSTER%</option>
+            <option ifUnitType="Warship">%CLUSTER%</option>
+            <option ifUnitType="Jumpship|Dropship">%STAR%</option>
+            <option ifUnitType="Mek">%TRINARY%^,%TRINARY%,%BINARY%^,%BINARY%,%STAR%^,%STAR%</option>
+            <option>%TRINARY%,%BINARY%,%STAR%</option>
+        </echelon>
+
+        <rating>
+            <option ifUnitType="Tank|VTOL">SL:Second Line,PG:Garrison,Sol:Solahma</option>
+            <option ifUnitType="Infantry">PG:Garrison,Sol:Solahma</option>
+            <option ifEschelon="%TOUMAN%"></option>
+            <option ifEschelon="%GALAXY%">FL:Front Line,SL:Second Line</option>
+            <option>Keshik,FL:Front Line,SL:Second Line,PG:Garrison,Sol:Solahma</option>
+        </rating>
+    </toc>
+
+    <force echelon="%TOUMAN%" eschName="Touman">
+        <co>%KHAN%</co>
+        <xo>%SAKHAN%</xo>
+
+        <subforces>
+            <subforce name="Alpha Galaxy" rating="FL"
+                      role="command">%GALAXY%
+            </subforce>
+            <subforce name="Beta Galaxy" rating="SL">%GALAXY%</subforce>
+        </subforces>
+
+        <attachedForces>
+            <subforce unitType="Warship">%CLUSTER%</subforce>
+        </attachedForces>
+    </force>
+
+    <!-- Naval reserve. MUST come before the generic ground-cluster node below: the attached
+    Warship %CLUSTER% matches force nodes in document order, so this ifUnitType="Warship" node
+    has to precede the unguarded cluster node or the warships are mis-handled as a ground
+    cluster (symptom: a "Light Warship Cluster"). Black Venom was lost to point-blank JumpShip
+    K-F field attacks during Operation KLONDIKE (~2821). The remaining hulls passed to Clan Wolf
+    at the 2834 absorption. Athena (the heaviest hull) leads. -->
+
+    <force echelon="%CLUSTER%" eschName="Fleet" ifUnitType="Warship">
+        <name>Naval Reserve</name>
+        <co>%GALAXY_CMDR%</co>
+
+        <subforces>
+            <subforce role="command" fluffName="CWS Athena"
+                      chassis="Sovetskii Soyuz Heavy Cruiser">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CWS Alexander"
+                      chassis="Aegis Heavy Cruiser">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CWS Beowulf"
+                      chassis="Congress Frigate">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CWS Darius"
+                      chassis="Lola III Destroyer">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CWS Nelson"
+                      chassis="Lola III Destroyer">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CWS Mars"
+                      chassis="Vincent Corvette">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CWS Egg Sac"
+                      chassis="Potemkin Troop Cruiser">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CWS Black Venom" ifDateBetween=",2821"
+                      chassis="Lola III Destroyer">%ELEMENT%
+            </subforce>
+        </subforces>
+    </force>
+
+    <!-- Widowmaker cluster: command Mek trinary + 2-3 Mek trinaries. There is NO separate
+    aerospace or vehicle trinary - Widowmaker's distinctive "oversized, combined-arms Stars
+    with integral aerospace" put the fighters (and second-line vehicles) inside each Mek Star
+    (see the Star override below), so the cluster is Mek-only. No Battle Armor (pre-2868). -->
+
+    <force echelon="%CLUSTER%" eschName="Cluster">
+        <name ifRating="PG">Provisional Garrison Cluster</name>
+        <name ifRating="FL|Keshik" ifWeightClass="H|A">Crusader Cluster</name>
+        <name ifRating="FL|Keshik" ifWeightClass="M">Battle Cluster</name>
+        <name ifRating="FL|Keshik" ifWeightClass="L">Striker Cluster</name>
+        <name>Garrison Cluster</name>
+        <co>%STAR_COL%</co>
+
+        <!-- Widowmaker leans heavy: their RAT lets a player re-roll a Light weight-class
+        result, suppressing Light and shifting toward Heavy/Assault. Modeled as a Light-poor,
+        heavy-leaning Mek weightTarget. In the 2807-2834 pool assault hulls are scarce, so the
+        target pulls Heavy hard and the era caps how much true Assault lands. -->
+        <weightTarget ifWeightClass="H|A" unitType="Mek" spread="8">A:12,H:48,M:34,L:6</weightTarget>
+        <weightTarget ifWeightClass="M" unitType="Mek" spread="8">A:5,H:40,M:46,L:9</weightTarget>
+        <weightTarget ifWeightClass="L" unitType="Mek" spread="8">A:0,H:28,M:50,L:22</weightTarget>
+
+        <weightClass>
+            <option weight="3">H</option>
+            <option weight="2">M</option>
+            <option weight="1">L</option>
+        </weightClass>
+
+        <subforces>
+            <subforce unitType="Mek" role="command" flags="+testTrinary">%TRINARY%</subforce>
+            <subforce unitType="Mek" num="2" flags="+testTrinary">%TRINARY%</subforce>
+            <subforceOption>
+                <option unitType="Mek" flags="+testTrinary">%TRINARY%</option>
+                <option />
+            </subforceOption>
+        </subforces>
+    </force>
+
+    <!-- The combined-arms Star: Widowmaker's signature. Front-line Stars field 5 Meks + 2
+    integral aerospace fighters; second-line Stars field 4 Meks + 2 fighters + 2 vehicles.
+    The Mek composition is branched by rating (5 vs 4); the aero group is added to every Star;
+    the vehicle group is added only to second-line Stars. Mirrors the keshik Star's two-group
+    Mek+aero pattern. Pre-Omni era, so only the un-augmented Mek Star is needed. -->
+
+    <force echelon="%STAR%" eschName="Star" ifAugmented="0" ifUnitType="Mek">
+        <name>{phonetic} {name:parent} Star</name>
+        <co>%STAR_CMDR%</co>
+
+        <weightClass>
+            <option weight="1">A</option>
+            <option weight="3">H</option>
+            <option weight="2">M</option>
+            <option weight="1">L</option>
+            <option ifRole="command" weight="1">A</option>
+            <option ifRole="command" weight="1">H</option>
+        </weightClass>
+
+        <ruleGroup>
+            <formation ifIndex="0">
+                <option weight="30" ifWeightClass="H|A">Battle</option>
+                <option weight="12" ifWeightClass="H|A">Heavy Battle</option>
+                <option weight="20" ifWeightClass="M">Medium Battle</option>
+                <option weight="20" ifWeightClass="L">Light Battle</option>
+                <option weight="12" ifWeightClass="H|A">Assault</option>
+                <option weight="8" ifWeightClass="L|M|H">Striker/Cavalry</option>
+                <option weight="4" ifWeightClass="H|A">Heavy Striker/Cavalry</option>
+                <option weight="4" ifWeightClass="L">Light Striker/Cavalry</option>
+                <option weight="1" ifWeightClass="L|M|H">Pursuit</option>
+                <option weight="1" role="+urban">Urban</option>
+            </formation>
+
+            <formation ifIndex="!0">
+                <option weight="20">Fire</option>
+                <option weight="3">Fire Support</option>
+                <option weight="2" ifWeightClass="H|A">Direct Fire</option>
+                <option weight="2" ifWeightClass="L|M">Light Fire</option>
+                <option weight="1" role="+anti_aircraft">Anti-Air</option>
+                <option weight="24" ifWeightClass="H|A">Battle</option>
+                <option weight="6" ifIndex="0,1">Battle</option>
+                <option weight="12" ifWeightClass="H|A">Heavy Battle</option>
+                <option weight="20" ifWeightClass="M">Medium Battle</option>
+                <option weight="20" ifWeightClass="L">Light Battle</option>
+                <option weight="6" ifWeightClass="H|A">Assault</option>
+                <option weight="4" ifWeightClass="L|M|H">Striker/Cavalry</option>
+                <option weight="4" ifWeightClass="H|A">Heavy Striker/Cavalry</option>
+                <option weight="2" ifWeightClass="L">Light Striker/Cavalry</option>
+                <option weight="1" ifWeightClass="L|M|H">Pursuit</option>
+                <option weight="1" ifWeightClass="L|M|H">Ranger</option>
+                <option weight="1" ifWeightClass="L|M|H">Probe</option>
+                <option weight="1" ifWeightClass="L|M|H">Sweep</option>
+                <option weight="1" role="+urban">Urban</option>
+                <option weight="24" ifWeightClass="L|M" role="+recon">Recon</option>
+                <option weight="8" ifWeightClass="H" role="+recon">Heavy Recon</option>
+                <option weight="6" ifWeightClass="L" role="+recon">Light Recon</option>
+            </formation>
+        </ruleGroup>
+
+        <!-- Front-line: 5 Meks. -->
+        <subforces generate="group" ifUnitType="Mek" ifRating="FL|Keshik">
+            <subforceOption ifWeightClass="A">
+                <option weightClass="A,A,A,A,H">%ELEMENT%</option>
+                <option weightClass="A,A,H,H,H" weight="2">%ELEMENT%</option>
+                <option weightClass="A,H,H,H,H" weight="2">%ELEMENT%</option>
+                <option weightClass="A,A,H,H,M">%ELEMENT%</option>
+            </subforceOption>
+            <subforceOption ifWeightClass="H">
+                <option weightClass="H,H,H,M,M">%ELEMENT%</option>
+                <option weightClass="H,H,H,H,M" weight="2">%ELEMENT%</option>
+                <option weightClass="H,H,H,H,H" weight="2">%ELEMENT%</option>
+                <option weightClass="A,H,H,H,M">%ELEMENT%</option>
+            </subforceOption>
+            <subforceOption ifWeightClass="M">
+                <option weightClass="M,M,M,M,L">%ELEMENT%</option>
+                <option weightClass="M,M,M,M,M" weight="2">%ELEMENT%</option>
+                <option weightClass="H,M,M,M,M" weight="2">%ELEMENT%</option>
+                <option weightClass="H,H,M,M,M">%ELEMENT%</option>
+            </subforceOption>
+            <subforceOption ifWeightClass="L">
+                <option weightClass="L,L,L,L,L">%ELEMENT%</option>
+                <option weightClass="M,L,L,L,L" weight="2">%ELEMENT%</option>
+                <option weightClass="M,M,L,L,L" weight="2">%ELEMENT%</option>
+                <option weightClass="H,M,M,L,L">%ELEMENT%</option>
+            </subforceOption>
+        </subforces>
+
+        <!-- Second-line: 4 Meks (with 2 integral vehicles below). -->
+        <subforces generate="group" ifUnitType="Mek" ifRating="SL|PG|Sol">
+            <subforceOption ifWeightClass="A">
+                <option weightClass="A,A,A,H">%ELEMENT%</option>
+                <option weightClass="A,A,H,H" weight="2">%ELEMENT%</option>
+                <option weightClass="A,H,H,H" weight="2">%ELEMENT%</option>
+                <option weightClass="A,A,H,M">%ELEMENT%</option>
+            </subforceOption>
+            <subforceOption ifWeightClass="H">
+                <option weightClass="H,H,M,M">%ELEMENT%</option>
+                <option weightClass="H,H,H,M" weight="2">%ELEMENT%</option>
+                <option weightClass="H,H,H,H" weight="2">%ELEMENT%</option>
+                <option weightClass="A,H,H,M">%ELEMENT%</option>
+            </subforceOption>
+            <subforceOption ifWeightClass="M">
+                <option weightClass="M,M,M,L">%ELEMENT%</option>
+                <option weightClass="M,M,M,M" weight="2">%ELEMENT%</option>
+                <option weightClass="H,M,M,M" weight="2">%ELEMENT%</option>
+                <option weightClass="H,H,M,M">%ELEMENT%</option>
+            </subforceOption>
+            <subforceOption ifWeightClass="L">
+                <option weightClass="L,L,L,L">%ELEMENT%</option>
+                <option weightClass="M,L,L,L" weight="2">%ELEMENT%</option>
+                <option weightClass="M,M,L,L" weight="2">%ELEMENT%</option>
+                <option weightClass="H,M,L,L">%ELEMENT%</option>
+            </subforceOption>
+        </subforces>
+
+        <!-- Integral aerospace: 2 fighters in every Widowmaker Star (capped at Heavy - no
+        assault aerospace exists). -->
+        <subforces generate="group">
+            <subforceOption ifWeightClass="A|H">
+                <option unitType="AeroSpaceFighter" weightClass="H,H" weight="3">%ELEMENT%</option>
+                <option unitType="AeroSpaceFighter" weightClass="M,M" weight="2">%ELEMENT%</option>
+                <option unitType="AeroSpaceFighter" weightClass="L,L" weight="1">%ELEMENT%</option>
+            </subforceOption>
+            <subforceOption ifWeightClass="M">
+                <option unitType="AeroSpaceFighter" weightClass="H,H" weight="2">%ELEMENT%</option>
+                <option unitType="AeroSpaceFighter" weightClass="M,M" weight="3">%ELEMENT%</option>
+                <option unitType="AeroSpaceFighter" weightClass="L,L" weight="2">%ELEMENT%</option>
+            </subforceOption>
+            <subforceOption ifWeightClass="L">
+                <option unitType="AeroSpaceFighter" weightClass="M,M" weight="2">%ELEMENT%</option>
+                <option unitType="AeroSpaceFighter" weightClass="L,L" weight="3">%ELEMENT%</option>
+            </subforceOption>
+        </subforces>
+
+        <!-- Integral vehicles: 2 combat vehicles in every second-line Star. -->
+        <subforces generate="group" ifRating="SL|PG|Sol">
+            <subforce unitType="Tank" num="2">%ELEMENT%</subforce>
+        </subforces>
+    </force>
+</ruleset>
diff --git a/data/forcegenerator/faction_rules/CWIE.xml b/data/forcegenerator/faction_rules/CWIE.xml
index f2cb3e557..f4cda7c2a 100644
--- a/data/forcegenerator/faction_rules/CWIE.xml
+++ b/data/forcegenerator/faction_rules/CWIE.xml
@@ -79,9 +79,13 @@
         <co>%GALAXY_CMDR%</co>
 
         <subforces>
+            <!-- Pin the Clan (2851) variant by full name - CWIE is a Clan faction and
+            chassis-only "McKenna Battleship" can fail to resolve (no sprite) as the Clan hull
+            nears extinction late in the gate. Werewolf is the Clan Wolf flagship that went to
+            the Exiles in 3057; destroyed 3077 above Chara III by Word of Blake drones. -->
             <subforce role="command" fluffName="CWS Werewolf"
                       ifDateBetween=",3077"
-                      chassis="McKenna Battleship">%ELEMENT%
+                      chassis="McKenna Battleship (2851)">%ELEMENT%
             </subforce>
             <subforce fluffName="CWS Ulric Kerensky"
                       ifDateBetween=",3074"
@@ -100,15 +104,27 @@
                       chassis="Vincent Corvette">%ELEMENT%
             </subforce>
             <subforce fluffName="CWS Killing Blow"
-                      ifDateBetween=",3072"
+                      ifDateBetween=",3075"
                       chassis="Vincent Corvette">%ELEMENT%
             </subforce>
-            <subforce fluffName="CWS Jade Wolf" ifDateBetween="3062,3072"
+            <!-- Jade Wolf (ex-CJF White Talon) and Black Paw (ex-CJF Black Talon): Aegis
+            cruisers captured from Clan Jade Falcon ca. 3064 above Butler. -->
+            <subforce fluffName="CWS Jade Wolf" ifDateBetween="3064,3072"
                       chassis="Aegis Heavy Cruiser">%ELEMENT%
             </subforce>
-            <subforce fluffName="CWS Black Paw" ifDateBetween="3062,3072"
+            <subforce fluffName="CWS Black Paw" ifDateBetween="3064,3075"
                       chassis="Aegis Heavy Cruiser">%ELEMENT%
             </subforce>
+            <!-- Winter Wolf (captured LAS Yggdrasil): Lyran Mjolnir, damaged then returned
+            to the Lyrans and lost in transit during the Jihad. Robert Kelswa: Fox corvette,
+            a 3060s acquisition. Both IS hulls pinned by full name so they resolve for a Clan
+            faction (no Clan-legal variant). -->
+            <subforce fluffName="CWS Winter Wolf" ifDateBetween="3064,3072"
+                      chassis="Mjolnir Battlecruiser">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CWS Robert Kelswa" ifDateBetween="3064,3078"
+                      chassis="Fox Corvette (3057)">%ELEMENT%
+            </subforce>
         </subforces>
     </force>
 
diff --git a/data/forcegenerator/faction_rules/FID.xml b/data/forcegenerator/faction_rules/FID.xml
new file mode 100644
index 000000000..436264fdb
--- /dev/null
+++ b/data/forcegenerator/faction_rules/FID.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+# MegaMek Data (C) 2025 by The MegaMek Team is licensed under CC BY-NC-SA 4.0.
+# To view a copy of this license, visit https://creativecommons.org/licenses/by-nc-sa/4.0/
+#
+# NOTICE: The MegaMek organization is a non-profit group of volunteers
+# creating free software for the BattleTech community.
+#
+# MechWarrior, BattleMech, `Mech and AeroTech are registered trademarks
+# of The Topps Company, Inc. All Rights Reserved.
+#
+# Catalyst Game Labs and the Catalyst Game Labs logo are trademarks of
+# InMediaRes Productions, LLC.
+#
+# MechWarrior Copyright Microsoft Corporation. MegaMek Data was created under
+# Microsoft's "Game Content Usage Rules"
+# <https://www.xbox.com/en-US/developers/rules> and it is not endorsed by or
+# affiliated with Microsoft.
+-->
+<ruleset faction="FID" ratingSystem="IS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="formationRulesetSchema.xsd">
+
+    <!--
+    The Fidelis ("the faithful") are secret survivors of Clan Smoke Jaguar, reorganized on Wayside V
+    by Star Colonel Paul Moon (the first Custos) after the 3060 annihilation. They equipped themselves
+    from Goliath Scorpion isorla captured from the 35th Scorpion Cuirassiers (Rik Myers among the
+    bondsmen). They field a single elite combined-arms Century - two Battle Groups of three Umbras
+    each - with no Elementals and no aerospace (canon), plus one WarShip, the Flatus (a Dante-class
+    frigate, ex-CSV Bordeaux).
+
+    EQUIPMENT SOURCING BY ERA (faction= delegation; units come from the delegated faction's RAT):
+      - Founding era (,3081): Goliath Scorpion isorla -> faction="CGS" (the "large majority" of their
+        gear; CGS is available 2807-3080). CSJ is lore only - no RAT availability after its 3060
+        annihilation, so it cannot be a generation source. Clan-isorla Umbras delegate a Clan %STAR%.
+      - Republic-service era (3135+): re-equipped by the Republic of the Sphere -> faction="ROS" at
+        rating "SB" (Stone's Brigade = A-rated, elite). ROS is IS-structured, so these Umbras delegate
+        IS echelons (%LANCE%/%COMPANY%).
+
+    The force is a %TOUMAN% (the whole single Century) so the WarShip attaches the proven way (cf. CB).
+    -->
+
+    <defaults>
+        <unitType>Mek</unitType>
+        <echelon>%TOUMAN%</echelon>
+        <rankSystem>%RANK_CUSTOM%</rankSystem>
+        <rating>A</rating>
+    </defaults>
+
+    <toc>
+        <unitType>
+            <option>null,Mek,Tank,VTOL,Infantry,BattleArmor,Warship,Dropship,Jumpship</option>
+        </unitType>
+
+        <echelon>
+            <option ifUnitType="">%TOUMAN%,%TRINARY%</option>
+            <option ifUnitType="Warship">%CLUSTER%,%STAR%</option>
+            <option ifUnitType="Dropship|Jumpship">%STAR%</option>
+            <option>%TRINARY%,%STAR%,%COMPANY%,%LANCE%</option>
+        </echelon>
+
+        <rating>
+            <option>A</option>
+        </rating>
+    </toc>
+
+    <!-- The Century: the Fidelis' whole force - two Battle Groups plus the Flatus. Modeled as a
+         %TOUMAN% so the WarShip detachment attaches the same way it does for full Clan toumans. -->
+    <force echelon="%TOUMAN%" eschName="Century">
+        <co>%GALAXY_CMDR%</co>
+
+        <subforces>
+            <subforce num="2">%TRINARY%</subforce>
+        </subforces>
+
+        <attachedForces>
+            <!-- The Flatus (Dante frigate, ex-CSV Bordeaux), lost 3149 at Dubhe to Clan Wolf. Only
+                 present in the Republic-service era. -->
+            <subforce unitType="Warship" ifDateBetween="3083,3149">%CLUSTER%</subforce>
+        </attachedForces>
+    </force>
+
+    <!-- Battle Group: three combined-arms Umbras with armor and infantry support. Equipment is
+         Goliath Scorpion isorla (,3081, as Clan stars) then Republic of the Sphere (3135+, as IS
+         lances/companies at Stone's Brigade rating). -->
+    <force echelon="%TRINARY%" eschName="Battle Group">
+        <name>{ordinal} Battle Group</name>
+        <co>%STAR_COL%</co>
+
+        <weightClass>
+            <option weight="2">H</option>
+            <option weight="3">M</option>
+            <option weight="1">L</option>
+        </weightClass>
+
+        <subforces>
+            <!-- Founding era: Goliath Scorpion isorla (Clan front-line Mek stars). -->
+            <subforce ifDateBetween=",3081" faction="CGS" rating="FL"
+                      unitType="Mek" num="3" eschName="Umbra">%STAR%
+            </subforce>
+            <!-- Republic-service era: Republic of the Sphere, Stone's Brigade (A) rating. -->
+            <subforce ifDateBetween="3135," faction="ROS" rating="SB"
+                      unitType="Mek" num="3" eschName="Umbra">%LANCE%
+            </subforce>
+        </subforces>
+
+        <attachedForces>
+            <!-- Armor Umbra: era-sourced. -->
+            <subforce ifDateBetween=",3081" faction="CGS" rating="SL"
+                      unitType="Tank" name="Armor Umbra">%STAR%
+            </subforce>
+            <subforce ifDateBetween="3135," faction="ROS" rating="SB"
+                      unitType="Tank" name="Armor Umbra">%LANCE%
+            </subforce>
+            <!-- Infantry Umbra: the Fidelis cross-train as infantry, which can be conventional or
+                 Battle Armor. Founding era draws Scorpion conventional infantry; the Republic era
+                 fields either Republic conventional infantry or Battle Armor. -->
+            <subforce ifDateBetween=",3081" faction="CGS" rating="Sol"
+                      unitType="Infantry" name="Infantry Umbra">%STAR%
+            </subforce>
+            <subforceOption ifDateBetween="3135,">
+                <option faction="ROS" rating="SB" unitType="Infantry"
+                        name="Infantry Umbra">%COMPANY%
+                </option>
+                <option faction="ROS" rating="SB" unitType="BattleArmor"
+                        name="Battle Armor Umbra">%COMPANY%
+                </option>
+            </subforceOption>
+        </attachedForces>
+    </force>
+
+    <!-- The Flatus: the Fidelis' sole WarShip, in Republic service. A Warship %CLUSTER% Fleet
+         attached from the %TOUMAN% Century - the exact pattern CSA/CSJ use (verified to load). -->
+    <force echelon="%CLUSTER%" eschName="Naval Detachment" ifUnitType="Warship">
+        <name>Naval Detachment</name>
+        <co>%GALAXY_CMDR%</co>
+
+        <subforces>
+            <subforce fluffName="Fidelis Flatus"
+                      chassis="Dante Frigate">%ELEMENT%
+            </subforce>
+        </subforces>
+    </force>
+
+</ruleset>
diff --git a/data/forcegenerator/faction_rules/RD.xml b/data/forcegenerator/faction_rules/RD.xml
index 175267348..0c1d87545 100644
--- a/data/forcegenerator/faction_rules/RD.xml
+++ b/data/forcegenerator/faction_rules/RD.xml
@@ -121,6 +121,7 @@ but have a smaller aerospace arm than most other Clans. -->
             </subforce>
 
             <subforce unitType="Warship" name="Dominion Fleet">%CLUSTER%</subforce>
+            <subforce unitType="Warship" name="Transport Flotilla">%CLUSTER%</subforce>
         </subforces>
     </force>
 
@@ -133,9 +134,6 @@ but have a smaller aerospace arm than most other Clans. -->
         <co>%GALAXY_CMDR%</co>
 
         <subforces>
-            <subforce fluffName="CGB Rasalhague" ifDateBetween="3069,"
-                      chassis="Leviathan II Battleship" unitType="Warship">%ELEMENT%
-            </subforce>
             <subforce num="2">%CLUSTER%</subforce>
         </subforces>
         <subforces ifDateBetween=",3078">
@@ -184,22 +182,46 @@ but have a smaller aerospace arm than most other Clans. -->
         </subforces>
     </force>
 
-    <force echelon="%GALAXY%" eschName="Fleet" ifUnitType="Warship">
-        <name>Naval Reserve</name>
-        <co>%GALAXY_CMDR%</co>
+    <!-- WarShip organization per Clan Ghost Bear / Rasalhague Dominion Naval Forces (Sarna).
+         Galaxy flagships attach as Naval Stars from the galaxy node (ifName below): Alpha fields the
+         Cameron Dieron's Run, Beta the Black Lion Bear's Den (both lost at Alshain 3067). The Touman
+         fields the Dominion Fleet (the Nightlord Ursa Major and the destroyer screen, later the
+         Leviathan III Alshain) and a Transport Flotilla. Largest hull commands each formation.
+         Late-era survivors per canon: Rasalhague (Valkyrie Galaxy), Den Mother + Yggdrasil at 3145,
+         plus Alshain (joint Snow Raven build) by 3150; Ursa Major lost 3100 at Rasalhague. -->
+    <force echelon="%CLUSTER%" eschName="Naval Star" ifUnitType="Warship">
+        <name>Naval Star</name>
+        <co>%STAR_CMDR%</co>
 
-        <subforces>
+        <subforces ifName="Alpha Naval Star">
             <subforce fluffName="CGB Dieron&apos;s Run" ifDateBetween=",3067"
                       chassis="Cameron Battlecruiser">%ELEMENT%
             </subforce>
+            <subforceOption>
+                <option num="4" unitType="Jumpship">%ELEMENT%</option>
+                <option num="5" unitType="Jumpship">%ELEMENT%</option>
+            </subforceOption>
+        </subforces>
+
+        <subforces ifName="Beta Naval Star">
+            <subforce fluffName="CGB Bear&apos;s Den" ifDateBetween=",3066"
+                      chassis="Black Lion II Battlecruiser">%ELEMENT%
+            </subforce>
+            <subforceOption>
+                <option num="4" unitType="Jumpship">%ELEMENT%</option>
+                <option num="5" unitType="Jumpship">%ELEMENT%</option>
+            </subforceOption>
+        </subforces>
+
+        <subforces ifName="Dominion Fleet">
             <subforce fluffName="CGB Ursa Major" ifDateBetween="2932,3100"
                       chassis="Nightlord Battleship">%ELEMENT%
             </subforce>
-            <subforce fluffName="CGB Bear&apos;s Den" ifDateBetween=",3066"
-                      chassis="Black Lion II Battlecruiser">%ELEMENT%
+            <subforce fluffName="CGB Rasalhague" ifDateBetween="3069,"
+                      chassis="Leviathan II Battleship">%ELEMENT%
             </subforce>
-            <subforce fluffName="CGB Shining Claw" ifDateBetween=",3059"
-                      chassis="Congress Frigate">%ELEMENT%
+            <subforce fluffName="CGB Alshain" ifDateBetween="3150,"
+                      chassis="Leviathan III Battleship">%ELEMENT%
             </subforce>
             <subforce fluffName="CGB Ursa Minor" ifDateBetween=",2946"
                       chassis="Riga Frigate">%ELEMENT%
@@ -213,12 +235,6 @@ but have a smaller aerospace arm than most other Clans. -->
             <subforce fluffName="CGB White Fang" ifDateBetween=",3066"
                       chassis="Essex II Destroyer">%ELEMENT%
             </subforce>
-            <subforce fluffName="CGB Fire Fang" ifDateBetween=",3059"
-                      chassis="Whirlwind Destroyer">%ELEMENT%
-            </subforce>
-            <subforce fluffName="CGB Ursus" ifDateBetween=",3059"
-                      chassis="Whirlwind Destroyer">%ELEMENT%
-            </subforce>
             <subforce fluffName="CGB Blizzard" ifDateBetween=",3066"
                       chassis="Lola III Destroyer">%ELEMENT%
             </subforce>
@@ -228,18 +244,40 @@ but have a smaller aerospace arm than most other Clans. -->
             <subforce fluffName="CGB Black Ghost" ifDateBetween=",3066"
                       chassis="Fredasa (Corvette-Raider)">%ELEMENT%
             </subforce>
+            <subforce fluffName="CGB Shining Claw" ifDateBetween=",3059"
+                      chassis="Congress Frigate">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CGB Fire Fang" ifDateBetween=",3059"
+                      chassis="Whirlwind Destroyer">%ELEMENT%
+            </subforce>
+            <subforce fluffName="CGB Ursus" ifDateBetween=",3059"
+                      chassis="Whirlwind Destroyer">%ELEMENT%
+            </subforce>
+            <!-- JumpShip support keeps the fleet a 5-6 vessel naval star and prevents an empty
+                 warship formation (e.g. 3101-3149, after Ursa Major is lost and before Alshain
+                 enters service) from collapsing into a stray default WarShip. -->
+            <subforceOption>
+                <option num="3" unitType="Jumpship">%ELEMENT%</option>
+                <option num="4" unitType="Jumpship">%ELEMENT%</option>
+            </subforceOption>
+        </subforces>
+
+        <subforces ifName="Transport Flotilla">
             <subforce fluffName="CGB Great Bear" ifDateBetween="3055,3078"
                       chassis="Leviathan Heavy Transport">%ELEMENT%
             </subforce>
-            <subforce fluffName="CGB Ursine Boatman" ifDateBetween=",3078"
-                      chassis="Volga Transport">%ELEMENT%
+            <subforce fluffName="CGB Leviathan" ifDateBetween="3055,3077"
+                      chassis="Leviathan Heavy Transport">%ELEMENT%
             </subforce>
-            <subforce fluffName="CGB Den Mother" ifDateBetween=",3100"
+            <subforce fluffName="CGB Den Mother"
                       chassis="Carrack Transport">%ELEMENT%
             </subforce>
             <subforce fluffName="CGB Yggdrasil"
                       chassis="Carrack Transport">%ELEMENT%
             </subforce>
+            <subforce fluffName="CGB Ursine Boatman" ifDateBetween=",3078"
+                      chassis="Volga Transport">%ELEMENT%
+            </subforce>
         </subforces>
     </force>
 
@@ -270,6 +308,18 @@ but have a smaller aerospace arm than most other Clans. -->
                 <option />
             </subforceOption>
         </subforces>
+
+        <!-- Per Clan Ghost Bear Naval Forces (Sarna, 3061): Alpha fields the flagship Dieron's Run,
+             Beta the primary naval flagship Bear's Den. Each front-line galaxy attaches its Naval
+             Star (the naval node above, branched by ifName) with JumpShip support. -->
+        <attachedForces>
+            <subforce ifName="Alpha Galaxy" unitType="Warship"
+                      name="Alpha Naval Star">%CLUSTER%
+            </subforce>
+            <subforce ifName="Beta Galaxy" unitType="Warship"
+                      name="Beta Naval Star">%CLUSTER%
+            </subforce>
+        </attachedForces>
     </force>
 
     <force echelon="%CLUSTER%" eschName="Cluster" ifUnitType="BattleArmor">
@@ -309,7 +359,15 @@ but have a smaller aerospace arm than most other Clans. -->
         <name ifRating="PG">Provisional Garrison Cluster</name>
         <co>%STAR_COL%</co>
 
+        <!-- Inherits Ghost Bear doctrine: heaviest-Clan weight (+1 modifier) and direct assaults
+             with heavy/assault Meks. Assault clusters roll a real share (weight 2), and the
+             per-cluster targets push assault density past the trinary rolls. Aerospace and Battle
+             Armor are left as-is (already canon). Matches the CGB tuning. -->
+        <weightTarget ifWeightClass="A" unitType="Mek" spread="8">A:55,H:40,M:5,L:0</weightTarget>
+        <weightTarget ifWeightClass="H" unitType="Mek" spread="8">A:35,H:52,M:11,L:2</weightTarget>
+
         <weightClass>
+            <option weight="2">A</option>
             <option weight="4">H</option>
             <option weight="2">M</option>
             <option ifRole="!command" weight="1">L</option>
diff --git a/data/universe/factions/FID.yml b/data/universe/factions/FID.yml
index 6e92b6bbe..1dfe2888e 100644
--- a/data/universe/factions/FID.yml
+++ b/data/universe/factions/FID.yml
@@ -27,6 +27,8 @@ capitalChanges:
 yearsActive:
   - start: 3060
     end: 3081
+  - start: 3135
+    end: 3150
   - start: 3151
 tags:
   - MINOR