diff --git a/forge-core/src/main/java/forge/util/ImageUtil.java b/forge-core/src/main/java/forge/util/ImageUtil.java
index 6f759553c05..0e886d4ad46 100644
--- a/forge-core/src/main/java/forge/util/ImageUtil.java
+++ b/forge-core/src/main/java/forge/util/ImageUtil.java
@@ -236,9 +236,15 @@ public class ImageUtil {
         } else if (cp.getRules().getSplitType() == CardSplitType.Meld
                     && !cardCollectorNumber.endsWith("a")
                     && !cardCollectorNumber.endsWith("b")) {
-            // Only the bottom half of a meld card shares a collector number.
-            // Hanweir Garrison EMN already has a appended.
-            cardCollectorNumber += face.equals("back") ? "b" : "a";
+
+                // Only the bottom half of a meld card shares a collector number.
+                // Hanweir Garrison EMN already has a appended.
+                // Exception: The front facing card doesn't use a in FIN
+                if (face.equals("back")) {
+                    cardCollectorNumber += "b";
+                } else if (!editionCode.equals("fin")) {
+                    cardCollectorNumber += "a";
+                }
         }
 
         String cardCollectorNumberEncoded;
diff --git a/forge-gui/res/cardsfolder/upcoming/archenemys_charm.txt b/forge-gui/res/cardsfolder/upcoming/archenemys_charm.txt
index f28d060d15d..220938dc06a 100644
--- a/forge-gui/res/cardsfolder/upcoming/archenemys_charm.txt
+++ b/forge-gui/res/cardsfolder/upcoming/archenemys_charm.txt
@@ -1,9 +1,9 @@
-Name:Archenemy's Charm
-ManaCost:B B B
-Types:Instant
-A:SP$ Charm | Choices$ DBExile,DBReturn,DBPutCounter
-SVar:DBExile:DB$ ChangeZone | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature or planeswalker.
-SVar:DBReturn:DB$ ChangeZone | ValidTgts$ Creature.YouOwn,Planeswalker.YouOwn | TgtPrompt$ Select target creature or planeswalker card in your graveyard | TargetMin$ 1 | TargetMax$ 2 | TgtZone$ Graveyard | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return one or two target creature and/or planeswalker cards from your graveyard to your hand.
-SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$ DBPump | SpellDescription$ Put two +1/+1 counters on target creature you control. It gains lifelink until end of turn.
-SVar:DBPump:DB$ Pump | Defined$ ParentTarget | KW$ Lifelink
-Oracle:Choose one —\n• Exile target creature or planeswalker.\n• Return one or two target creature and/or planeswalker cards from your graveyard to your hand.\n• Put two +1/+1 counters on target creature you control. It gains lifelink until end of turn.
+Name:Archenemy's Charm
+ManaCost:B B B
+Types:Instant
+A:SP$ Charm | Choices$ DBExile,DBReturn,DBPutCounter
+SVar:DBExile:DB$ ChangeZone | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile target creature or planeswalker.
+SVar:DBReturn:DB$ ChangeZone | ValidTgts$ Creature.YouOwn,Planeswalker.YouOwn | TgtPrompt$ Select target creature or planeswalker card in your graveyard | TargetMin$ 1 | TargetMax$ 2 | TgtZone$ Graveyard | Origin$ Graveyard | Destination$ Hand | SpellDescription$ Return one or two target creature and/or planeswalker cards from your graveyard to your hand.
+SVar:DBPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$ DBPump | SpellDescription$ Put two +1/+1 counters on target creature you control. It gains lifelink until end of turn.
+SVar:DBPump:DB$ Pump | Defined$ ParentTarget | KW$ Lifelink
+Oracle:Choose one —\n• Exile target creature or planeswalker.\n• Return one or two target creature and/or planeswalker cards from your graveyard to your hand.\n• Put two +1/+1 counters on target creature you control. It gains lifelink until end of turn.
diff --git a/forge-gui/res/cardsfolder/upcoming/beyond_the_quiet.txt b/forge-gui/res/cardsfolder/upcoming/beyond_the_quiet.txt
index 0bbcc0c2a43..d9d5a5a760e 100644
--- a/forge-gui/res/cardsfolder/upcoming/beyond_the_quiet.txt
+++ b/forge-gui/res/cardsfolder/upcoming/beyond_the_quiet.txt
@@ -1,5 +1,5 @@
-Name:Beyond the Quiet
-ManaCost:3 W W
-Types:Sorcery
-A:SP$ ChangeZoneAll | ChangeType$ Creature,Spacecraft | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile all creatures and Spacecraft.
+Name:Beyond the Quiet
+ManaCost:3 W W
+Types:Sorcery
+A:SP$ ChangeZoneAll | ChangeType$ Creature,Spacecraft | Origin$ Battlefield | Destination$ Exile | SpellDescription$ Exile all creatures and Spacecraft.
 Oracle:Exile all creatures and Spacecraft.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/biotech_specialist.txt b/forge-gui/res/cardsfolder/upcoming/biotech_specialist.txt
