diff --git a/forge-gui/res/cardsfolder/upcoming/squall_seed_mercenary.txt b/forge-gui/res/cardsfolder/upcoming/squall_seed_mercenary.txt
index 18729abc231..3a1eacfe27e 100644
--- a/forge-gui/res/cardsfolder/upcoming/squall_seed_mercenary.txt
+++ b/forge-gui/res/cardsfolder/upcoming/squall_seed_mercenary.txt
@@ -1,10 +1,10 @@
-Name:Squall, SeeD Mercenary
-ManaCost:2 W B
-Types:Legendary Creature Human Knight Mercenary
-PT:3/4
-T:Mode$ Attacks | ValidCard$ Creature.YouCtrl | Alone$ True | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Rough Divide — Whenever a creature you control attacks alone, it gains double strike until end of turn.
-SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | KW$ Double Strike
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigChangeZone | TriggerDescription$ Whenever NICKNAME deals combat damage to a player, return target permanent card with mana value 3 or less from your graveyard to the battlefield.
-SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Permanent.YouOwn+cmcLE3 | TgtPrompt$ Choose a permanent card with mana value 3 or less
-DeckHas:Ability$Graveyard
+Name:Squall, SeeD Mercenary
+ManaCost:2 W B
+Types:Legendary Creature Human Knight Mercenary
+PT:3/4
+T:Mode$ Attacks | ValidCard$ Creature.YouCtrl | Alone$ True | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Rough Divide — Whenever a creature you control attacks alone, it gains double strike until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ TriggeredAttackerLKICopy | KW$ Double Strike
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigChangeZone | TriggerDescription$ Whenever NICKNAME deals combat damage to a player, return target permanent card with mana value 3 or less from your graveyard to the battlefield.
+SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Permanent.YouOwn+cmcLE3 | TgtPrompt$ Choose a permanent card with mana value 3 or less
+DeckHas:Ability$Graveyard
 Oracle:Rough Divide — Whenever a creature you control attacks alone, it gains double strike until end of turn.\nWhenever Squall deals combat damage to a player, return target permanent card with mana value 3 or less from your graveyard to the battlefield.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/starting_town.txt b/forge-gui/res/cardsfolder/upcoming/starting_town.txt
