diff --git a/forge-gui/res/cardsfolder/w/war_falcon.txt b/forge-gui/res/cardsfolder/w/war_falcon.txt
index 66d7920f48c..af06f2968c4 100644
--- a/forge-gui/res/cardsfolder/w/war_falcon.txt
+++ b/forge-gui/res/cardsfolder/w/war_falcon.txt
@@ -4,6 +4,6 @@ Types:Creature Bird
 PT:2/1
 K:Flying
 S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack. | IsPresent$ Knight.YouCtrl,Soldier.YouCtrl | PresentCompare$ EQ0 | Description$ CARDNAME can't attack unless you control a Knight or Soldier.
-DeckNeeds:Type$Knight|Soldier
 SVar:BuffedBy:Knight,Soldier
+DeckNeeds:Type$Knight|Soldier
 Oracle:Flying\nWar Falcon can't attack unless you control a Knight or a Soldier.
diff --git a/forge-gui/res/cardsfolder/w/warchanter_skald.txt b/forge-gui/res/cardsfolder/w/warchanter_skald.txt
index adc3337763c..a232e7072f3 100644
--- a/forge-gui/res/cardsfolder/w/warchanter_skald.txt
+++ b/forge-gui/res/cardsfolder/w/warchanter_skald.txt
@@ -6,6 +6,6 @@ T:Mode$ Taps | ValidCard$ Card.Self | IsPresent$ Card.Self+enchanted,Card.Self+e
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ r_2_1_dwarf_berserker | TokenOwner$ You
 SVar:EnchantMe:Once
 SVar:EquipMe:Once
-DeckNeeds:Type$Enchantment|Equipment
 DeckHas:Ability$Token
+DeckNeeds:Type$Enchantment|Equipment
 Oracle:Whenever Warchanter Skald becomes tapped, if it's enchanted or equipped, create a 2/1 red Dwarf Berserker creature token.
diff --git a/forge-gui/res/cardsfolder/w/warping_wail.txt b/forge-gui/res/cardsfolder/w/warping_wail.txt
index 905d3036114..8dbd56ec5f8 100644
--- a/forge-gui/res/cardsfolder/w/warping_wail.txt
+++ b/forge-gui/res/cardsfolder/w/warping_wail.txt
@@ -5,6 +5,6 @@ A:SP$ Charm | Choices$ DBExile,DBCounter,DBToken
 SVar:DBExile:DB$ ChangeZone | ValidTgts$ Creature.powerLE1,Creature.toughnessLE1 | TgtPrompt$ Choose target creature with power or toughness 1 or less | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature with power or toughness 1 or less.
 SVar:DBCounter:DB$ Counter | TargetType$ Spell | ValidTgts$ Card.Sorcery | TgtPrompt$ Counter target sorcery spell | SpellDescription$ Counter target sorcery spell.
 SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_1_1_eldrazi_scion_sac | TokenOwner$ You | SpellDescription$ Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
-DeckNeeds:Ability$Mana.Colorless
 DeckHas:Ability$Token
+DeckNeeds:Ability$Mana.Colorless
 Oracle:({C} represents colorless mana.)\nChoose one —\n• Exile target creature with power or toughness 1 or less.\n• Counter target sorcery spell.\n• Create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C}."
diff --git a/forge-gui/res/cardsfolder/w/wasteland_raider.txt b/forge-gui/res/cardsfolder/w/wasteland_raider.txt
index a24e2faefc5..796de36697d 100644
--- a/forge-gui/res/cardsfolder/w/wasteland_raider.txt
+++ b/forge-gui/res/cardsfolder/w/wasteland_raider.txt
@@ -5,6 +5,6 @@ PT:4/3
 K:Squad:2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME enters, each player sacrifices a creature.
 SVar:TrigSac:DB$ Sacrifice | Defined$ Player | SacValid$ Creature
-DeckHas:Ability$Token
 SVar:NeedsToPlay:Creature.YouDontCtrl