index 3f3fb58f2bf..934b64d1177 100644
--- a/forge-gui/res/cardsfolder/upcoming/biotech_specialist.txt
+++ b/forge-gui/res/cardsfolder/upcoming/biotech_specialist.txt
@@ -1,9 +1,9 @@
-Name:Biotech Specialist
-ManaCost:R G
-Types:Creature Insect Scientist
-PT:1/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this creature enters, create a Lander token. (It's an artifact with "{2}, {T}, Sacrifice this token: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.")
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_lander_sac_search | TokenOwner$ You
-T:Mode$ Sacrificed | ValidCard$ Artifact | ValidPlayer$ You | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever you sacrifice an artifact, this creature deals 2 damage to target opponent.
-SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumDmg$ 2
+Name:Biotech Specialist
+ManaCost:R G
+Types:Creature Insect Scientist
+PT:1/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this creature enters, create a Lander token. (It's an artifact with "{2}, {T}, Sacrifice this token: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.")
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_lander_sac_search | TokenOwner$ You
+T:Mode$ Sacrificed | ValidCard$ Artifact | ValidPlayer$ You | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever you sacrifice an artifact, this creature deals 2 damage to target opponent.
+SVar:TrigDamage:DB$ DealDamage | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | NumDmg$ 2
 Oracle:When this creature enters, create a Lander token. (It's an artifact with "{2}, {T}, Sacrifice this token: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.")\nWhenever you sacrifice an artifact, this creature deals 2 damage to target opponent.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/cosmogoyf.txt b/forge-gui/res/cardsfolder/upcoming/cosmogoyf.txt
index 028c773159d..cc8655f06df 100644
--- a/forge-gui/res/cardsfolder/upcoming/cosmogoyf.txt
+++ b/forge-gui/res/cardsfolder/upcoming/cosmogoyf.txt
@@ -1,8 +1,8 @@
-Name:Cosmogoyf
-ManaCost:B G
-Types:Creature Elemental Lhurgoyf
-PT:*/1+*
-S:Mode$ Continuous | CharacteristicDefining$ True | SetPower$ X | SetToughness$ Y | Description$ This creature's power is equal to the number of cards you own in exile and its toughness is equal to that number plus 1.
-SVar:X:Count$ValidExile Card.YouOwn
-SVar:Y:Count$ValidExile Card.YouOwn/Plus.1
+Name:Cosmogoyf
+ManaCost:B G
+Types:Creature Elemental Lhurgoyf
+PT:*/1+*
+S:Mode$ Continuous | CharacteristicDefining$ True | SetPower$ X | SetToughness$ Y | Description$ This creature's power is equal to the number of cards you own in exile and its toughness is equal to that number plus 1.
+SVar:X:Count$ValidExile Card.YouOwn
+SVar:Y:Count$ValidExile Card.YouOwn/Plus.1
 Oracle:This creature's power is equal to the number of cards you own in exile and its toughness is equal to that number plus 1.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/entropic_battlecruiser.txt b/forge-gui/res/cardsfolder/upcoming/entropic_battlecruiser.txt
index 6ff13770951..537ed89684c 100644
--- a/forge-gui/res/cardsfolder/upcoming/entropic_battlecruiser.txt
+++ b/forge-gui/res/cardsfolder/upcoming/entropic_battlecruiser.txt
@@ -1,15 +1,15 @@
-Name:Entropic Battlecruiser
-ManaCost:3 B
-Types:Artifact Spacecraft
-PT:3/10
-K:Station:8
-S:Mode$ Continuous | Affected$ Card.Self+counters_GE1_CHARGE | AddTrigger$ DiscardTrig | Description$ STATION 1+ Whenever an opponent discards a card, they lose 3 life.
-SVar:DiscardTrig:Mode$ Discarded | ValidCard$ Card.OppOwn | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever an opponent discards a card, they lose 3 life.
-SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredCardController | LifeAmount$ 3
-S:Mode$ Continuous | Affected$ Card.Self+counters_GE8_CHARGE | AddType$ Creature | AddKeyword$ Flying & Deathtouch | AddTrigger$ AttackTrig | Description$ STATION 8+ Flying, deathtouch,,,Whenever this Spacecraft attacks, each opponent discards a card. Each opponent who can't loses 3 life.
-SVar:AttackTrig:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ Whenever this Spacecraft attacks, each opponent discards a card. Each opponent who can't loses 3 life.
-SVar:TrigDiscard:DB$ Discard | Mode$ TgtChoose | Defined$ Opponent | NumCards$ 1 | RememberDiscarded$ True | SubAbility$ DBLoseLife
-SVar:DBLoseLife:DB$ LoseLife | Defined$ OppNonRememberedController | LifeAmount$ 3 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:HasAttackEffect:TRUE
-Oracle:Station (Tap another creature you control: Put charge counters equal to its power on this Spacecraft. Station only as a sorcery. It's an artifact creature at 8+.)\nSTATION 1+\nWhenever an opponent discards a card, they lose 3 life.\nSTATION 8+\nFlying, deathtouch\nWhenever this Spacecraft attacks, each opponent discards a card. Each opponent who can't loses 3 life.
+Name:Entropic Battlecruiser
+ManaCost:3 B
+Types:Artifact Spacecraft
+PT:3/10
+K:Station:8
+S:Mode$ Continuous | Affected$ Card.Self+counters_GE1_CHARGE | AddTrigger$ DiscardTrig | Description$ STATION 1+ Whenever an opponent discards a card, they lose 3 life.
+SVar:DiscardTrig:Mode$ Discarded | ValidCard$ Card.OppOwn | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever an opponent discards a card, they lose 3 life.
+SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredCardController | LifeAmount$ 3
+S:Mode$ Continuous | Affected$ Card.Self+counters_GE8_CHARGE | AddType$ Creature | AddKeyword$ Flying & Deathtouch | AddTrigger$ AttackTrig | Description$ STATION 8+ Flying, deathtouch,,,Whenever this Spacecraft attacks, each opponent discards a card. Each opponent who can't loses 3 life.
+SVar:AttackTrig:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ Whenever this Spacecraft attacks, each opponent discards a card. Each opponent who can't loses 3 life.
+SVar:TrigDiscard:DB$ Discard | Mode$ TgtChoose | Defined$ Opponent | NumCards$ 1 | RememberDiscarded$ True | SubAbility$ DBLoseLife
+SVar:DBLoseLife:DB$ LoseLife | Defined$ OppNonRememberedController | LifeAmount$ 3 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:HasAttackEffect:TRUE
+Oracle:Station (Tap another creature you control: Put charge counters equal to its power on this Spacecraft. Station only as a sorcery. It's an artifact creature at 8+.)\nSTATION 1+\nWhenever an opponent discards a card, they lose 3 life.\nSTATION 8+\nFlying, deathtouch\nWhenever this Spacecraft attacks, each opponent discards a card. Each opponent who can't loses 3 life.
diff --git a/forge-gui/res/cardsfolder/upcoming/extinguisher_battleship.txt b/forge-gui/res/cardsfolder/upcoming/extinguisher_battleship.txt
index 54991bbc64f..68e03445262 100644
--- a/forge-gui/res/cardsfolder/upcoming/extinguisher_battleship.txt
+++ b/forge-gui/res/cardsfolder/upcoming/extinguisher_battleship.txt
@@ -1,11 +1,11 @@
-Name:Extinguisher Battleship
-ManaCost:8
-Types:Artifact Spacecraft
-PT:10/10
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When this Spacecraft enters, destroy target noncreature permanent. Then this Spacecraft deals 4 damage to each creature.
-SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Permanent.nonCreature | SubAbility$ DBDamageAll | TgtPrompt$ Select target noncreature permanent
-SVar:DBDamageAll:DB$ DamageAll | ValidCards$ Creature | NumDmg$ 4 | ValidDescription$ each creature.
-K:Station:5
-S:Mode$ Continuous | Affected$ Card.Self+counters_GE5_CHARGE | AddType$ Creature | AddKeyword$ Flying & Trample | Description$ STATION 5+ Flying, trample
-SVar:PlayMain1:TRUE
+Name:Extinguisher Battleship
+ManaCost:8
+Types:Artifact Spacecraft
+PT:10/10
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When this Spacecraft enters, destroy target noncreature permanent. Then this Spacecraft deals 4 damage to each creature.
+SVar:TrigDestroy:DB$ Destroy | ValidTgts$ Permanent.nonCreature | SubAbility$ DBDamageAll | TgtPrompt$ Select target noncreature permanent
+SVar:DBDamageAll:DB$ DamageAll | ValidCards$ Creature | NumDmg$ 4 | ValidDescription$ each creature.
+K:Station:5
+S:Mode$ Continuous | Affected$ Card.Self+counters_GE5_CHARGE | AddType$ Creature | AddKeyword$ Flying & Trample | Description$ STATION 5+ Flying, trample
+SVar:PlayMain1:TRUE
 Oracle:When this Spacecraft enters, destroy target noncreature permanent. Then this Spacecraft deals 4 damage to each creature.\nStation (Tap another creature you control: Put charge counters equal to its power on this Spacecraft. Station only as a sorcery. It's an artifact creature at 5+.)\nSTATION 5+\nFlying, trample
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/frenzied_baloth.txt b/forge-gui/res/cardsfolder/upcoming/frenzied_baloth.txt
index ffb34ac4997..93d8ce23be0 100644
--- a/forge-gui/res/cardsfolder/upcoming/frenzied_baloth.txt
+++ b/forge-gui/res/cardsfolder/upcoming/frenzied_baloth.txt
@@ -1,11 +1,11 @@
-Name:Frenzied Baloth
-ManaCost:G G
-Types:Creature Beast
-PT:3/2
-R:Event$ Counter | ValidCard$ Card.Self | ValidSA$ Spell | Layer$ CantHappen | Description$ This spell can't be countered.
-K:Trample
-K:Haste
-R:Event$ Counter | ValidSA$ Spell.Creature+YouCtrl | Layer$ CantHappen | ActiveZones$ Battlefield | Description$ Creature spells you control can't be countered.
-S:Mode$ CantPreventDamage | IsCombat$ True | Description$ Combat damage can't be prevented.
-SVar:PlayMain1:TRUE
-Oracle:This spell can't be countered.\nTrample, haste\nCreature spells you control can't be countered.\nCombat damage can't be prevented.
+Name:Frenzied Baloth
+ManaCost:G G
+Types:Creature Beast
+PT:3/2
+R:Event$ Counter | ValidCard$ Card.Self | ValidSA$ Spell | Layer$ CantHappen | Description$ This spell can't be countered.
+K:Trample
+K:Haste
+R:Event$ Counter | ValidSA$ Spell.Creature+YouCtrl | Layer$ CantHappen | ActiveZones$ Battlefield | Description$ Creature spells you control can't be countered.
+S:Mode$ CantPreventDamage | IsCombat$ True | Description$ Combat damage can't be prevented.
+SVar:PlayMain1:TRUE
+Oracle:This spell can't be countered.\nTrample, haste\nCreature spells you control can't be countered.\nCombat damage can't be prevented.
diff --git a/forge-gui/res/cardsfolder/upcoming/galactic_wayfarer.txt b/forge-gui/res/cardsfolder/upcoming/galactic_wayfarer.txt
index 890f42028a7..a0d3eadb7b5 100644
--- a/forge-gui/res/cardsfolder/upcoming/galactic_wayfarer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/galactic_wayfarer.txt
@@ -1,7 +1,7 @@
-Name:Galactic Wayfarer
-ManaCost:2 G
-Types:Creature Human Scout
-PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this creature enters, create a Lander token. (It's an artifact with "{2}, {T}, Sacrifice this token: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.")
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_lander_sac_search | TokenOwner$ You
+Name:Galactic Wayfarer
+ManaCost:2 G
+Types:Creature Human Scout
+PT:3/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When this creature enters, create a Lander token. (It's an artifact with "{2}, {T}, Sacrifice this token: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.")
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_lander_sac_search | TokenOwner$ You
 Oracle:When this creature enters, create a Lander token. (It's an artifact with "{2}, {T}, Sacrifice this token: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle.")
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/mutinous_massacre.txt b/forge-gui/res/cardsfolder/upcoming/mutinous_massacre.txt
index 5f6b1558961..718e0150ddd 100644
--- a/forge-gui/res/cardsfolder/upcoming/mutinous_massacre.txt
+++ b/forge-gui/res/cardsfolder/upcoming/mutinous_massacre.txt
@@ -1,7 +1,7 @@
-Name:Mutinous Massacre
-ManaCost:3 B B R R
-Types:Sorcery
-A:SP$ ChooseEvenOdd | StackDescription$ SpellDescription | SubAbility$ DBDestroyAll | SpellDescription$ Choose odd or even. Destroy each creature with mana value of the chosen quality. Then gain control of all creatures until end of turn. Untap them. They gain haste until end of turn. (Zero is even.)
-SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Creature.cmcChosenEvenOdd | SubAbility$ DBGainControl
-SVar:DBGainControl:DB$ GainControl | AllValid$ Creature | Untap$ True | AddKWs$ Haste | LoseControl$ EOT
+Name:Mutinous Massacre
+ManaCost:3 B B R R
+Types:Sorcery
+A:SP$ ChooseEvenOdd | StackDescription$ SpellDescription | SubAbility$ DBDestroyAll | SpellDescription$ Choose odd or even. Destroy each creature with mana value of the chosen quality. Then gain control of all creatures until end of turn. Untap them. They gain haste until end of turn. (Zero is even.)
+SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Creature.cmcChosenEvenOdd | SubAbility$ DBGainControl
+SVar:DBGainControl:DB$ GainControl | AllValid$ Creature | Untap$ True | AddKWs$ Haste | LoseControl$ EOT
 Oracle:Choose odd or even. Destroy each creature with mana value of the chosen quality. Then gain control of all creatures until end of turn. Untap them. They gain haste until end of turn. (Zero is even.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/pain_for_all.txt b/forge-gui/res/cardsfolder/upcoming/pain_for_all.txt
index 9a8332f604a..1c24f46619c 100644
--- a/forge-gui/res/cardsfolder/upcoming/pain_for_all.txt
+++ b/forge-gui/res/cardsfolder/upcoming/pain_for_all.txt
@@ -1,13 +1,13 @@
-Name:Pain for All
-ManaCost:2 R
-Types:Enchantment Aura
-K:Enchant:Creature.YouCtrl:creature you control
-SVar:AttachAILogic:Pump
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When this Aura enters, enchanted creature deals damage equal to its power to any other target.
-SVar:TrigDamage:DB$ DealDamage | DamageSource$ Enchanted | ValidTgts$ Creature.!EnchantedBy,Player,Planeswalker.!EnchantedBy,Battle.!EnchantedBy | NumDmg$ X
-T:Mode$ DamageDoneOnce | ValidTarget$ Card.AttachedBy | Execute$ TrigDamageAll | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature is dealt damage, it deals that much damage to each opponent.
-SVar:TrigDamageAll:DB$ DamageAll | ValidPlayers$ Opponent | NumDmg$ Y | DamageSource$ TriggeredTargetLKICopy
-SVar:X:Enchanted$CardPower
-SVar:Y:TriggerCount$DamageAmount
-SVar:PlayMain1:TRUE
+Name:Pain for All
+ManaCost:2 R
+Types:Enchantment Aura
+K:Enchant:Creature.YouCtrl:creature you control
+SVar:AttachAILogic:Pump
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ When this Aura enters, enchanted creature deals damage equal to its power to any other target.
+SVar:TrigDamage:DB$ DealDamage | DamageSource$ Enchanted | ValidTgts$ Creature.!EnchantedBy,Player,Planeswalker.!EnchantedBy,Battle.!EnchantedBy | NumDmg$ X
+T:Mode$ DamageDoneOnce | ValidTarget$ Card.AttachedBy | Execute$ TrigDamageAll | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted creature is dealt damage, it deals that much damage to each opponent.
+SVar:TrigDamageAll:DB$ DamageAll | ValidPlayers$ Opponent | NumDmg$ Y | DamageSource$ TriggeredTargetLKICopy
+SVar:X:Enchanted$CardPower
+SVar:Y:TriggerCount$DamageAmount
+SVar:PlayMain1:TRUE
 Oracle:Enchant creature you control\nWhen this Aura enters, enchanted creature deals damage equal to its power to any other target.\nWhenever enchanted creature is dealt damage, it deals that much damage to each opponent.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/rust_harvester.txt b/forge-gui/res/cardsfolder/upcoming/rust_harvester.txt
index 192478f80fa..f8bc97406f7 100644
--- a/forge-gui/res/cardsfolder/upcoming/rust_harvester.txt
+++ b/forge-gui/res/cardsfolder/upcoming/rust_harvester.txt
@@ -1,9 +1,9 @@
-Name:Rust Harvester
-ManaCost:R
-Types:Artifact Creature Robot
-PT:1/1
-K:Menace
-A:AB$ PutCounter | Cost$ 2 T ExileFromGrave<1/Artifact/artifact card> | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBDamage | SpellDescription$ Put a +1/+1 counter on this creature, then it deals damage equal to its power to any target.
-SVar:DBDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ X
-SVar:X:Count$CardPower
+Name:Rust Harvester
+ManaCost:R
+Types:Artifact Creature Robot
+PT:1/1
+K:Menace
+A:AB$ PutCounter | Cost$ 2 T ExileFromGrave<1/Artifact/artifact card> | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBDamage | SpellDescription$ Put a +1/+1 counter on this creature, then it deals damage equal to its power to any target.
+SVar:DBDamage:DB$ DealDamage | ValidTgts$ Any | NumDmg$ X
+SVar:X:Count$CardPower
 Oracle:Menace\n{2}, {T}, Exile an artifact card from your graveyard: Put a +1/+1 counter on this creature, then it deals damage equal to its power to any target.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/secluded_starforge.txt b/forge-gui/res/cardsfolder/upcoming/secluded_starforge.txt
index 3e624ef00c9..a826ba0d203 100644
--- a/forge-gui/res/cardsfolder/upcoming/secluded_starforge.txt
+++ b/forge-gui/res/cardsfolder/upcoming/secluded_starforge.txt
@@ -1,8 +1,8 @@
-Name:Secluded Starforge
-ManaCost:no cost
-Types:Land
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Pump | Cost$ 2 T tapXType<X/Artifact> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +X | SorcerySpeed$ True | SpellDescription$ Target creature gets +X/+0 until end of turn. Activate only as a sorcery.
-A:AB$ Token | Cost$ 5 T | TokenOwner$ You | TokenAmount$ 1 | TokenScript$ c_2_2_a_robot | SpellDescription$ Create a 2/2 colorless Robot artifact creature token.
-SVar:X:Count$xPaid
+Name:Secluded Starforge
+ManaCost:no cost
+Types:Land
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Pump | Cost$ 2 T tapXType<X/Artifact> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +X | SorcerySpeed$ True | SpellDescription$ Target creature gets +X/+0 until end of turn. Activate only as a sorcery.
+A:AB$ Token | Cost$ 5 T | TokenOwner$ You | TokenAmount$ 1 | TokenScript$ c_2_2_a_robot | SpellDescription$ Create a 2/2 colorless Robot artifact creature token.
+SVar:X:Count$xPaid
 Oracle:{T}: Add {C}.\n{2}, {T}, Tap X untapped artifacts you control: Target creature gets +X/+0 until end of turn. Activate only as a sorcery.\n{5}, {T}: Create a 2/2 colorless Robot artifact creature token.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/sledge_class_seedship.txt b/forge-gui/res/cardsfolder/upcoming/sledge_class_seedship.txt
index 1abd38098e1..e0d70bf7e97 100644
--- a/forge-gui/res/cardsfolder/upcoming/sledge_class_seedship.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sledge_class_seedship.txt
@@ -1,10 +1,10 @@
-Name:Sledge-Class Seedship
-ManaCost:2 G
-Types:Artifact Spacecraft
-PT:4/5
-K:Station:7
-S:Mode$ Continuous | Affected$ Card.Self+counters_GE7_CHARGE | AddType$ Creature | AddKeyword$ Flying | AddTrigger$ AttackTrig | Description$ STATION 7+ Flying,,,Whenever this Spacecraft attacks, you may put a creature card from your hand onto the battlefield.
-SVar:AttackTrig:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ Whenever this Spacecraft attacks, you may put a creature card from your hand onto the battlefield.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 1
-SVar:HasAttackEffect:TRUE
-Oracle:Station (Tap another creature you control: Put charge counters equal to its power on this Spacecraft. Station only as a sorcery. It's an artifact creature at 7+.)\nSTATION 7+\nFlying\nWhenever this Spacecraft attacks, you may put a creature card from your hand onto the battlefield.
+Name:Sledge-Class Seedship
+ManaCost:2 G
+Types:Artifact Spacecraft
+PT:4/5
+K:Station:7
+S:Mode$ Continuous | Affected$ Card.Self+counters_GE7_CHARGE | AddType$ Creature | AddKeyword$ Flying | AddTrigger$ AttackTrig | Description$ STATION 7+ Flying,,,Whenever this Spacecraft attacks, you may put a creature card from your hand onto the battlefield.
+SVar:AttackTrig:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ Whenever this Spacecraft attacks, you may put a creature card from your hand onto the battlefield.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature | ChangeNum$ 1
+SVar:HasAttackEffect:TRUE
+Oracle:Station (Tap another creature you control: Put charge counters equal to its power on this Spacecraft. Station only as a sorcery. It's an artifact creature at 7+.)\nSTATION 7+\nFlying\nWhenever this Spacecraft attacks, you may put a creature card from your hand onto the battlefield.
diff --git a/forge-gui/res/cardsfolder/upcoming/space_time_anomaly.txt b/forge-gui/res/cardsfolder/upcoming/space_time_anomaly.txt
index 4ddd915f731..f8de4640fcf 100644
--- a/forge-gui/res/cardsfolder/upcoming/space_time_anomaly.txt
+++ b/forge-gui/res/cardsfolder/upcoming/space_time_anomaly.txt
@@ -1,6 +1,6 @@
-Name:Space-Time Anomaly
-ManaCost:2 W U
-Types:Sorcery
-A:SP$ Mill | NumCards$ X | ValidTgts$ Opponent | SpellDescription$ Target opponent mills cards equal to your life total.
-SVar:X:Count$YourLifeTotal
+Name:Space-Time Anomaly
+ManaCost:2 W U
+Types:Sorcery
+A:SP$ Mill | NumCards$ X | ValidTgts$ Opponent | SpellDescription$ Target opponent mills cards equal to your life total.
+SVar:X:Count$YourLifeTotal
 Oracle:Target opponent mills cards equal to your life total.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/sunset_saboteur.txt b/forge-gui/res/cardsfolder/upcoming/sunset_saboteur.txt
index 81d2e7b97da..fa4c6bfdffc 100644
--- a/forge-gui/res/cardsfolder/upcoming/sunset_saboteur.txt
+++ b/forge-gui/res/cardsfolder/upcoming/sunset_saboteur.txt
@@ -1,9 +1,9 @@
-Name:Sunset Saboteur
-ManaCost:1 B
-Types:Creature Human Rogue
-PT:4/1
-K:Menace
-K:Ward:Discard<1/Card>
-T:Mode$ Attacks | ValidCard$ Creature.Self | Execute$ TrigPutCounter | TriggerDescription$ Whenever this creature attacks, put a +1/+1 counter on target creature an opponent controls.
-SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | CounterType$ P1P1 | CounterNum$ 1
+Name:Sunset Saboteur
+ManaCost:1 B
+Types:Creature Human Rogue
+PT:4/1
+K:Menace
+K:Ward:Discard<1/Card>
+T:Mode$ Attacks | ValidCard$ Creature.Self | Execute$ TrigPutCounter | TriggerDescription$ Whenever this creature attacks, put a +1/+1 counter on target creature an opponent controls.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | CounterType$ P1P1 | CounterNum$ 1
 Oracle:Menace\nWard—Discard a card.\nWhenever this creature attacks, put a +1/+1 counter on target creature an opponent controls.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/synthesizer_labship.txt b/forge-gui/res/cardsfolder/upcoming/synthesizer_labship.txt
index 5d9aa2b1925..2108d4aaf73 100644
--- a/forge-gui/res/cardsfolder/upcoming/synthesizer_labship.txt
+++ b/forge-gui/res/cardsfolder/upcoming/synthesizer_labship.txt
@@ -1,11 +1,11 @@
-Name:Synthesizer Labship
-ManaCost:U
-Types:Artifact Spacecraft
-PT:4/4
-K:Station:9
-S:Mode$ Continuous | Affected$ Card.Self+counters_GE2_CHARGE | AddTrigger$ CombatTrig | Description$ STATION 2+ At the beginning of combat on your turn, up to one other target artifact you control becomes an artifact creature with base power and toughness 2/2 and gains flying until end of turn.
-SVar:CombatTrig:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigAnimate | TriggerDescription$ At the beginning of combat on your turn, up to one other target artifact you control becomes an artifact creature with base power and toughness 2/2 and gains flying until end of turn.
-SVar:TrigAnimate:DB$ Animate | ValidTgts$ Artifact.Other+YouCtrl | TgtPrompt$ Select another target artifact you control | TargetMin$ 0 | TargetMax$ 1 | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature | Keywords$ Flying
-S:Mode$ Continuous | Affected$ Card.Self+counters_GE9_CHARGE | AddType$ Creature | AddKeyword$ Flying & Vigilance | Description$ STATION 9+ Flying, vigilance
-SVar:PlayMain1:TRUE
+Name:Synthesizer Labship
+ManaCost:U
+Types:Artifact Spacecraft
+PT:4/4
+K:Station:9
+S:Mode$ Continuous | Affected$ Card.Self+counters_GE2_CHARGE | AddTrigger$ CombatTrig | Description$ STATION 2+ At the beginning of combat on your turn, up to one other target artifact you control becomes an artifact creature with base power and toughness 2/2 and gains flying until end of turn.
+SVar:CombatTrig:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigAnimate | TriggerDescription$ At the beginning of combat on your turn, up to one other target artifact you control becomes an artifact creature with base power and toughness 2/2 and gains flying until end of turn.
+SVar:TrigAnimate:DB$ Animate | ValidTgts$ Artifact.Other+YouCtrl | TgtPrompt$ Select another target artifact you control | TargetMin$ 0 | TargetMax$ 1 | Power$ 2 | Toughness$ 2 | Types$ Artifact,Creature | Keywords$ Flying
+S:Mode$ Continuous | Affected$ Card.Self+counters_GE9_CHARGE | AddType$ Creature | AddKeyword$ Flying & Vigilance | Description$ STATION 9+ Flying, vigilance
+SVar:PlayMain1:TRUE
 Oracle:Station (Tap another creature you control: Put charge counters equal to its power on this Spacecraft. Station only as a sorcery. It's an artifact creature at 9+.)\nSTATION 2+\nAt the beginning of combat on your turn, up to one other target artifact you control becomes an artifact creature with base power and toughness 2/2 and gains flying until end of turn.\nSTATION 9+\nFlying, vigilance
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/syr_vondam_sunstar_exemplar.txt b/forge-gui/res/cardsfolder/upcoming/syr_vondam_sunstar_exemplar.txt
index cb97b389562..831585be9f2 100644
--- a/forge-gui/res/cardsfolder/upcoming/syr_vondam_sunstar_exemplar.txt
+++ b/forge-gui/res/cardsfolder/upcoming/syr_vondam_sunstar_exemplar.txt
@@ -1,13 +1,13 @@
-Name:Syr Vondam, Sunstar Exemplar
-ManaCost:W B
-Types:Legendary Creature Human Knight
-PT:2/2
-K:Vigilance
-K:Menace
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard,Exile | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature you control dies or is put into exile, put a +1/+1 counter on NICKNAME and you gain 1 life.
-SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBGainLife
-SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard,Exile | ValidCard$ Card.Self+powerGE4 | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ When NICKNAME dies or is put into exile while its power is 4 or greater, destroy up to one target nonland permanent.
-SVar:TrigDestroy:DB$ Destroy | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent
-DeckHas:Ability$Counters
+Name:Syr Vondam, Sunstar Exemplar
+ManaCost:W B
+Types:Legendary Creature Human Knight
+PT:2/2
+K:Vigilance
+K:Menace
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard,Exile | ValidCard$ Creature.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever another creature you control dies or is put into exile, put a +1/+1 counter on NICKNAME and you gain 1 life.
+SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBGainLife
+SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard,Exile | ValidCard$ Card.Self+powerGE4 | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ When NICKNAME dies or is put into exile while its power is 4 or greater, destroy up to one target nonland permanent.
+SVar:TrigDestroy:DB$ Destroy | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent
+DeckHas:Ability$Counters
 Oracle:Vigilance, menace\nWhenever another creature you control dies or is put into exile, put a +1/+1 counter on Syr Vondam and you gain 1 life.\nWhen Syr Vondam dies or is put into exile while its power is 4 or greater, destroy up to one target nonland permanent.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/the_eternity_elevator.txt b/forge-gui/res/cardsfolder/upcoming/the_eternity_elevator.txt
index 3a93a9faae6..369c773590f 100644
--- a/forge-gui/res/cardsfolder/upcoming/the_eternity_elevator.txt
+++ b/forge-gui/res/cardsfolder/upcoming/the_eternity_elevator.txt
@@ -1,9 +1,9 @@
-Name:The Eternity Elevator
-ManaCost:5
-Types:Legendary Artifact Spacecraft
-A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 3 | SpellDescription$ Add {C}{C}{C}.
-K:Station:20
-S:Mode$ Continuous | Affected$ Card.Self+counters_GE20_CHARGE | AddAbility$ ElevatorMana | Description$ STATION 20+ {T}: Add X mana of any one color, where X is the number of charge counters on CARDNAME.
-SVar:ElevatorMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ X | SpellDescription$ Add X mana of any one color, where X is the number of charge counters on CARDNAME.
-SVar:X:Count$CardCounters.CHARGE
-Oracle:{T}: Add {C}{C}{C}.\nStation (Tap another creature you control: Put charge counters equal to its power on this Spacecraft. Station only as a sorcery.)\nSTATION 20+\n{T}: Add X mana of any one color, where X is the number of charge counters on The Eternity Elevator.
+Name:The Eternity Elevator
+ManaCost:5
+Types:Legendary Artifact Spacecraft
+A:AB$ Mana | Cost$ T | Produced$ C | Amount$ 3 | SpellDescription$ Add {C}{C}{C}.
+K:Station:20
+S:Mode$ Continuous | Affected$ Card.Self+counters_GE20_CHARGE | AddAbility$ ElevatorMana | Description$ STATION 20+ {T}: Add X mana of any one color, where X is the number of charge counters on CARDNAME.
+SVar:ElevatorMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ X | SpellDescription$ Add X mana of any one color, where X is the number of charge counters on CARDNAME.
+SVar:X:Count$CardCounters.CHARGE
+Oracle:{T}: Add {C}{C}{C}.\nStation (Tap another creature you control: Put charge counters equal to its power on this Spacecraft. Station only as a sorcery.)\nSTATION 20+\n{T}: Add X mana of any one color, where X is the number of charge counters on The Eternity Elevator.
diff --git a/forge-gui/res/cardsfolder/upcoming/thrumming_hivepool.txt b/forge-gui/res/cardsfolder/upcoming/thrumming_hivepool.txt
index fb292322728..0c755c98322 100644
--- a/forge-gui/res/cardsfolder/upcoming/thrumming_hivepool.txt
+++ b/forge-gui/res/cardsfolder/upcoming/thrumming_hivepool.txt
@@ -1,9 +1,9 @@
-Name:Thrumming Hivepool
-ManaCost:6
-Types:Artifact
-K:Affinity:Sliver
-S:Mode$ Continuous | Affected$ Sliver.YouCtrl | AddKeyword$ Double Strike & Haste | Description$ Slivers you control have double strike and haste.
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, create two 1/1 colorless Sliver creature tokens.
-SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ c_1_1_sliver | TokenOwner$ You
-SVar:PlayMain1:TRUE
-Oracle:Affinity for Slivers (This spell costs {1} less to cast for each Sliver you control.)\nSlivers you control have double strike and haste.\nAt the beginning of your upkeep, create two 1/1 colorless Sliver creature tokens.
+Name:Thrumming Hivepool
+ManaCost:6
+Types:Artifact
+K:Affinity:Sliver
+S:Mode$ Continuous | Affected$ Sliver.YouCtrl | AddKeyword$ Double Strike & Haste | Description$ Slivers you control have double strike and haste.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, create two 1/1 colorless Sliver creature tokens.
+SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ c_1_1_sliver | TokenOwner$ You
+SVar:PlayMain1:TRUE
+Oracle:Affinity for Slivers (This spell costs {1} less to cast for each Sliver you control.)\nSlivers you control have double strike and haste.\nAt the beginning of your upkeep, create two 1/1 colorless Sliver creature tokens.
diff --git a/forge-gui/res/cardsfolder/upcoming/uthros_titanic_godcore.txt b/forge-gui/res/cardsfolder/upcoming/uthros_titanic_godcore.txt
index 1e3975ed12c..fab14f35b81 100644
--- a/forge-gui/res/cardsfolder/upcoming/uthros_titanic_godcore.txt
+++ b/forge-gui/res/cardsfolder/upcoming/uthros_titanic_godcore.txt
@@ -1,11 +1,11 @@
-Name:Uthros, Titanic Godcore
-ManaCost:no cost
-Types:Land Planet
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
-SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
-K:Station:12
-S:Mode$ Continuous | Affected$ Card.Self+counters_GE12_CHARGE | AddAbility$ UthrosMana | Description$ STATION 12+ {U}, {T}: Add {U} for each artifact you control.
-SVar:UthrosMana:AB$ Mana | Cost$ U T | Produced$ U | Amount$ X | SpellDescription$ Add {U} for each artifact you control.
-SVar:X:Count$Valid Artifact.YouCtrl
+Name:Uthros, Titanic Godcore
+ManaCost:no cost
+Types:Land Planet
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplacementResult$ Updated | ReplaceWith$ ETBTapped | Description$ This land enters tapped.
+SVar:ETBTapped:DB$ Tap | Defined$ Self | ETB$ True
+A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}.
+K:Station:12
+S:Mode$ Continuous | Affected$ Card.Self+counters_GE12_CHARGE | AddAbility$ UthrosMana | Description$ STATION 12+ {U}, {T}: Add {U} for each artifact you control.
+SVar:UthrosMana:AB$ Mana | Cost$ U T | Produced$ U | Amount$ X | SpellDescription$ Add {U} for each artifact you control.
+SVar:X:Count$Valid Artifact.YouCtrl
 Oracle:This land enters tapped.\n{T}: Add {U}.\nStation (Tap another creature you control: Put charge counters equal to its power on this Planet. Station only as a sorcery.)\nSTATION 12+\n{U}, {T}: Add {U} for each artifact you control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/xu_ifit_osteoharmonist.txt b/forge-gui/res/cardsfolder/upcoming/xu_ifit_osteoharmonist.txt
index b2c0a3037f4..64a3c02458c 100644
--- a/forge-gui/res/cardsfolder/upcoming/xu_ifit_osteoharmonist.txt
+++ b/forge-gui/res/cardsfolder/upcoming/xu_ifit_osteoharmonist.txt
@@ -1,7 +1,7 @@
-Name:Xu-Ifit, Osteoharmonist
-ManaCost:1 B B
-Types:Legendary Creature Human Wizard
-PT:2/3
-A:AB$ ChangeZone | Cost$ T | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | SorcerySpeed$ True | StaticEffect$ Animate | SpellDescription$ Return target creature card from your graveyard to the battlefield. It's a Skeleton in addition to its other types and has no abilities. Activate only as a sorcery.
-SVar:Animate:Mode$ Continuous | Affected$ Card.IsRemembered | AddType$ Skeleton | RemoveAllAbilities$ True
-Oracle:{T}: Return target creature card from your graveyard to the battlefield. It's a Skeleton in addition to its other types and has no abilities. Activate only as a sorcery.
+Name:Xu-Ifit, Osteoharmonist
+ManaCost:1 B B
+Types:Legendary Creature Human Wizard
+PT:2/3
+A:AB$ ChangeZone | Cost$ T | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | SorcerySpeed$ True | StaticEffect$ Animate | SpellDescription$ Return target creature card from your graveyard to the battlefield. It's a Skeleton in addition to its other types and has no abilities. Activate only as a sorcery.
+SVar:Animate:Mode$ Continuous | Affected$ Card.IsRemembered | AddType$ Skeleton | RemoveAllAbilities$ True
+Oracle:{T}: Return target creature card from your graveyard to the battlefield. It's a Skeleton in addition to its other types and has no abilities. Activate only as a sorcery.
diff --git a/forge-gui/res/cardsfolder/upcoming/zero_point_ballad.txt b/forge-gui/res/cardsfolder/upcoming/zero_point_ballad.txt
index c6c3f9cc171..300e6c5e44d 100644
--- a/forge-gui/res/cardsfolder/upcoming/zero_point_ballad.txt
+++ b/forge-gui/res/cardsfolder/upcoming/zero_point_ballad.txt
@@ -1,9 +1,9 @@
-Name:Zero Point Ballad
-ManaCost:X B
-Types:Sorcery
-A:SP$ DestroyAll | ValidCards$ Creature.toughnessLEX | RememberDestroyed$ True | SubAbility$ DBLoseLife | SpellDescription$ Destroy all creatures with toughness X or less. You lose X life. If X is 6 or more, return a creature card put into a graveyard this way to the battlefield under your control.
-SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ X | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | ConditionCheckSVar$ X | ConditionSVarCompare$ GE6 | ChangeType$ Creature.!token+IsRemembered | ChangeNum$ 1 | Hidden$ True | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Mandatory$ True | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$xPaid
-Oracle:Destroy all creatures with toughness X or less. You lose X life. If X is 6 or more, return a creature card put into a graveyard this way to the battlefield under your control.
+Name:Zero Point Ballad
+ManaCost:X B
+Types:Sorcery
+A:SP$ DestroyAll | ValidCards$ Creature.toughnessLEX | RememberDestroyed$ True | SubAbility$ DBLoseLife | SpellDescription$ Destroy all creatures with toughness X or less. You lose X life. If X is 6 or more, return a creature card put into a graveyard this way to the battlefield under your control.
+SVar:DBLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ X | SubAbility$ DBChangeZone
+SVar:DBChangeZone:DB$ ChangeZone | ConditionCheckSVar$ X | ConditionSVarCompare$ GE6 | ChangeType$ Creature.!token+IsRemembered | ChangeNum$ 1 | Hidden$ True | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | Mandatory$ True | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$xPaid
+Oracle:Destroy all creatures with toughness X or less. You lose X life. If X is 6 or more, return a creature card put into a graveyard this way to the battlefield under your control.
diff --git a/forge-gui/res/editions/Final Fantasy.txt b/forge-gui/res/editions/Final Fantasy.txt
index 799d10f2ece..c9d4e536a78 100644
--- a/forge-gui/res/editions/Final Fantasy.txt	
+++ b/forge-gui/res/editions/Final Fantasy.txt	
@@ -172,7 +172,7 @@ Replace=.18F BasicLand:fromSheet("FIN cards"):!fromSheet("FIN dual lands")+
 104 R Jecht, Reluctant Guardian @Michael MacRae
 105 R Kain, Traitorous Dragoon @Russell Dongjun Lu
 106 C Malboro @Dan Watson
-107 C Namazu Trader @Andrea Montalto
+107 C Namazu Trader @Andrea Tentori Montalto
 108 R Ninja's Blades @Immanuela Crovius
 109 U Overkill @Bachzim
 110 U Phantom Train @Gal Or
@@ -362,7 +362,7 @@ Replace=.18F BasicLand:fromSheet("FIN cards"):!fromSheet("FIN dual lands")+
 294 L Plains @Shahab Alizadeh
 295 L Plains @Jonas De Ro
 296 L Plains @Eddie Mendoza
-297 L Island @Fabira Khamesh
+297 L Island @Fariba Khamseh
 298 L Island @Eddie Mendoza
 299 L Island @Jeremy Paillotin
 300 L Swamp @Domenico Cava
@@ -426,7 +426,7 @@ Replace=.18F BasicLand:fromSheet("FIN cards"):!fromSheet("FIN dual lands")+
 340 R Triple Triad @Hagiya Kaoru
 341 U Clash of the Eikons @Hagiya Kaoru
 342 R The Earth Crystal @Kei Satsuki
-343 R Jumbo Cactuar @Yumeko
+343 R Jumbo Cactuar @Hisashi Momose
 344 R A Realm Reborn @Ono Tako
 345 U Torgal, A Fine Hound @Makura Tami
 346 R Jenova, Ancient Calamity @Karo ARAI