diff --git a/forge-gui/res/cardsfolder/upcoming/diminished_returner.txt b/forge-gui/res/cardsfolder/upcoming/diminished_returner.txt
index 7da2e6fbcd1..818f6ff7083 100644
--- a/forge-gui/res/cardsfolder/upcoming/diminished_returner.txt
+++ b/forge-gui/res/cardsfolder/upcoming/diminished_returner.txt
@@ -3,10 +3,10 @@ ManaCost:1 B B
 Types:Creature Phyrexian Skeleton
 PT:4/3
 K:CARDNAME enters the battlefield tapped.
-A:AB$ Effect | Cost$ B B | IsPresent$ Card.Self+toughnessGE2 | PresentZone$ Graveyard | ActivationZone$ Graveyard | StaticAbilities$ PerpetualDebuff | Name$ Dimished Returner's Perpetual Effect | SubAbility$ DBChangeZone | Duration$ Permanent | SpellDescription$ CARDNAME perpetually gets -1/-1, then return it to the battlefield. Activate only if CARDNAME is in your graveyard and its toughness is 2 or greater. 
+A:AB$ Effect | Cost$ B B | IsPresent$ Card.Self+toughnessGE2 | PresentZone$ Graveyard | ActivationZone$ Graveyard | StaticAbilities$ PerpetualDebuff | Name$ Dimished Returner's Perpetual Effect | SubAbility$ DBChangeZone | Duration$ Permanent | SpellDescription$ CARDNAME perpetually gets -1/-1, then return it to the battlefield. Activate only if CARDNAME is in your graveyard and its toughness is 2 or greater.
 SVar:PerpetualDebuff:Mode$ Continuous | Affected$ Card.EffectSource | AddPower$ -1 | AddToughness$ -1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gets -1/-1.
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | Defined$ Self
 SVar:DiscardMe:2
 SVar:SacMe:1
 DeckHas:Ability$Graveyard
-Oracle:Diminished Returner enters the battlefield tapped.\n{B}{B}:Diminished Returner perpetually gets -1/-1, then return it to the battlefield. Activate only if Diminished Returner is in your graveyard and its toughness is 2 or greater. 
+Oracle:Diminished Returner enters the battlefield tapped.\n{B}{B}: Diminished Returner perpetually gets -1/-1, then return it to the battlefield. Activate only if Diminished Returner is in your graveyard and its toughness is 2 or greater.
diff --git a/forge-gui/res/cardsfolder/upcoming/tiana_angel_mechanic.txt b/forge-gui/res/cardsfolder/upcoming/tiana_angelic_mechanic.txt
similarity index 53%
rename from forge-gui/res/cardsfolder/upcoming/tiana_angel_mechanic.txt
rename to forge-gui/res/cardsfolder/upcoming/tiana_angelic_mechanic.txt
index 4b3af3a6542..7e7b9183489 100644
--- a/forge-gui/res/cardsfolder/upcoming/tiana_angel_mechanic.txt
+++ b/forge-gui/res/cardsfolder/upcoming/tiana_angelic_mechanic.txt
@@ -1,11 +1,11 @@
-Name:Tiana, Angel Mechanic 
-ManaCost:1 R W
-Types:Legendary Creature Angel Artificer
-PT:3/2
-K:Flying
-T:Mode$ Crewed | ValidCrew$ Card.Self,Creature.Legendary+Other+YouCtrl | Execute$ TrigEffect | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME or another legendary creature you control crews a vehicle, that vehicle perpetually gains +1/+0.
-SVar:TrigEffect:DB$ Effect | RememberObjects$ TriggeredVehicle | StaticAbilities$ PerpetualP1P1 | Name$ Tiana, Angel Mechanic's Perpetual Effect | Duration$ Permanent
-SVar:PerpetualP1P1:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This vehicle perpetually gains +1/+0.
-DeckHints:Type$Legendary
-DeckNeeds:Type$Vehicle
-Oracle:Whenever Tiana, Angel Mechanic or another legendary creature you control crews a vehicle, that vehicle perpetually gains +1/+0. 
+Name:Tiana, Angelic Mechanic
+ManaCost:1 R W
+Types:Legendary Creature Angel Artificer
+PT:3/2
+K:Flying
+T:Mode$ Crewed | ValidCrew$ Card.Self,Creature.Legendary+Other+YouCtrl | Execute$ TrigEffect | TriggerZones$ Battlefield | TriggerDescription$ When CARDNAME or another legendary creature you control crews a Vehicle, that Vehicle perpetually gets +1/+0.
+SVar:TrigEffect:DB$ Effect | RememberObjects$ TriggeredVehicle | StaticAbilities$ PerpetualP1P1 | Name$ Tiana, Angelic Mechanic's Perpetual Effect | Duration$ Permanent
+SVar:PerpetualP1P1:Mode$ Continuous | Affected$ Card.IsRemembered | AddPower$ 1 | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This Vehicle perpetually gains +1/+0.
+DeckHints:Type$Legendary
+DeckNeeds:Type$Vehicle
+Oracle:Flying\nWhen Tiana, Angelic Mechanic or another legendary creature you control crews a Vehicle, that Vehicle perpetually gets +1/+0.