diff --git a/forge-gui/res/cardsfolder/upcoming/adeline_resplendent_cathar.txt b/forge-gui/res/cardsfolder/upcoming/adeline_resplendent_cathar.txt
index 10a8a2474c0..caf8200d7ff 100644
--- a/forge-gui/res/cardsfolder/upcoming/adeline_resplendent_cathar.txt
+++ b/forge-gui/res/cardsfolder/upcoming/adeline_resplendent_cathar.txt
@@ -9,5 +9,4 @@ T:Mode$ AttackersDeclared | AttackingPlayer$ You | Execute$ TrigToken | TriggerZ
 SVar:TrigToken:DB$ Token | TokenAmount$ Y | TokenScript$ w_1_1_human | TokenTapped$ True | TokenAttacking$ True | ChoosePlayerOrPlaneswalker$ True | TokenOwner$ You
 SVar:Y:PlayerCountOpponents$Amount
 DeckHas:Ability$Token
-DeckHints:Type$Knight
 Oracle:Vigilance\nAdeline, Resplendent Cathar's power is equal to the number of creatures you control.\nWhenever you attack, for each opponent, create a 1/1 white Human creature token that's tapped and attacking that player or a planeswalker they control.
diff --git a/forge-gui/res/cardsfolder/upcoming/blessed_defiance.txt b/forge-gui/res/cardsfolder/upcoming/blessed_defiance.txt
index 2916d4d3040..5c6bd90d278 100644
--- a/forge-gui/res/cardsfolder/upcoming/blessed_defiance.txt
+++ b/forge-gui/res/cardsfolder/upcoming/blessed_defiance.txt
@@ -1,10 +1,10 @@
-Name: Blessed Defiance
+Name:Blessed Defiance
 ManaCost:W
 Types:Instant
-A:SP$ Pump | Cost$ W | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +2 | KW$ Lifelink | SubAbility$ DBEffect | SpellDescription$ Target creature you control gets +2/+0 and gains lifelink until end of turn. When that creature dies this turn, create a 1/1 white Spirit creature token with flying.
-SVar:DBEffect:DB$ Effect | Name$ Blessed Defiance Effect | Triggers$ BlessedTrig | RememberObjects$ ParentTarget | StackDescription$ When {c:Targeted} dies this turn, create a 1/1 white Spirit creature token with flying.
-SVar:BlessedTrig:Mode$ ChangesZone | ValidCard$ Creature.IsRemembered | Origin$ Battlefield | Destination$ Graveyard | Execute$ DBToken | TriggerDescription$ When that creature dies this turn, create a 1/1 white Spirit creature token with flying.
-SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_spirit_flying | TokenOwner$ You | SubAbility$ EndEffect
-SVar:EndEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
+A:SP$ Pump | Cost$ W | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | NumAtt$ +2 | KW$ Lifelink | SubAbility$ DBEffect | SpellDescription$ Target creature you control gets +2/+0 and gains lifelink until end of turn. When that creature dies this turn, create a 1/1 white Spirit creature token with flying.
+SVar:DBEffect:DB$ Effect | Triggers$ SpiritEmerge | RememberObjects$ Targeted | StackDescription$ When {c:Targeted} dies this turn, create a 1/1 white Spirit creature token with flying.
+SVar:SpiritEmerge:Mode$ ChangesZone | ValidCard$ Creature.IsRemembered | Origin$ Battlefield | Destination$ Graveyard | Execute$ DBToken | TriggerDescription$ When that creature dies this turn, create a 1/1 white Spirit creature token with flying.
+SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_spirit_flying | TokenOwner$ You | SubAbility$ DBExileSelf
+SVar:DBExileSelf:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 DeckHas:Ability$Token
 Oracle:Target creature you control gets +2/+0 and gains lifelink until end of turn. When that creature dies this turn, create a 1/1 white Spirit creature token with flying.
diff --git a/forge-gui/res/cardsfolder/upcoming/ghoulish_procession.txt b/forge-gui/res/cardsfolder/upcoming/ghoulish_procession.txt
index 59d9dbef6fe..fab2e3b3391 100644
--- a/forge-gui/res/cardsfolder/upcoming/ghoulish_procession.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ghoulish_procession.txt
@@ -3,4 +3,5 @@ ManaCost:1 B
 Types:Enchantment
 T:Mode$ ChangesZoneAll | TriggerZones$ Battlefield | ValidCards$ Creature.nonToken | Origin$ Battlefield | Destination$ Graveyard | Execute$ TrigToken | ActivationLimit$ 1 | TriggerDescription$ Whenever one or more nontoken creatures die, create a 2/2 black Zombie creature token with decayed. This ability triggers only once each turn. (A creature with decayed can't block. When it attacks, sacrifice it at end of combat.)
 SVar:TrigToken:DB$ Token | TokenScript$ b_2_2_zombie_decayed
+DeckHas:Ability$Token
 Oracle:Whenever one or more nontoken creatures die, create a 2/2 black Zombie creature token with decayed. This ability triggers only once each turn. (A creature with decayed can't block. When it attacks, sacrifice it at end of combat.)
diff --git a/forge-gui/res/cardsfolder/upcoming/rite_of_oblivion.txt b/forge-gui/res/cardsfolder/upcoming/rite_of_oblivion.txt
index 5903555c3c6..889d678999e 100644
--- a/forge-gui/res/cardsfolder/upcoming/rite_of_oblivion.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rite_of_oblivion.txt
@@ -3,4 +3,4 @@ ManaCost:W B
 Types:Sorcery
 K:Flashback:2 W B
 A:SP$ ChangeZone | Cost$ W B Sac<1/Permanent.nonLand/nonland permanent> | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target nonland permanent.
-Oracle:As an additional cost to cast this spell, sacrifice a nonland permanent.\nExile target nonland permanent.\nFlashback {2}{W}{B} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
+Oracle:As an additional cost to cast this spell, sacrifice a nonland permanent.\nExile target nonland permanent.\nFlashback {2}{W}{B} (You may cast this card from your graveyard for its flashback cost and any additional costs. Then exile it.)
diff --git a/forge-gui/res/cardsfolder/upcoming/sacred_fire.txt b/forge-gui/res/cardsfolder/upcoming/sacred_fire.txt
index d899435958f..0ebc8664340 100644
--- a/forge-gui/res/cardsfolder/upcoming/sacred_fire.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sacred_fire.txt
@@ -4,4 +4,5 @@ Types:Instant
 K:Flashback:4 R W
 A:SP$ DealDamage | Cost$ R W | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 2 damage to any target and you gain 2 life.
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2
+DeckHas:Ability$LifeGain
 Oracle:Sacred Fire deals 2 damage to any target and you gain 2 life.\nFlashback {4}{R}{W} (You may cast this card from your graveyard for its flashback cost. Then exile it.)