diff --git a/forge-gui/res/cardsfolder/d/delver_of_secrets_insectile_aberration.txt b/forge-gui/res/cardsfolder/d/delver_of_secrets_insectile_aberration.txt
index c931af750a2..0e4bed553a9 100644
--- a/forge-gui/res/cardsfolder/d/delver_of_secrets_insectile_aberration.txt
+++ b/forge-gui/res/cardsfolder/d/delver_of_secrets_insectile_aberration.txt
@@ -2,13 +2,12 @@ Name:Delver of Secrets
 ManaCost:U
 Types:Creature Human Wizard
 PT:1/1
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigLook | TriggerDescription$ At the beginning of your upkeep, look at the top card of your library. You may reveal that card. If an instant or sorcery card is revealed this way, transform CARDNAME.
-SVar:TrigLook:DB$ Dig | DigNum$ 1 | NoMove$ True | SubAbility$ DBDig | SpellDescription$ Look at the top card of your library.
-SVar:DBDig:DB$ Dig | DigNum$ 1 | DestinationZone$ Library | LibraryPosition$ 0 | LibraryPosition2$ 0 | RevealOptional$ True | NoMove$ True | RememberRevealed$ True | SubAbility$ DBTransform
-SVar:DBTransform:DB$ SetState | Defined$ Self | ConditionDefined$ Remembered | ConditionPresent$ Card.Instant,Card.Sorcery | ConditionCompare$ EQ1 | SubAbility$ Cleanup | Mode$ Transform
-SVar:Cleanup:DB$ Cleanup | ClearRemembered$ True
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPeek | TriggerDescription$ At the beginning of your upkeep, look at the top card of your library. You may reveal that card. If an instant or sorcery card is revealed this way, transform CARDNAME.
+SVar:TrigPeek:DB$ PeekAndReveal | PeekAmount$ 1 | RevealOptional$ True | RememberRevealed$ True | SubAbility$ DBTransform
+SVar:DBTransform:DB$ SetState | Defined$ Self | Mode$ Transform | ConditionDefined$ Remembered | ConditionPresent$ Card.Instant,Card.Sorcery | ConditionCompare$ EQ1 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 AlternateMode:DoubleFaced
-SVar:Picture:http://www.wizards.com/global/images/magic/general/delver_of_secrets.jpg
+DeckHints:Type$Instant|Sorcery
 Oracle:At the beginning of your upkeep, look at the top card of your library. You may reveal that card. If an instant or sorcery card is revealed this way, transform Delver of Secrets.
 
 ALTERNATE
@@ -19,5 +18,4 @@ Colors:blue
 Types:Creature Human Insect
 PT:3/2
 K:Flying
-SVar:Picture:http://www.wizards.com/global/images/magic/general/insectile_aberration.jpg
 Oracle:Flying
diff --git a/forge-gui/res/cardsfolder/e/esikas_chariot.txt b/forge-gui/res/cardsfolder/e/esikas_chariot.txt
index fc46c771371..b7599a66186 100644
--- a/forge-gui/res/cardsfolder/e/esikas_chariot.txt
+++ b/forge-gui/res/cardsfolder/e/esikas_chariot.txt
@@ -3,8 +3,8 @@ ManaCost:3 G
 Types:Legendary Artifact Vehicle
 PT:4/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create two 2/2 green Cat creature tokens.
-SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ g_2_2_cat | TokenOwner$ You
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigCopy | TriggerDescription$ Whenever CARDNAME attacks, create a token that’s a copy of target token you control.
+SVar:TrigToken:DB$ Token | TokenAmount$ 2 | TokenScript$ g_2_2_cat
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigCopy | TriggerDescription$ Whenever CARDNAME attacks, create a token that's a copy of target token you control.
 SVar:TrigCopy:DB$ CopyPermanent | ValidTgts$ Permanent.token+YouCtrl | TgtPrompt$ Select target token you control | NumCopies$ 1
 K:Crew:4
 DeckHas:Ability$Token