+DeckHas:Ability$Token
 Oracle:Squad {2} (As an additional cost to cast this spell, you may pay {2} any number of times. When this creature enters, create that many tokens that are copies of it.)\nWhen Wasteland Raider enters, each player sacrifices a creature.
diff --git a/forge-gui/res/cardsfolder/w/we_ride_at_dawn.txt b/forge-gui/res/cardsfolder/w/we_ride_at_dawn.txt
index ae155a2ef37..028e7a46f25 100644
--- a/forge-gui/res/cardsfolder/w/we_ride_at_dawn.txt
+++ b/forge-gui/res/cardsfolder/w/we_ride_at_dawn.txt
@@ -4,6 +4,6 @@ Types:Enchantment
 S:Mode$ Continuous | Affected$ Card.Creature+Legendary+YouCtrl+wasCast | AffectedZone$ Stack | AddKeyword$ Convoke | Description$ Legendary creature spells you cast have convoke. (Your creatures can help cast those spells. Each creature you tap while casting a legendary creature spell pays for {1} or one mana of that creature's color.)
 T:Mode$ Attacks | ValidCard$ Card.IsCommander+YouOwn | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever your commander attacks, create a 1/1 red Mercenary creature token with "{T}: Target creature you control gets +1/+0 until end of turn. Activate only as a sorcery."
 SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ r_1_1_mercenary_tappump | TokenOwner$ You
-DeckNeeds:Type$Legendary & Type$Creature
 DeckHas:Ability$Token & Type$Mercenary & Color$Red
+DeckNeeds:Type$Legendary & Type$Creature
 Oracle:Legendary creature spells you cast have convoke. (Your creatures can help cast those spells. Each creature you tap while casting a legendary creature spell pays for {1} or one mana of that creature's color.)\nWhenever your commander attacks, create a 1/1 red Mercenary creature token with "{T}: Target creature you control gets +1/+0 until end of turn. Activate only as a sorcery."
diff --git a/forge-gui/res/cardsfolder/w/wedding_security.txt b/forge-gui/res/cardsfolder/w/wedding_security.txt
index 63172fc67f7..d7d6433d815 100644
--- a/forge-gui/res/cardsfolder/w/wedding_security.txt
+++ b/forge-gui/res/cardsfolder/w/wedding_security.txt
@@ -5,7 +5,7 @@ PT:4/4
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPutCounter | IsPresent$ Blood.token+YouCtrl | TriggerDescription$ Whenever CARDNAME attacks, you may sacrifice a Blood token. If you do, put a +1/+1 counter on CARDNAME and draw a card.
 SVar:TrigPutCounter:AB$ PutCounter | Cost$ Sac<1/Blood.token/Blood token> | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBDraw
 SVar:DBDraw:DB$ Draw | NumCards$ 1
-DeckNeeds:Type$Blood
-DeckHas:Ability$Counters|Sacrifice
 SVar:HasAttackEffect:TRUE
+DeckHas:Ability$Counters|Sacrifice
+DeckNeeds:Type$Blood
 Oracle:Whenever Wedding Security attacks, you may sacrifice a Blood token. If you do, put a +1/+1 counter on Wedding Security and draw a card.
diff --git a/forge-gui/res/cardsfolder/w/welcome_to_sweettooth.txt b/forge-gui/res/cardsfolder/w/welcome_to_sweettooth.txt
index 1eec90706f3..c774cd54c42 100644
--- a/forge-gui/res/cardsfolder/w/welcome_to_sweettooth.txt
+++ b/forge-gui/res/cardsfolder/w/welcome_to_sweettooth.txt
@@ -5,8 +5,7 @@ K:Chapter:3:DBToken,DBFood,DBPutCounter
 SVar:DBToken:DB$ Token | TokenScript$ w_1_1_human | TokenAmount$ 1 | TokenOwner$ You | SpellDescription$ Create a 1/1 white Human creature token.
 SVar:DBFood:DB$ Token | TokenScript$ c_a_food_sac | SpellDescription$ Create a Food token.
 SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ X | SpellDescription$ Put X +1/+1 counters on target creature you control, where X is one plus the number of Foods you control.
-DeckHas:Ability$Token|Counters & Type$Human|Food
 SVar:X:Count$Valid Food.YouCtrl/Plus.1
-DeckHints:Type$Food
-DeckHints:Ability$Token
+DeckHas:Ability$Token|Counters & Type$Human|Food
+DeckHints:Ability$Token & Type$Food
 Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.)\nI — Create a 1/1 white Human creature token.\nII — Create a Food token.\nIII — Put X +1/+1 counters on target creature you control, where X is one plus the number of Foods you control.
diff --git a/forge-gui/res/cardsfolder/w/whispering_snitch.txt b/forge-gui/res/cardsfolder/w/whispering_snitch.txt
index cc59318d707..81da6beccb0 100644
--- a/forge-gui/res/cardsfolder/w/whispering_snitch.txt
+++ b/forge-gui/res/cardsfolder/w/whispering_snitch.txt
@@ -5,6 +5,6 @@ PT:1/3
 T:Mode$ Surveil | ValidPlayer$ You | TriggerZones$ Battlefield | FirstTime$ True | Execute$ TrigDamageAll | TriggerDescription$ Whenever you surveil for the first time each turn, CARDNAME deals 1 damage to each opponent and you gain 1 life.
 SVar:TrigDamageAll:DB$ DamageAll | ValidPlayers$ Player.Opponent | NumDmg$ 1 | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
-DeckNeeds:Ability$Surveil
 DeckHas:Ability$LifeGain
+DeckNeeds:Ability$Surveil
 Oracle:Whenever you surveil for the first time each turn, Whispering Snitch deals 1 damage to each opponent and you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/w/widespread_thieving.txt b/forge-gui/res/cardsfolder/w/widespread_thieving.txt
index fcdb95d5cdc..c5e7c00f1c2 100644
--- a/forge-gui/res/cardsfolder/w/widespread_thieving.txt
+++ b/forge-gui/res/cardsfolder/w/widespread_thieving.txt
@@ -5,7 +5,7 @@ K:Hideaway:5
 T:Mode$ SpellCast | ValidCard$ Card.MultiColor | ValidActivatingPlayer$ You | Execute$ TrigToken | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a multicolored spell, create a Treasure token. Then, you may pay {W}{U}{B}{R}{G}. If you do, you may play the exiled card without paying its mana cost.
 SVar:TrigToken:DB$ Token | TokenScript$ c_a_treasure_sac | SubAbility$ DBPlay
 SVar:DBPlay:DB$ Play | UnlessCost$ W U B R G | UnlessSwitched$ True | UnlessPayer$ You | Defined$ ExiledWith | Amount$ All | Controller$ You | WithoutManaCost$ True | Optional$ True
-AI:RemoveDeck:Random
 SVar:BuffedBy:Card.MultiColor
+AI:RemoveDeck:Random
 DeckHas:Ability$Token|Sacrifice & Type$Treasure|Artifact
 Oracle:Hideaway 5 (When this enchantment enters, look at the top five cards of your library, exile one face down, then put the rest on the bottom in a random order.)\nWhenever you cast a multicolored spell, create a Treasure token. Then, you may pay {W}{U}{B}{R}{G}. If you do, you may play the exiled card without paying its mana cost.
diff --git a/forge-gui/res/cardsfolder/w/wilhelt_the_rotcleaver.txt b/forge-gui/res/cardsfolder/w/wilhelt_the_rotcleaver.txt
index 6558ff71bf8..3ac0055ad71 100644
--- a/forge-gui/res/cardsfolder/w/wilhelt_the_rotcleaver.txt
+++ b/forge-gui/res/cardsfolder/w/wilhelt_the_rotcleaver.txt
@@ -6,6 +6,6 @@ T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$
 SVar:TrigToken:DB$ Token | TokenScript$ b_2_2_zombie_decayed
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ At the beginning of your end step, you may sacrifice a Zombie. If you do, draw a card.
 SVar:TrigDraw:AB$ Draw | Cost$ Sac<1/Zombie> | NumCards$ 1
-DeckNeeds:Type$Zombie
 DeckHas:Ability$Token|Sacrifice
+DeckNeeds:Type$Zombie
 Oracle:Whenever another Zombie you control dies, if it didn't have decayed, create a 2/2 black Zombie creature token with decayed. (It can't block. When it attacks, sacrifice it at end of combat.)\nAt the beginning of your end step, you may sacrifice a Zombie. If you do, draw a card.
