diff --git a/build/uuid-redirects/pf2e.json b/build/uuid-redirects/pf2e.json
index dde967250b8..c07de15d810 100644
--- a/build/uuid-redirects/pf2e.json
+++ b/build/uuid-redirects/pf2e.json
@@ -326,6 +326,7 @@
     "Compendium.pf2e.feat-effects.Item.uA1Ofqoyi0UiZIPk": "Compendium.pf2e.feat-effects.Item.Effect: Clue In",
     "Compendium.pf2e.feat-effects.Item.vE9NePtP32DyfJSr": "Compendium.pf2e.feat-effects.Item.Effect: Aura of Faith",
     "Compendium.pf2e.feat-effects.Item.VIScVb6Hl7KwoWfH": "Compendium.pf2e.feat-effects.Item.Effect: Bolera's Interrogation",
+    "Compendium.pf2e.feat-effects.Item.WRe8qbemruWxkN8d": "Compendium.pf2e.feat-effects.Item.Effect: Rampaging Form",
     "Compendium.pf2e.feat-effects.Item.WxE5S3KY1DR5Nbxm": "Compendium.pf2e.feat-effects.Item.Effect: Living Fortification",
     "Compendium.pf2e.feat-effects.Item.x4Sb3qaMJo8x1r3X": "Compendium.pf2e.feat-effects.Item.Effect: Emblazon Energy",
     "Compendium.pf2e.feat-effects.Item.XC3dRbwfu35vuvmM": "Compendium.pf2e.feat-effects.Item.Effect: Sanctify Armament",