index e41ba0efa19..5fe7bc339e2 100644
--- a/forge-gui/res/cardsfolder/upcoming/starting_town.txt
+++ b/forge-gui/res/cardsfolder/upcoming/starting_town.txt
@@ -1,11 +1,11 @@
-Name:Starting Town
-ManaCost:no cost
-Types:Land Town
-R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ This land enters tapped unless it's your first, second, or third turn of the game.
-SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GT3
-A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Mana | Cost$ T PayLife<1> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
-SVar:X:Count$Compare Y GE1.Z.4
-SVar:Y:PlayerCountPropertyYou$HasPropertyActive
-SVar:Z:Count$YourTurns
-Oracle:This land enters tapped unless it's your first, second, or third turn of the game.\n{T}: Add {C}.\n{T}, Pay 1 life: Add one mana of any color.
+Name:Starting Town
+ManaCost:no cost
+Types:Land Town
+R:Event$ Moved | ValidCard$ Card.Self | Destination$ Battlefield | ReplaceWith$ LandTapped | ReplacementResult$ Updated | Description$ This land enters tapped unless it's your first, second, or third turn of the game.
+SVar:LandTapped:DB$ Tap | Defined$ Self | ETB$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GT3
+A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
+A:AB$ Mana | Cost$ T PayLife<1> | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color.
+SVar:X:Count$Compare Y GE1.Z.4
+SVar:Y:PlayerCountPropertyYou$HasPropertyActive
+SVar:Z:Count$YourTurns
+Oracle:This land enters tapped unless it's your first, second, or third turn of the game.\n{T}: Add {C}.\n{T}, Pay 1 life: Add one mana of any color.
diff --git a/forge-gui/res/cardsfolder/upcoming/summon_esper_valigarmanda.txt b/forge-gui/res/cardsfolder/upcoming/summon_esper_valigarmanda.txt
index 47fa8796e62..dfdc50bb402 100644
--- a/forge-gui/res/cardsfolder/upcoming/summon_esper_valigarmanda.txt
+++ b/forge-gui/res/cardsfolder/upcoming/summon_esper_valigarmanda.txt
@@ -1,15 +1,15 @@
-Name:Summon: Esper Valigarmanda
-ManaCost:3 R
-Types:Enchantment Creature Saga Drake
-PT:3/3
-K:Chapter:4:DBRepeatEach,DBMana,DBMana,DBMana
-SVar:DBRepeatEach:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBChooseCard | SubAbility$ DBExile | SpellDescription$ Exile an instant or sorcery card from each graveyard.
-SVar:DBChooseCard:DB$ ChooseCard | Defined$ You | Choices$ Instant.RememberedPlayerOwn,Sorcery.RememberedPlayerOwn | ChoiceZone$ Graveyard | ChoiceTitle$ Choose an instant or sorcery card in a graveyard | Mandatory$ True | RememberChosen$ True
-SVar:DBExile:DB$ ChangeZoneAll | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card.IsRemembered | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
-SVar:DBMana:DB$ Mana | Produced$ R | Amount$ X | SubAbility$ DBPlay | SpellDescription$ Add {R} for each lore counter on this Saga. You may cast an instant or sorcery card exiled with this Saga, and mana of any type can be spent to cast that spell.
-SVar:DBPlay:DB$ Play | Valid$ Instant.ExiledWithSource,Sorcery.ExiledWithSource | ValidSA$ Spell | ManaConversion$ AnyType->AnyType | ValidZone$ Exile | Optional$ True
-K:Flying
-K:Haste
-SVar:X:Count$CardCounters.LORE
+Name:Summon: Esper Valigarmanda
+ManaCost:3 R
+Types:Enchantment Creature Saga Drake
+PT:3/3
+K:Chapter:4:DBRepeatEach,DBMana,DBMana,DBMana
+SVar:DBRepeatEach:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBChooseCard | SubAbility$ DBExile | SpellDescription$ Exile an instant or sorcery card from each graveyard.
+SVar:DBChooseCard:DB$ ChooseCard | Defined$ You | Choices$ Instant.RememberedPlayerOwn,Sorcery.RememberedPlayerOwn | ChoiceZone$ Graveyard | ChoiceTitle$ Choose an instant or sorcery card in a graveyard | Mandatory$ True | RememberChosen$ True
+SVar:DBExile:DB$ ChangeZoneAll | Origin$ Graveyard | Destination$ Exile | ChangeType$ Card.IsRemembered | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosenCard$ True
+SVar:DBMana:DB$ Mana | Produced$ R | Amount$ X | SubAbility$ DBPlay | SpellDescription$ Add {R} for each lore counter on this Saga. You may cast an instant or sorcery card exiled with this Saga, and mana of any type can be spent to cast that spell.
+SVar:DBPlay:DB$ Play | Valid$ Instant.ExiledWithSource,Sorcery.ExiledWithSource | ValidSA$ Spell | ManaConversion$ AnyType->AnyType | ValidZone$ Exile | Optional$ True
+K:Flying
+K:Haste
+SVar:X:Count$CardCounters.LORE
 Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after IV.)\nI — Exile an instant or sorcery card from each graveyard.\nII, III, IV — Add {R} for each lore counter on this Saga. You may cast an instant or sorcery card exiled with this Saga, and mana of any type can be spent to cast that spell.\nFlying, haste
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/terra_magical_adept_esper_terra.txt b/forge-gui/res/cardsfolder/upcoming/terra_magical_adept_esper_terra.txt
index 34801318bc4..e7fb3e5f0db 100644
--- a/forge-gui/res/cardsfolder/upcoming/terra_magical_adept_esper_terra.txt
+++ b/forge-gui/res/cardsfolder/upcoming/terra_magical_adept_esper_terra.txt
@@ -1,31 +1,31 @@
-Name:Terra, Magical Adept
-ManaCost:1 R G
-Types:Legendary Creature Human Wizard Warrior
-PT:4/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When NICKNAME enters, mill five cards. Put up to one enchantment milled this this way into your hand.
-SVar:TrigMill:DB$ Mill | NumCards$ 5 | Defined$ You | RememberMilled$ True | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard,Exile | Destination$ Hand | ChangeType$ Enchantment.YouOwn+IsRemembered | Hidden$ True | Optional$ True | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-A:AB$ ChangeZone | PrecostDesc$ Trance | Cost$ 4 R G T | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBReturn | SorcerySpeed$ True | SpellDescription$ Exile NICKNAME, then return it to the battlefield transformed under its owner's control. Activate only as a sorcery.
-SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | Transformed$ True | SubAbility$ DBCleanup
-AlternateMode:DoubleFaced
-DeckHas:Ability$Mill
-DeckHints:Ability$Graveyard|Token|Counters & Type$Enchantment
-Oracle:When Terra enters, mill five cards. Put up to one enchantment milled this this way into your hand.\nTrance — {4}{R}{G}, {T}: Exile Terra, then return it to the battlefield transformed under its owner's control. Activate only as a sorcery.
-
-ALTERNATE
-
-Name:Esper Terra
-ManaCost:no cost
-Colors:red,green
-Types:Legendary Enchantment Creature Saga Wizard
-PT:6/6
-K:Chapter:4:DBCopy,DBCopy,DBCopy,DBMana
-SVar:DBCopy:DB$ CopyPermanent | ValidTgts$ Enchantment.nonLegendary+YouCtrl | TgtPrompt$ Select target nonlegendary enchantment you control | PumpKeywords$ Haste | AtEOT$ YourSacrifice | RememberTokens$ True | SubAbility$ DBPutCounter | SpellDescription$ Create a token that's a copy of target nonlegendary enchantment you control. It gains haste. If it's a Saga, put up to three lore counters on it. Sacrifice it at the beginning of your next end step.
-SVar:DBPutCounter:DB$ PutCounter | Defined$ Remembered.Saga | CounterType$ LORE | CounterNum$ 3 | UpTo$ True | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:DBMana:DB$ Mana | Produced$ W W U U B B R R G G | SubAbility$ DBExile | SpellDescription$ Add {W}{W}, {U}{U}, {B}{B}, {R}{R}, and {G}{G}. Exile CARDNAME, then return it to the battlefield (front face up).
-SVar:DBExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBReturn
-SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
-K:Flying
-Oracle:(As this Saga enters and after your draw step, add a lore counter.)\nI, II, III — Create a token that's a copy of target nonlegendary enchantment you control. It gains haste. If it's a Saga, put up to three lore counters on it. Sacrifice it at the beginning of your next end step.\nIV — Add {W}{W}, {U}{U}, {B}{B}, {R}{R}, and {G}{G}. Exile Esper Terra, then return it to the battlefield (front face up).\nFlying
+Name:Terra, Magical Adept
+ManaCost:1 R G
+Types:Legendary Creature Human Wizard Warrior
+PT:4/2
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ When NICKNAME enters, mill five cards. Put up to one enchantment milled this this way into your hand.
+SVar:TrigMill:DB$ Mill | NumCards$ 5 | Defined$ You | RememberMilled$ True | SubAbility$ DBChangeZone
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard,Exile | Destination$ Hand | ChangeType$ Enchantment.YouOwn+IsRemembered | Hidden$ True | Optional$ True | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+A:AB$ ChangeZone | PrecostDesc$ Trance | Cost$ 4 R G T | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBReturn | SorcerySpeed$ True | SpellDescription$ Exile NICKNAME, then return it to the battlefield transformed under its owner's control. Activate only as a sorcery.
+SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | Transformed$ True | SubAbility$ DBCleanup
+AlternateMode:DoubleFaced
+DeckHas:Ability$Mill
+DeckHints:Ability$Graveyard|Token|Counters & Type$Enchantment
+Oracle:When Terra enters, mill five cards. Put up to one enchantment milled this this way into your hand.\nTrance — {4}{R}{G}, {T}: Exile Terra, then return it to the battlefield transformed under its owner's control. Activate only as a sorcery.
+
+ALTERNATE
+
+Name:Esper Terra
+ManaCost:no cost
+Colors:red,green
+Types:Legendary Enchantment Creature Saga Wizard
+PT:6/6
+K:Chapter:4:DBCopy,DBCopy,DBCopy,DBMana
+SVar:DBCopy:DB$ CopyPermanent | ValidTgts$ Enchantment.nonLegendary+YouCtrl | TgtPrompt$ Select target nonlegendary enchantment you control | PumpKeywords$ Haste | AtEOT$ YourSacrifice | RememberTokens$ True | SubAbility$ DBPutCounter | SpellDescription$ Create a token that's a copy of target nonlegendary enchantment you control. It gains haste. If it's a Saga, put up to three lore counters on it. Sacrifice it at the beginning of your next end step.
+SVar:DBPutCounter:DB$ PutCounter | Defined$ Remembered.Saga | CounterType$ LORE | CounterNum$ 3 | UpTo$ True | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:DBMana:DB$ Mana | Produced$ W W U U B B R R G G | SubAbility$ DBExile | SpellDescription$ Add {W}{W}, {U}{U}, {B}{B}, {R}{R}, and {G}{G}. Exile CARDNAME, then return it to the battlefield (front face up).
+SVar:DBExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | RememberChanged$ True | SubAbility$ DBReturn
+SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
+K:Flying
+Oracle:(As this Saga enters and after your draw step, add a lore counter.)\nI, II, III — Create a token that's a copy of target nonlegendary enchantment you control. It gains haste. If it's a Saga, put up to three lore counters on it. Sacrifice it at the beginning of your next end step.\nIV — Add {W}{W}, {U}{U}, {B}{B}, {R}{R}, and {G}{G}. Exile Esper Terra, then return it to the battlefield (front face up).\nFlying