diff --git a/forge-gui/res/cardsfolder/w/winged_hive_tyrant.txt b/forge-gui/res/cardsfolder/w/winged_hive_tyrant.txt
index b5ba365abc8..cf1bea9f3d0 100644
--- a/forge-gui/res/cardsfolder/w/winged_hive_tyrant.txt
+++ b/forge-gui/res/cardsfolder/w/winged_hive_tyrant.txt
@@ -6,6 +6,6 @@ K:Flying
 K:Haste
 S:Mode$ Continuous | Affected$ Creature.YouCtrl+HasCounters+Other | AddKeyword$ Flying & Haste | Description$ The Will of the Hive Mind — Other creatures you control with counters on them have flying and haste.
 SVar:PlayMain1:TRUE
-DeckNeeds:Ability$Counters
 DeckHas:Keyword$Flying|Haste
+DeckNeeds:Ability$Counters
 Oracle:Flying, haste\nThe Will of the Hive Mind — Other creatures you control with counters on them have flying and haste.
diff --git a/forge-gui/res/cardsfolder/w/wingshield_agent.txt b/forge-gui/res/cardsfolder/w/wingshield_agent.txt
index 5b899c834d0..13d24131c96 100644
--- a/forge-gui/res/cardsfolder/w/wingshield_agent.txt
+++ b/forge-gui/res/cardsfolder/w/wingshield_agent.txt
@@ -5,6 +5,6 @@ PT:2/3
 K:etbCounter:SHIELD:1
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, up to one other target creature gains flying until end of turn.
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.Other | TgtPrompt$ Select up to one other target creature | TargetMin$ 0 | TargetMax$ 1 | KW$ Flying
-DeckHas:Ability$Counters
 SVar:HasAttackEffect:TRUE