diff --git a/packs/pf2e/feat-effects/effect-rampaging-form-frozen-winds-kitsune.json b/packs/pf2e/feat-effects/effect-rampaging-form-frozen-winds-kitsune.json
deleted file mode 100644
index 9ad903c0511..00000000000
--- a/packs/pf2e/feat-effects/effect-rampaging-form-frozen-winds-kitsune.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-    "_id": "WRe8qbemruWxkN8d",
-    "img": "systems/pf2e/icons/features/feats/rampaging-form-frozen-wind.webp",
-    "name": "Effect: Rampaging Form (Frozen Winds Kitsune)",
-    "system": {
-        "description": {
-            "value": "<p>Granted by @UUID[Compendium.pf2e.feats-srd.Item.Rampaging Form]</p>\n<p>You Change Shape into a form of living ice for 1 minute or until you shift back. Your battle form is Huge and has the following statistics:</p>\n<ul>\n<li>AC = 18 + your level. Ignore your armor's check penalty and Speed reduction.</li>\n<li>20 temporary Hit Points.</li>\n<li>Low-light vision and imprecise scent 30 feet.</li>\n<li>A Speed of 30, a Fly speed of 40, and you don't need to breathe</li>\n<li><strong>Melee</strong> <span class=\"action-glyph\">a</span> jaws, <strong>Damage</strong> 2d8 piercing + 1d4 cold damage.</li>\n<li>Your unarmed attacks deal 1d4 additional cold damage, and your cold spells deal one additional die of cold damage (of the same damage die the spell uses).</li>\n<li>You can cast @UUID[Compendium.pf2e.spells-srd.Item.Ray of Frost] as an innate spell; the casting is reduced from 2 actions to 1.</li>\n<li>Any creature that touches you or damages you with an unarmed attack or non-reach melee weapon takes @Damage[3d6[cold]] damage.</li>\n<li>Athletics modifier of +20, unless your own modifier is higher.</li>\n</ul>"
-        },
-        "duration": {
-            "expiry": "turn-start",
-            "sustained": false,
-            "unit": "minutes",
-            "value": 1
-        },
-        "level": {
-            "value": 9
-        },
-        "publication": {
-            "license": "OGL",
-            "remaster": false,
-            "title": "Pathfinder Lost Omens Ancestry Guide"
-        },
-        "rules": [
-            {
-                "key": "BattleForm",
-                "overrides": {
-                    "armorClass": {
-                        "modifier": "18 + @actor.level"
-                    },
-                    "immunities": [
-                        {
-                            "type": "cold"
-                        }
-                    ],
-                    "resistances": [
-                        {
-                            "type": "precision",
-                            "value": 10
-                        }
-                    ],
-                    "senses": {
-                        "lowLightVision": {},
-                        "scent": {
-                            "acuity": "imprecise",
-                            "range": 30
-                        }
-                    },
-                    "size": "huge",
-                    "skills": {
-                        "athletics": {
-                            "modifier": 20
-                        }
-                    },
-                    "speeds": {
-                        "fly": 40,
-                        "land": 40
-                    },
-                    "strikes": {
-                        "jaws": {
-                            "ability": "str",
-                            "baseType": "jaws",
-                            "category": "unarmed",
-                            "damage": {
-                                "damageType": "piercing",
-                                "dice": 4,
-                                "die": "d8",
-                                "modifier": 7
-                            },
-                            "modifier": 18,
-                            "traits": [
-                                "unarmed",
-                                "reach-15"
-                            ]
-                        }
-                    },
-                    "tempHP": 20,
-                    "traits": [
-                        "animal"
-                    ],
-                    "weaknesses": [
-                        {
-                            "type": [
-                                "fire",
-                                "water"
-                            ],
-                            "value": 5
-                        }
-                    ]
-                }
-            },
-            {
-                "damageType": "cold",
-                "diceNumber": 1,
-                "dieSize": "d4",
-                "key": "DamageDice",
-                "predicate": [
-                    "unarmed"
-                ],
-                "selector": "strike-damage"
-            }
-        ],
-        "start": {
-            "initiative": null,
-            "value": 0
-        },
-        "tokenIcon": {
-            "show": true
-        },
-        "traits": {
-            "rarity": "common",
-            "value": []
-        }
-    },
-    "type": "effect"
-}
diff --git a/packs/pf2e/feat-effects/effect-rampaging-form.json b/packs/pf2e/feat-effects/effect-rampaging-form.json
index e25ac942505..9d0771658ac 100644
--- a/packs/pf2e/feat-effects/effect-rampaging-form.json
+++ b/packs/pf2e/feat-effects/effect-rampaging-form.json
@@ -4,7 +4,7 @@
     "name": "Effect: Rampaging Form",
     "system": {
         "description": {
-            "value": "<p>Granted by @UUID[Compendium.pf2e.feats-srd.Item.Rampaging Form]</p>\n<p>You Change Shape into a form of living ice for 1 minute or until you shift back. Your battle form is Huge and has the following statistics:</p>\n<ul>\n<li>AC = 18 + your level. Ignore your armor's check penalty and Speed reduction.</li>\n<li>20 temporary Hit Points.</li>\n<li>Low-light vision and imprecise scent 30 feet.</li>\n<li>A Speed of 30, a Fly speed of 40, and you don't need to breathe</li>\n<li><strong>Melee</strong> <span class=\"action-glyph\">a</span> jaws, <strong>Damage</strong> 2d8 piercing + 1d4 fire damage.</li>\n<li>Your unarmed attacks deal 1d4 additional fire damage, and your fire spells deal one additional die of fire damage (of the same damage die the spell uses).</li>\n<li>You can cast @UUID[Compendium.pf2e.spells-srd.Item.Ignition] as an innate spell; the casting is reduced from 2 actions to 1.</li>\n<li>Any creature that touches you or damages you with an unarmed attack or non-reach melee weapon takes @Damage[3d6[fire]] damage.</li>\n<li>Athletics modifier of +20, unless your own modifier is higher.</li>\n</ul>"
+            "value": "<p>Granted by @UUID[Compendium.pf2e.feats-srd.Item.Rampaging Form]</p>\n<p>You Change Shape into a form of living ice for 1 minute or until you shift back. Your battle form is Huge and has the following statistics:</p><ul><li><p>AC = 18 + your level. Ignore your armor's check penalty and Speed reduction.</p></li><li><p>20 temporary Hit Points.</p></li><li><p>Low-light vision and imprecise scent 30 feet.</p></li><li><p>A Speed of 30, a Fly speed of 40, and you don't need to breathe</p></li><li><p><strong>Melee</strong> <span class=\"action-glyph\">a</span> jaws, <strong>Damage</strong> 2d8 piercing + 1d4 fire damage.</p></li><li><p>Your unarmed attacks deal 1d4 additional fire damage, and your fire spells deal one additional die of fire damage (of the same damage die the spell uses).</p></li><li><p>You can cast @UUID[Compendium.pf2e.spells-srd.Item.Ignition] as an innate spell; the casting is reduced from 2 actions to 1.</p></li><li><p>Any creature that touches you or damages you with an unarmed attack or non-reach melee weapon takes @Damage[3d6[fire]] damage.</p></li><li><p>Athletics modifier of +20, unless your own modifier is higher.</p></li></ul><p>Frozen Winds Kitsune:</p><ul><li><p><strong>Melee</strong> <span class=\"action-glyph\">a</span> jaws, <strong>Damage</strong> 2d8 piercing + 1d4 cold damage.</p></li><li><p>Your unarmed attacks deal 1d4 additional cold damage, and your cold spells deal one additional die of cold damage (of the same damage die the spell uses).</p></li><li><p>You can cast @UUID[Compendium.pf2e.spells-srd.Item.Ray of Frost] as an innate spell; the casting is reduced from 2 actions to 1.</p></li><li><p>Any creature that touches you or damages you with an unarmed attack or non-reach melee weapon takes @Damage[3d6[cold]] damage.</p></li></ul>"
         },
         "duration": {
             "expiry": "turn-start",
@@ -86,17 +86,130 @@
                             "value": 5
                         }
                     ]
