diff --git a/forge-gui/res/cardsfolder/upcoming/elsha_threefold_master.txt b/forge-gui/res/cardsfolder/upcoming/elsha_threefold_master.txt
index 158c5c40fb7..95f850e031d 100644
--- a/forge-gui/res/cardsfolder/upcoming/elsha_threefold_master.txt
+++ b/forge-gui/res/cardsfolder/upcoming/elsha_threefold_master.txt
@@ -1,11 +1,11 @@
-Name:Elsha, Threefold Master
-ManaCost:U R W
-Types:Legendary Creature Djinn Monk
-PT:1/1
-K:Trample
-K:Prowess
-T:Mode$ DamageDone | ValidSource$ Card.Self | Execute$ TrigToken | CombatDamage$ True | ValidTarget$ Player | TriggerZones$ Battlefield | TriggerDescription$ Whenever NICKNAME deals combat damage to a player, create that many 1/1 white Monk creature tokens with prowess.
-SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ w_1_1_monk_prowess | TokenOwner$ You
-SVar:X:TriggerCount$DamageAmount
-DeckHas:Ability$Token
+Name:Elsha, Threefold Master
+ManaCost:U R W
+Types:Legendary Creature Djinn Monk
+PT:1/1
+K:Trample
+K:Prowess
+T:Mode$ DamageDone | ValidSource$ Card.Self | Execute$ TrigToken | CombatDamage$ True | ValidTarget$ Player | TriggerZones$ Battlefield | TriggerDescription$ Whenever NICKNAME deals combat damage to a player, create that many 1/1 white Monk creature tokens with prowess.
+SVar:TrigToken:DB$ Token | TokenAmount$ X | TokenScript$ w_1_1_monk_prowess | TokenOwner$ You
+SVar:X:TriggerCount$DamageAmount
+DeckHas:Ability$Token
 Oracle:Trample\nProwess (Whenever you cast a noncreature spell, this creature gets +1/+1 until end of turn.)\nWhenever Elsha deals combat damage to a player, create that many 1/1 white Monk creature tokens with prowess.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/upcoming/neriv_crackling_vanguard.txt b/forge-gui/res/cardsfolder/upcoming/neriv_crackling_vanguard.txt
index 6397f1405fd..a98239e07f8 100644
--- a/forge-gui/res/cardsfolder/upcoming/neriv_crackling_vanguard.txt
+++ b/forge-gui/res/cardsfolder/upcoming/neriv_crackling_vanguard.txt
@@ -1,17 +1,17 @@
-Name:Neriv, Crackling Vanguard
-ManaCost:2 R W B
-Types:Legendary Creature Spirit Dragon
-PT:4/4
-K:Flying
-K:Deathtouch
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When NICKNAME enters, create two 1/1 red Goblin creature tokens.
-SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ r_1_1_goblin | TokenOwner$ You
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ Whenever NICKNAME attacks, exile a number of cards from the top of your library equal to the number of differently named tokens you control. During any turn you attacked with a commander, you may play those cards.
-SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ X | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffectYou
-SVar:DBEffectYou:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ STPlay | SubAbility$ DBCleanup | ForgetOnMoved$ Exile | Duration$ Permanent
-SVar:STPlay:Mode$ Continuous | MayPlay$ True | Affected$ Card.IsRemembered | AffectedZone$ Exile | CheckSVar$ Y | Description$ During any turn you attacked with a commander, you may play those cards.
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
-SVar:X:Count$DifferentCardNames_Permanent.token+YouCtrl+inZoneBattlefield
-SVar:Y:Count$CreaturesAttackedThisTurn Creature.IsCommander+YouCtrl
-SVar:HasAttackEffect:TRUE
-Oracle:Flying,deathtouch\nWhen Neriv enters, create two 1/1 red Goblin creature tokens.\nWhenever Neriv attacks, exile a number of cards from the top of your library equal to the number of differently named tokens you control. During any turn you attacked with a commander, you may play those cards.
+Name:Neriv, Crackling Vanguard
+ManaCost:2 R W B
+Types:Legendary Creature Spirit Dragon
+PT:4/4
+K:Flying
+K:Deathtouch
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When NICKNAME enters, create two 1/1 red Goblin creature tokens.
+SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ r_1_1_goblin | TokenOwner$ You
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigMill | TriggerZones$ Battlefield | TriggerDescription$ Whenever NICKNAME attacks, exile a number of cards from the top of your library equal to the number of differently named tokens you control. During any turn you attacked with a commander, you may play those cards.
+SVar:TrigExile:DB$ Dig | Defined$ You | DigNum$ X | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffectYou
+SVar:DBEffectYou:DB$ Effect | RememberObjects$ Remembered | StaticAbilities$ STPlay | SubAbility$ DBCleanup | ForgetOnMoved$ Exile | Duration$ Permanent
+SVar:STPlay:Mode$ Continuous | MayPlay$ True | Affected$ Card.IsRemembered | AffectedZone$ Exile | CheckSVar$ Y | Description$ During any turn you attacked with a commander, you may play those cards.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$DifferentCardNames_Permanent.token+YouCtrl+inZoneBattlefield
+SVar:Y:Count$CreaturesAttackedThisTurn Creature.IsCommander+YouCtrl
+SVar:HasAttackEffect:TRUE
+Oracle:Flying,deathtouch\nWhen Neriv enters, create two 1/1 red Goblin creature tokens.\nWhenever Neriv attacks, exile a number of cards from the top of your library equal to the number of differently named tokens you control. During any turn you attacked with a commander, you may play those cards.