diff --git a/forge-gui/res/cardsfolder/upcoming/scout_the_wilderness.txt b/forge-gui/res/cardsfolder/upcoming/scout_the_wilderness.txt
index 9ea2db9089c..345be0e56f9 100644
--- a/forge-gui/res/cardsfolder/upcoming/scout_the_wilderness.txt
+++ b/forge-gui/res/cardsfolder/upcoming/scout_the_wilderness.txt
@@ -2,7 +2,7 @@ Name:Scout the Wilderness
 ManaCost:2 G
 Types:Sorcery
 K:Kicker:1 W
-A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ 1 | SubAbility$ DBToken | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. If this spell was kicked, create two 1/1 white Soldier creature tokens.
+A:SP$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic | ChangeNum$ 1 | SubAbility$ DBToken | SpellDescription$ Search your library for a basic land card, put it onto the battlefield tapped, then shuffle. If this spell was kicked, create two 1/1 white Soldier creature tokens.
 SVar:DBToken:DB$ Token | TokenAmount$ 2 | TokenScript$ w_1_1_soldier | Condition$ Kicked
 DeckHints:Color$White
 DeckHas:Ability$Token
diff --git a/forge-gui/res/cardsfolder/upcoming/serra_paragon.txt b/forge-gui/res/cardsfolder/upcoming/serra_paragon.txt
deleted file mode 100644
index 2c2810364ba..00000000000
--- a/forge-gui/res/cardsfolder/upcoming/serra_paragon.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Name:Serra Paragon
-ManaCost:2 W W
-Types:Creature Angel
-PT:3/4
-K:Flying
-S:Mode$ Continuous | Affected$ Permanent.YouOwn+cmcLE3,Land.YouOwn| Condition$ PlayerTurn | MayPlay$ True | MayPlayLimit$ 1 | EffectZone$ Battlefield | AffectedZone$ Graveyard | Description$ Once during each of your turns, you may play a land from your graveyard or cast a permanent spell with mana value 3 or less from your graveyard. If you do, it gains “When this permanent is put into a graveyard from the battlefield, exile it and you gain 2 life.”
-T:Mode$ SpellCast | ValidCard$ Dragon.wasCastFromYourGraveyard | ValidActivatingPlayer$ You | Execute$ DBAnimate | TriggerZones$ Battlefield | TriggerDescription$ 
-SVar:DBAnimate:DB$ Animate | Defined$ TriggeredCard | Duration$ Permanent | Triggers$ TrigDieExile
-SVar:TrigDieExile:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When this permanent is put into a graveyard from the battlefield, exile it and you gain 2 life
-SVar:TrigExile:DB$ ChangeZone | Defined$ TriggeredNewCardLKICopy | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2
-DeckHas:Ability$Graveyard|Lifegain
-Oracle:Flying\nOnce during each of your turns, you may play a land from your graveyard or cast a permanent spell with mana value 3 or less from your graveyard. If you do, it gains “When this permanent is put into a graveyard from the battlefield, exile it and you gain 2 life.”
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/shadow_prophecy.txt b/forge-gui/res/cardsfolder/upcoming/shadow_prophecy.txt
index 89f7d8f4de3..189c1e3d24f 100644
--- a/forge-gui/res/cardsfolder/upcoming/shadow_prophecy.txt
+++ b/forge-gui/res/cardsfolder/upcoming/shadow_prophecy.txt
@@ -1,9 +1,10 @@
 Name:Shadow Prophecy
 ManaCost:2 B
 Types:Instant
-A:SP$ Dig | DigNum$ X | ChangeNum$ 2 | SubAbility$ DBLoseLife | SpellDescription$ Domain — Look at the top X cards of your library, where X is the number of basic land types among lands you control. Put up to two of them into your hand and the rest into your graveyard. You lose 2 life.
+A:SP$ Dig | DigNum$ X | ChangeNum$ 2 | SubAbility$ DBLoseLife | Optional$ True | DestinationZone2$ Graveyard | SpellDescription$ Domain — Look at the top X cards of your library, where X is the number of basic land types among lands you control. Put up to two of them into your hand and the rest into your graveyard. You lose 2 life.
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 2
 SVar:X:Count$Domain
+DeckHas:Ability$Graveyard
 SVar:BuffedBy:Plains,Island,Swamp,Mountain,Forest
 AI:RemoveDeck:Random
 Oracle:Domain — Look at the top X cards of your library, where X is the number of basic land types among lands you control. Put up to two of them into your hand and the rest into your graveyard. You lose 2 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/sheoldreds_restoration.txt b/forge-gui/res/cardsfolder/upcoming/sheoldreds_restoration.txt