+DeckHas:Ability$Counters
 Oracle:Wingshield Agent enters with a shield counter on it. (If it would be dealt damage or destroyed, remove a shield counter from it instead.)\nWhenever Wingshield Agent attacks, up to one other target creature gains flying until end of turn.
diff --git a/forge-gui/res/cardsfolder/w/witherbloom_apprentice.txt b/forge-gui/res/cardsfolder/w/witherbloom_apprentice.txt
index d3f20709595..301b80b6bef 100644
--- a/forge-gui/res/cardsfolder/w/witherbloom_apprentice.txt
+++ b/forge-gui/res/cardsfolder/w/witherbloom_apprentice.txt
@@ -5,6 +5,6 @@ PT:2/2
 T:Mode$ SpellCastOrCopy | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ Magecraft — Whenever you cast or copy an instant or sorcery spell, each opponent loses 1 life and you gain 1 life.
 SVar:TrigDrain:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1 | SubAbility$ DBGainOneLife
 SVar:DBGainOneLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
-DeckNeeds:Type$Instant|Sorcery
 DeckHas:Ability$LifeGain
+DeckNeeds:Type$Instant|Sorcery
 Oracle:Magecraft — Whenever you cast or copy an instant or sorcery spell, each opponent loses 1 life and you gain 1 life.
diff --git a/forge-gui/res/cardsfolder/w/wizards_rockets.txt b/forge-gui/res/cardsfolder/w/wizards_rockets.txt
index b75be43802c..b5fba968645 100644
--- a/forge-gui/res/cardsfolder/w/wizards_rockets.txt
+++ b/forge-gui/res/cardsfolder/w/wizards_rockets.txt
@@ -7,7 +7,7 @@ A:AB$ Mana | Cost$ X T Sac<1/CARDNAME> | Produced$ Combo Any | Amount$ X | Spell
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ TriggeredCardController | NumCards$ 1
 SVar:X:Count$xPaid