-                }
+                },
+                "predicate": [
+                    {
+                        "not": "self:heritage:frozen-wind-kitsune"
+                    }
+                ]
             },
             {
                 "damageType": "fire",
                 "diceNumber": 1,
                 "dieSize": "d4",
+                "hideIfDisabled": true,
+                "key": "DamageDice",
+                "predicate": [
+                    "unarmed",
+                    {
+                        "not": "self:heritage:frozen-wind-kitsune"
+                    }
+                ],
+                "selector": "strike-damage"
+            },
+            {
+                "key": "BattleForm",
+                "overrides": {
+                    "armorClass": {
+                        "modifier": "18 + @actor.level"
+                    },
+                    "immunities": [
+                        {
+                            "type": "cold"
+                        }
+                    ],
+                    "resistances": [
+                        {
+                            "type": "precision",
+                            "value": 10
+                        }
+                    ],
+                    "senses": {
+                        "lowLightVision": {},
+                        "scent": {
+                            "acuity": "imprecise",
+                            "range": 30
+                        }
+                    },
+                    "size": "huge",
+                    "skills": {
+                        "athletics": {
+                            "modifier": 20
+                        }
+                    },
+                    "speeds": {
+                        "fly": 40,
+                        "land": 40
+                    },
+                    "strikes": {
+                        "jaws": {
+                            "ability": "str",
+                            "baseType": "jaws",
+                            "category": "unarmed",
+                            "damage": {
+                                "damageType": "piercing",
+                                "dice": 4,
+                                "die": "d8",
+                                "modifier": 7
+                            },
+                            "modifier": 18,
+                            "traits": [
+                                "unarmed",
+                                "reach-15"
+                            ]
+                        }
+                    },
+                    "tempHP": 20,
+                    "traits": [
+                        "animal"
+                    ],
+                    "weaknesses": [
+                        {
+                            "type": [
+                                "fire",
+                                "water"
+                            ],
+                            "value": 5
+                        }
+                    ]
+                },
+                "predicate": [
+                    "self:heritage:frozen-wind-kitsune"
+                ]
+            },
+            {
+                "damageType": "cold",
+                "diceNumber": 1,
+                "dieSize": "d4",
+                "hideIfDisabled": true,
                 "key": "DamageDice",
                 "predicate": [
-                    "unarmed"
+                    "unarmed",
+                    "self:heritage:frozen-wind-kitsune"
                 ],
                 "selector": "strike-damage"
+            },
+            {
+                "damageType": "fire",
+                "diceNumber": 1,
+                "key": "DamageDice",
+                "predicate": [
+                    "fire",
+                    {
+                        "not": "self:heritage:frozen-wind-kitsune"
+                    }
+                ],
+                "selector": "spell-damage"
+            },
+            {
+                "damageType": "fire",
+                "diceNumber": 1,
+                "key": "DamageDice",
+                "predicate": [
+                    "cold",
+                    "self:heritage:frozen-wind-kitsune"
+                ],
+                "selector": "spell-damage"
             }
         ],
         "start": {
diff --git a/packs/pf2e/feats/ancestry/kitsune/level-17/rampaging-form.json b/packs/pf2e/feats/ancestry/kitsune/level-17/rampaging-form.json
index 81eeece34c8..201eb4265d8 100644
--- a/packs/pf2e/feats/ancestry/kitsune/level-17/rampaging-form.json
+++ b/packs/pf2e/feats/ancestry/kitsune/level-17/rampaging-form.json
@@ -12,7 +12,7 @@
         },
         "category": "ancestry",
         "description": {
-            "value": "<p>Once per day, when you Change Shape into a fox, you can instead gain the effects of both the canine form of 5th-rank @UUID[Compendium.pf2e.spells-srd.Item.Animal Form] and 7th-rank @UUID[Compendium.pf2e.spells-srd.Item.Fiery Body] for 1 minute or until you shift back, whichever comes first. You can cast @UUID[Compendium.pf2e.spells-srd.Item.Ignition] from the <em>fiery body</em> effect even though you're in a battle form.</p>\n<p>@UUID[Compendium.pf2e.feat-effects.Item.Effect: Rampaging Form]</p>\n<hr />\n<p><strong>Special</strong> If you are a frozen wind kitsune, your form is ice instead of fire. This changes the immunity and damage from the <em>fiery body</em> effect to cold, changes the weakness to fire, and changes produce flame to @UUID[Compendium.pf2e.spells-srd.Item.Ray of Frost].</p>\n<p>@UUID[Compendium.pf2e.feat-effects.Item.Effect: Rampaging Form (Frozen Winds Kitsune)]</p>"
+            "value": "<p>Once per day, when you Change Shape into a fox, you can instead gain the effects of both the canine form of 5th-rank @UUID[Compendium.pf2e.spells-srd.Item.Animal Form] and 7th-rank @UUID[Compendium.pf2e.spells-srd.Item.Fiery Body] for 1 minute or until you shift back, whichever comes first. You can cast @UUID[Compendium.pf2e.spells-srd.Item.Ignition] from the <em>fiery body</em> effect even though you're in a battle form.</p>\n<p>@UUID[Compendium.pf2e.feat-effects.Item.Effect: Rampaging Form]</p><hr /><p><strong>Special</strong> If you are a frozen wind kitsune, your form is ice instead of fire. This changes the immunity and damage from the <em>fiery body</em> effect to cold, changes the weakness to fire, and changes <em>ignition</em> to @UUID[Compendium.pf2e.spells-srd.Item.Ray of Frost].</p>"
         },
         "level": {
             "value": 17