index 848f4e34aa2..296c58df324 100644
--- a/forge-gui/res/cardsfolder/upcoming/sheoldreds_restoration.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sheoldreds_restoration.txt
@@ -5,8 +5,8 @@ K:Kicker:2 W
 A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn | SubAbility$ DBGainLife | TgtPrompt$ Select target creature to return from your graveyard |  TriggerDescription$ Return target creature card from your graveyard to the battlefield. If this spell was kicked, you gain life equal to that card's mana value. Otherwise, you lose that much life.
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ X | SubAbility$ DBLoseLife | Condition$ Kicked
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ X | ConditionCheckSVar$ Y | ConditionSVarCompare$ EQ0 | SubAbility$ DBChange
-SVar:DBChange:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | StackDescription$ None
+SVar:DBChange:DB$ ChangeZone | Origin$ Stack | Destination$ Exile
 SVar:X:Targeted$CardManaCost
 SVar:Y:Count$TimesKicked
 DeckHas:Ability$Graveyard|Lifegain
-Oracle:Return target creature card from your graveyard to the battlefield. If this spell was kicked, you gain life equal to that card’s mana value. Otherwise, you lose that much life.Exile Sheoldred’s Restoration.
\ No newline at end of file
+Oracle:Return target creature card from your graveyard to the battlefield. If this spell was kicked, you gain life equal to that card's mana value. Otherwise, you lose that much life. Exile Sheoldred's Restoration.
diff --git a/forge-gui/res/cardsfolder/upcoming/shield_wall_sentinel.txt b/forge-gui/res/cardsfolder/upcoming/shield_wall_sentinel.txt
index fc4ea0702b7..ef7ba032c54 100644
--- a/forge-gui/res/cardsfolder/upcoming/shield_wall_sentinel.txt
+++ b/forge-gui/res/cardsfolder/upcoming/shield_wall_sentinel.txt
@@ -3,8 +3,7 @@ ManaCost:4
 Types:Artifact Creature Golem
 PT:1/3
 K:Defender
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBSearch | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a creature card with defender, reveal it, put it into your hand, then shuffle.
+T:Mode$ ChangesZone | Origin$ Any | OptionalDecider$ You | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBSearch | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a creature card with defender, reveal it, put it into your hand, then shuffle.
 SVar:DBSearch:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Creature.withDefender | ChangeNum$ 1
-DeckNeeds:Type|Defender
-DeckHints:Type|Defender
-Oracle:DefenderWhen Shield-Wall Sentinel enters the battlefield, you may search your library for a creature card with defender, reveal it, put it into your hand, then shuffle.
+DeckNeeds:Keyword$Defender
+Oracle:Defender\nWhen Shield-Wall Sentinel enters the battlefield, you may search your library for a creature card with defender, reveal it, put it into your hand, then shuffle.
diff --git a/forge-gui/res/cardsfolder/upcoming/soul_of_windgrace.txt b/forge-gui/res/cardsfolder/upcoming/soul_of_windgrace.txt
index 73635b541a2..2e3527a823c 100644
--- a/forge-gui/res/cardsfolder/upcoming/soul_of_windgrace.txt
+++ b/forge-gui/res/cardsfolder/upcoming/soul_of_windgrace.txt
@@ -2,11 +2,13 @@ Name:Soul of Windgrace
 ManaCost:1 B R G
 Types:Legendary Creature Cat Avatar
 PT:5/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, you may put a land card from a graveyard onto the battlefield tapped under your control.
+T:Mode$ ChangesZone | Origin$ Any | OptionalDecider$ You | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ Whenever CARDNAME enters the battlefield, you may put a land card from a graveyard onto the battlefield tapped under your control.
+T:Mode$ Attacks | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigChangeZone | TriggerDescription$ Whenever CARDNAME attacks, you may put a land card from a graveyard onto the battlefield tapped under your control.
 SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Tapped$ True | TgtPrompt$ Select target land card in a graveyard | ValidTgts$ Land
 A:AB$ GainLife | Cost$ G Discard<1/Land> | LifeAmount$ 3 | SpellDescription$ Gain 3 Life
 A:AB$ Draw | Cost$ 1 R Discard<1/Land> | SpellDescription$ Draw a card.
 A:AB$ Pump | Cost$ 2 B Discard<1/Land> | KW$ Indestructible | SubAbility$ DBTap | SpellDescription$ CARDNAME gains indestructible until end of turn. Tap it.
 SVar:DBTap:DB$ Tap | Defined$ Self
-DeckHas:Ability$Lifegain|Discard & Keyword$Indestructible 
-Oracle:Whenever Soul of Windgrace enters the battlefield or attacks, you may put a land card from a graveyard onto the battlefield tapped under your control.\n{G}, Discard a land card: You gain 3 life.\n{1}{R}, Discard a land card: Draw a card.\n{2}{B}, Discard a land card: Soul of Windgrace gains indestructible until end of turn. Tap it.
\ No newline at end of file
+DeckHas:Ability$Lifegain|Discard & Keyword$Indestructible
+SVar:HasAttackEffect:TRUE
+Oracle:Whenever Soul of Windgrace enters the battlefield or attacks, you may put a land card from a graveyard onto the battlefield tapped under your control.\n{G}, Discard a land card: You gain 3 life.\n{1}{R}, Discard a land card: Draw a card.\n{2}{B}, Discard a land card: Soul of Windgrace gains indestructible until end of turn. Tap it.