+SVar:SacMe:1
 AI:RemoveDeck:All
 DeckHas:Ability$Sacrifice
-SVar:SacMe:1
 Oracle:Wizard's Rockets enters tapped.\n{X}, {T}, Sacrifice Wizard's Rockets: Add X mana in any combination of colors.\nWhen Wizard's Rockets is put into a graveyard from the battlefield, draw a card.
diff --git a/forge-gui/res/cardsfolder/w/wormwood_treefolk.txt b/forge-gui/res/cardsfolder/w/wormwood_treefolk.txt
index cdf47e71e4e..f3d40a32f2e 100644
--- a/forge-gui/res/cardsfolder/w/wormwood_treefolk.txt
+++ b/forge-gui/res/cardsfolder/w/wormwood_treefolk.txt
@@ -5,6 +5,6 @@ PT:4/4
 A:AB$ Pump | Cost$ G G | KW$ Landwalk:Forest | Defined$ Self | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME gains forestwalk until end of turn and deals 2 damage to you. (It can't be blocked as long as defending player controls a Forest.)
 A:AB$ Pump | Cost$ B B | KW$ Landwalk:Swamp | Defined$ Self | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME gains swampwalk until end of turn and deals 2 damage to you. (It can't be blocked as long as defending player controls a Swamp.)
 SVar:DBDealDamage:DB$ DealDamage | Defined$ You | NumDmg$ 2
-DeckNeeds:Color$Black
 DeckHas:Keyword$Swampwalk|Forestwalk
+DeckNeeds:Color$Black
 Oracle:{G}{G}: Wormwood Treefolk gains forestwalk until end of turn and deals 2 damage to you. (It can't be blocked as long as defending player controls a Forest.)\n{B}{B}: Wormwood Treefolk gains swampwalk until end of turn and deals 2 damage to you. (It can't be blocked as long as defending player controls a Swamp.)
diff --git a/forge-gui/res/cardsfolder/x/xanders_pact.txt b/forge-gui/res/cardsfolder/x/xanders_pact.txt
index 2aad65dacc6..20c1f9360d7 100644
--- a/forge-gui/res/cardsfolder/x/xanders_pact.txt
+++ b/forge-gui/res/cardsfolder/x/xanders_pact.txt
@@ -6,6 +6,6 @@ A:SP$ Dig | Defined$ Opponent | DestinationZone$ Exile | DigNum$ 1 | ChangeNum$
 SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ STPlay | SubAbility$ DBCleanup | ForgetOnMoved$ Exile | SpellDescription$ You may cast spells from among those cards this turn. If you cast a spell this way, pay life equal to that spell's mana value rather than pay its mana cost.
 SVar:STPlay:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered+nonLand | AffectedZone$ Exile | MayPlayAltManaCost$ PayLife<ConvertedManaCost> | Description$ You may cast spells from among those cards this turn. If you cast a spell this way, pay life equal to that spell's mana value rather than pay its mana cost.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-DeckHas:Ability$Sacrifice
 SVar:AIPreference:SacCost$Creature.token+powerEQ2,Creature.powerEQ2
+DeckHas:Ability$Sacrifice
 Oracle:Casualty 2 (As you cast this spell, you may sacrifice a creature with power 2 or greater. When you do, copy this spell.)\nEach opponent exiles the top card of their library. You may cast spells from among those cards this turn. If you cast a spell this way, pay life equal to that spell's mana value rather than pay its mana cost.
diff --git a/forge-gui/res/cardsfolder/x/xolatoyac_the_smiling_flood.txt b/forge-gui/res/cardsfolder/x/xolatoyac_the_smiling_flood.txt
index 35961a80fcd..a39bb6314a1 100644
--- a/forge-gui/res/cardsfolder/x/xolatoyac_the_smiling_flood.txt
+++ b/forge-gui/res/cardsfolder/x/xolatoyac_the_smiling_flood.txt
@@ -9,7 +9,7 @@ SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ Fountain
 SVar:FountainStatic:Mode$ Continuous | EffectZone$ Command | Affected$ Card.IsRemembered | AddType$ Island | Description$ That land is an island in addition to its other types for as long as it has a flood counter on it.
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ At the beginning of your end step, untap each permanent you control with a counter on it.
 SVar:TrigUntap:DB$ UntapAll | ValidCards$ Permanent.YouCtrl+HasCounters
+SVar:HasAttackEffect:TRUE
 DeckHas:Ability$Counters
 DeckHints:Ability$Counters
-SVar:HasAttackEffect:TRUE
 Oracle:Whenever Xolatoyac, the Smiling Flood enters or attacks, put a flood counter on target land. That land is an Island in addition to its other types for as long as it has a flood counter on it.\nAt the beginning of your end step, untap each permanent you control with a counter on it.
diff --git a/forge-gui/res/cardsfolder/y/yawgmoth_demon.txt b/forge-gui/res/cardsfolder/y/yawgmoth_demon.txt
index 67627ab45b9..5b0e2397ddb 100644
--- a/forge-gui/res/cardsfolder/y/yawgmoth_demon.txt
+++ b/forge-gui/res/cardsfolder/y/yawgmoth_demon.txt
@@ -12,6 +12,6 @@ SVar:DBElderSpawnCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:NeedsToPlayVar:Z GE3
 SVar:Z:Count$Valid Artifact.YouCtrl+inZoneBattlefield
 AI:RemoveDeck:Random
-DeckNeeds:Type$Artifact
 DeckHas:Ability$Sacrifice
+DeckNeeds:Type$Artifact
 Oracle:Flying (This creature can't be blocked except by creatures with flying or reach.)\nFirst strike (This creature deals combat damage before creatures without first strike.)\nAt the beginning of your upkeep, you may sacrifice an artifact. If you don't, tap Yawgmoth Demon and it deals 2 damage to you.
diff --git a/forge-gui/res/cardsfolder/y/yotian_courier.txt b/forge-gui/res/cardsfolder/y/yotian_courier.txt
index e478a7a941f..ebc8042f281 100644
--- a/forge-gui/res/cardsfolder/y/yotian_courier.txt
+++ b/forge-gui/res/cardsfolder/y/yotian_courier.txt
@@ -8,7 +8,7 @@ SVar:TrigCharm:DB$ Charm | Choices$ Powerstone,Seek | ChoiceRestriction$ YourLas
 SVar:Powerstone:DB$ Token | TokenTapped$ True | TokenScript$ c_a_powerstone | SpellDescription$ Create a tapped Powerstone token.
 SVar:Seek:DB$ Seek | Type$ Card.nonLand+cmcEQX | SpellDescription$ Seek a nonland card with mana value equal to the number of Powerstones you control.
 SVar:X:Count$Valid Powerstone.YouCtrl
-DeckNeeds:Type$Artifact
-DeckHas:Ability$Token & Type$Artifact
 SVar:HasAttackEffect:TRUE
+DeckHas:Ability$Token & Type$Artifact
+DeckNeeds:Type$Artifact
 Oracle:Flying\nWhenever Yotian Courier attacks, choose one that wasn't chosen during your last combat —\n• Create a tapped Powerstone token.\n• Seek a nonland card with mana value equal to the number of Powerstones you control.
diff --git a/forge-gui/res/cardsfolder/y/young_necromancer.txt b/forge-gui/res/cardsfolder/y/young_necromancer.txt
index 3cad8924c6e..7c7e07ce3e3 100644
--- a/forge-gui/res/cardsfolder/y/young_necromancer.txt
+++ b/forge-gui/res/cardsfolder/y/young_necromancer.txt
@@ -5,10 +5,10 @@ PT:2/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigImmediateTrig | TriggerDescription$ When CARDNAME enters, you may exile two cards from your graveyard. When you do, return target creature card from your graveyard to the battlefield.
 SVar:TrigImmediateTrig:AB$ ImmediateTrigger | Cost$ ExileFromGrave<2/card> | Execute$ TrigReturn | SpellDescription$ When you do, return target creature card from your graveyard to the battlefield.
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select target creature to return from your graveyard
-DeckHas:Ability$Graveyard
-DeckHints:Ability$Discard
 SVar:NeedsToPlayVar:Z EQ3
 SVar:X:Count$InYourYard/LimitMax.3
 SVar:Y:Count$TypeInYourYard.Creature/LimitMax.1
 SVar:Z:SVar$X/Times.Y
+DeckHas:Ability$Graveyard
+DeckHints:Ability$Discard
 Oracle:When Young Necromancer enters, you may exile two cards from your graveyard. When you do, return target creature card from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/z/zaffai_thunder_conductor.txt b/forge-gui/res/cardsfolder/z/zaffai_thunder_conductor.txt
index 07ce4a04ad2..94d30ce4773 100644
--- a/forge-gui/res/cardsfolder/z/zaffai_thunder_conductor.txt
+++ b/forge-gui/res/cardsfolder/z/zaffai_thunder_conductor.txt
@@ -7,7 +7,7 @@ SVar:DBScry:DB$ Scry | ScryNum$ 1 | SubAbility$ DBToken
 SVar:DBToken:DB$ Token | TokenScript$ ur_4_4_elemental | TokenOwner$ You | ConditionCheckSVar$ TriggeredStackInstance$CardManaCostLKI | ConditionSVarCompare$ GE5 | SubAbility$ DBChoose
 SVar:DBChoose:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | Random$ True | SubAbility$ DBDamage
 SVar:DBDamage:DB$ DealDamage | NumDmg$ 10 | Defined$ ChosenPlayer | ConditionCheckSVar$ TriggeredStackInstance$CardManaCostLKI | ConditionSVarCompare$ GE10
-DeckHas:Ability$Token
 SVar:BuffedBy:Instant,Sorcery
+DeckHas:Ability$Token
 DeckHints:Type$Instant|Sorcery
 Oracle:Magecraft — Whenever you cast or copy an instant or sorcery spell, scry 1. If that spell's mana value is 5 or greater, create a 4/4 blue and red Elemental creature token. If that spell's mana value is 10 or greater, Zaffai, Thunder Conductor deals 10 damage to an opponent chosen at random.
diff --git a/forge-gui/res/cardsfolder/z/zur_eternal_schemer.txt b/forge-gui/res/cardsfolder/z/zur_eternal_schemer.txt
index 5f047067baf..a2c21c7cd65 100644
--- a/forge-gui/res/cardsfolder/z/zur_eternal_schemer.txt
+++ b/forge-gui/res/cardsfolder/z/zur_eternal_schemer.txt
@@ -6,6 +6,6 @@ K:Flying
 S:Mode$ Continuous | Affected$ Creature.Enchantment+YouCtrl | AddKeyword$ Deathtouch & Lifelink & Hexproof | Description$ Enchantment creatures you control have deathtouch, lifelink, and hexproof.
 A:AB$ Animate | Cost$ 1 W | ValidTgts$ Enchantment.nonAura+YouCtrl | TgtPrompt$ Select target non-Aura enchantment you control | Power$ X | Toughness$ X | Types$ Creature | Duration$ Permanent | StackDescription$ {c:Targeted} becomes a creature in addition to its other types and has base power and toughness each equal to its mana value. | SpellDescription$ Target non-Aura enchantment you control becomes a creature in addition to its other types and has base power and toughness each equal to its mana value.
 SVar:X:Targeted$CardManaCost
-DeckNeeds:Type$Enchantment
 DeckHas:Ability$LifeGain
+DeckNeeds:Type$Enchantment
 Oracle:Flying\nEnchantment creatures you control have deathtouch, lifelink, and hexproof.\n{1}{W}: Target non-Aura enchantment you control becomes a creature in addition to its other types and has base power and toughness each equal to its mana value.