diff --git a/forge-gui/res/cardsfolder/c/consider.txt b/forge-gui/res/cardsfolder/c/consider.txt
index 76e737f6ee6..7d24bf6cfba 100644
--- a/forge-gui/res/cardsfolder/c/consider.txt
+++ b/forge-gui/res/cardsfolder/c/consider.txt
@@ -1,7 +1,7 @@
 Name:Consider
 ManaCost:U
 Types:Instant
-A:SP$ Dig | Cost$ U | DigNum$ 1 | ChangeNum$ 1 | DestinationZone$ Graveyard | Optional$ True | LibraryPosition2$ 0 | SubAbility$ DBDraw | SpellDescription$ Look at the top card of your library. You may put that card into your graveyard. Draw a card.
-SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1
-DeckHas:Ability$Graveyard
-Oracle:Look at the top card of your library. You may put that card into your graveyard. Draw a card.
+A:SP$ Surveil | Cost$ U | Amount$ 1 | SubAbility$ DBDraw | SpellDescription$ Surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SpellDescription$ Draw a card.
+DeckHas:Ability$Surveil|Graveyard
+Oracle:Surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/c/contingency_plan.txt b/forge-gui/res/cardsfolder/c/contingency_plan.txt
index befb243ec6a..88f236cb8f5 100644
--- a/forge-gui/res/cardsfolder/c/contingency_plan.txt
+++ b/forge-gui/res/cardsfolder/c/contingency_plan.txt
@@ -1,6 +1,7 @@
 Name:Contingency Plan
 ManaCost:1 U
 Types:Sorcery
-A:SP$ Dig | Cost$ 1 U | DigNum$ 5 | AnyNumber$ True | DestinationZone$ Graveyard | LibraryPosition2$ 0 | SpellDescription$ Look at the top five cards of your library. Put any number of them into your graveyard and the rest back on top of your library in any order.
+A:SP$ Surveil | Cost$ 1 U | Amount$ 5 | SpellDescription$ Surveil 5. (Look at the top five cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
 AI:RemoveDeck:All
-Oracle:Look at the top five cards of your library. Put any number of them into your graveyard and the rest back on top of your library in any order.
+DeckHas:Ability$Surveil|Graveyard
+Oracle:Surveil 5. (Look at the top five cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
diff --git a/forge-gui/res/cardsfolder/c/cruel_witness.txt b/forge-gui/res/cardsfolder/c/cruel_witness.txt
index 9066dd0f839..ad87b7b98cf 100644
--- a/forge-gui/res/cardsfolder/c/cruel_witness.txt
+++ b/forge-gui/res/cardsfolder/c/cruel_witness.txt
@@ -3,8 +3,8 @@ ManaCost:2 U U
 Types:Creature Bird Horror
 PT:3/3
 K:Flying
-T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ TrigDig | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a noncreature spell, look at the top card of your library. You may put that card into your graveyard.
-SVar:TrigDig:DB$ Dig | DigNum$ 1 | DestinationZone$ Graveyard | Optional$ True | LibraryPosition2$ 0
+T:Mode$ SpellCast | ValidCard$ Card.nonCreature | ValidActivatingPlayer$ You | Execute$ TrigSurveil | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a noncreature spell, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
+SVar:TrigSurveil:DB$ Surveil | Amount$ 1
 SVar:BuffedBy:Card.nonLand+nonCreature
-DeckHas:Ability$Graveyard
-Oracle:Flying\nWhenever you cast a noncreature spell, look at the top card of your library. You may put that card into your graveyard.
+DeckHas:Ability$Surveil|Graveyard
+Oracle:Flying\nWhenever you cast a noncreature spell, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/c/curate.txt b/forge-gui/res/cardsfolder/c/curate.txt
index 14c3ee53ae6..961bbeb9afd 100644
--- a/forge-gui/res/cardsfolder/c/curate.txt
+++ b/forge-gui/res/cardsfolder/c/curate.txt
@@ -1,7 +1,7 @@
 Name:Curate
 ManaCost:1 U
 Types:Instant
-A:SP$ Dig | DigNum$ 2 | AnyNumber$ True | DestinationZone$ Graveyard | LibraryPosition2$ 0 | SubAbility$ DBDraw | StackDescription$ {p:You} looks at the top two cards of their library, puts any number of them into their graveyard and the rest back on top of their library in any order. | SpellDescription$ Look at the top two cards of your library. Put any number of them into your graveyard and the rest back on top of your library in any order.
+A:SP$ Surveil | Cost$ 1 U | Amount$ 2 | SubAbility$ DBDraw | SpellDescription$ Surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
 SVar:DBDraw:DB$ Draw | SpellDescription$ Draw a card.
-DeckHas:Ability$Graveyard
-Oracle:Look at the top two cards of your library. Put any number of them into your graveyard and the rest back on top of your library in any order.\nDraw a card.
+DeckHas:Ability$Surveil|Graveyard
+Oracle:Surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/e/eat_to_extinction.txt b/forge-gui/res/cardsfolder/e/eat_to_extinction.txt
index ec01b7046b5..67d38825543 100644
--- a/forge-gui/res/cardsfolder/e/eat_to_extinction.txt
+++ b/forge-gui/res/cardsfolder/e/eat_to_extinction.txt
@@ -1,7 +1,7 @@
 Name:Eat to Extinction
 ManaCost:3 B
 Types:Instant
-A:SP$ ChangeZone | Cost$ 3 B | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | Origin$ Battlefield | Destination$ Exile | SubAbility$ DBDig | SpellDescription$ Exile target creature or planeswalker. Look at the top card of your library. You may put that card into your graveyard.
-SVar:DBDig:DB$ Dig | DigNum$ 1 | ChangeNum$ 1 | DestinationZone$ Graveyard | Optional$ True | LibraryPosition2$ 0
-DeckHas:Ability$Graveyard
-Oracle:Exile target creature or planeswalker. Look at the top card of your library. You may put that card into your graveyard.
+A:SP$ ChangeZone | Cost$ 3 B | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | Origin$ Battlefield | Destination$ Exile | SubAbility$ TrigSurveil | SpellDescription$ Exile target creature or planeswalker. Surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
+SVar:TrigSurveil:DB$ Surveil | Amount$ 1
+DeckHas:Ability$Surveil|Graveyard
+Oracle:Exile target creature or planeswalker. Surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/e/etherwrought_page.txt b/forge-gui/res/cardsfolder/e/etherwrought_page.txt
index a1247b3caeb..b80ecfc1df4 100644
--- a/forge-gui/res/cardsfolder/e/etherwrought_page.txt
+++ b/forge-gui/res/cardsfolder/e/etherwrought_page.txt
@@ -2,10 +2,10 @@ Name:Etherwrought Page
 ManaCost:1 W U B
 Types:Artifact
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigCharm | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, ABILITY
-SVar:TrigCharm:DB$ Charm | Choices$ DBGainLife,DBDig,DBLoseLife | CharmNum$ 1
+SVar:TrigCharm:DB$ Charm | Choices$ DBGainLife,DBSurveil,DBLoseLife | CharmNum$ 1
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2 | SpellDescription$ You gain 2 life.
-SVar:DBDig:DB$ Dig | DigNum$ 1 | ChangeNum$ 1 | DestinationZone$ Graveyard | Optional$ True | LibraryPosition2$ 0 | SpellDescription$ Look at the top card of your library. You may put that card into your graveyard.
+SVar:DBSurveil:DB$ Surveil | Amount$ 1 | SpellDescription$ Surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
 SVar:DBLoseLife:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 1 | SpellDescription$ Each opponent loses 1 life.
 AI:RemoveDeck:All
-DeckHas:Ability$LifeGain
-Oracle:At the beginning of your upkeep, choose one —\n• You gain 2 life.\n• Look at the top card of your library. You may put that card into your graveyard.\n• Each opponent loses 1 life.
+DeckHas:Ability$LifeGain & Ability$Surveil|Graveyard
+Oracle:At the beginning of your upkeep, choose one —\n• You gain 2 life.\n• Surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)\n• Each opponent loses 1 life.
diff --git a/forge-gui/res/cardsfolder/g/grim_flayer.txt b/forge-gui/res/cardsfolder/g/grim_flayer.txt
index 125dcc9cc22..cddcf9667a2 100644
--- a/forge-gui/res/cardsfolder/g/grim_flayer.txt
+++ b/forge-gui/res/cardsfolder/g/grim_flayer.txt
@@ -3,7 +3,8 @@ ManaCost:B G
 Types:Creature Human Warrior
 PT:2/2
 K:Trample
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigDig | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, look at the top three cards of your library. Put any number of them into your graveyard and the rest back on top of your library in any order.
-SVar:TrigDig:DB$ Dig | DigNum$ 3 | Defined$ You | AnyNumber$ | DestinationZone$ Graveyard | LibraryPosition2$ 0
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigSurveil | CombatDamage$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, look at the top three cards of your library. Put any number of them into your graveyard and the rest back on top of your library in any order.
+SVar:TrigSurveil:DB$ Surveil | Amount$ 3
 S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | Condition$ Delirium | Description$ Delirium — CARDNAME gets +2/+2 as long as there are four or more card types in your graveyard.
-Oracle:Trample\nWhenever Grim Flayer deals combat damage to a player, look at the top three cards of your library. Put any number of them into your graveyard and the rest back on top of your library in any order.\nDelirium — Grim Flayer gets +2/+2 as long as there are four or more card types among cards in your graveyard.
+DeckHas:Ability$Surveil|Graveyard
+Oracle:Trample\nWhenever Grim Flayer deals combat damage to a player, surveil 3. (Look at the top three cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)\nDelirium — Grim Flayer gets +2/+2 as long as there are four or more card types among cards in your graveyard.
diff --git a/forge-gui/res/cardsfolder/l/larder_zombie.txt b/forge-gui/res/cardsfolder/l/larder_zombie.txt
index 8fcfde94afa..331969b982c 100644
--- a/forge-gui/res/cardsfolder/l/larder_zombie.txt
+++ b/forge-gui/res/cardsfolder/l/larder_zombie.txt
@@ -3,7 +3,7 @@ ManaCost:U
 Types:Creature Zombie
 PT:1/3
 K:Defender
-A:AB$ Dig | Cost$ tapXType<3/Creature/creature> | DigNum$ 1 | DestinationZone$ Graveyard | DestinationZone2$ Library | LibraryPosition2$ 0 | Optional$ True | StackDescription$ SpellDescription | SpellDescription$ Look at the top card of your library. You may put it into your graveyard.
-DeckHas:Ability$Graveyard
+A:AB$ Surveil | Cost$ tapXType<3/Creature/creature> | Amount$ 1 | SpellDescription$ Surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
+DeckHas:Ability$Surveil|Graveyard
 DeckHints:Keyword$Decayed
-Oracle:Defender\nTap three untapped creatures you control: Look at the top card of your library. You may put it into your graveyard.
+Oracle:Defender\nTap three untapped creatures you control: Surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/n/naga_oracle.txt b/forge-gui/res/cardsfolder/n/naga_oracle.txt
index ea688463dd6..825d0b9aa29 100644
--- a/forge-gui/res/cardsfolder/n/naga_oracle.txt
+++ b/forge-gui/res/cardsfolder/n/naga_oracle.txt
@@ -2,6 +2,7 @@ Name:Naga Oracle
 ManaCost:3 U
 Types:Creature Naga Cleric
 PT:2/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters the battlefield, look at the top three cards of your library. Put any number of them into your graveyard and the rest back on top of your library in any order.
-SVar:TrigDig:DB$ Dig | DigNum$ 3 | Defined$ You | AnyNumber$ | DestinationZone$ Graveyard | LibraryPosition2$ 0
-Oracle:When Naga Oracle enters the battlefield, look at the top three cards of your library. Put any number of them into your graveyard and the rest back on top of your library in any order.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSurveil | TriggerDescription$ When CARDNAME enters the battlefield, surveil 3. (Look at the top three cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
+SVar:TrigSurveil:DB$ Surveil | Amount$ 3
+DeckHas:Ability$Surveil|Graveyard
+Oracle:When Naga Oracle enters the battlefield, surveil 3. (Look at the top three cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
diff --git a/forge-gui/res/cardsfolder/o/otherworldly_gaze.txt b/forge-gui/res/cardsfolder/o/otherworldly_gaze.txt
index 1cb59d48170..33ff0730732 100644
--- a/forge-gui/res/cardsfolder/o/otherworldly_gaze.txt
+++ b/forge-gui/res/cardsfolder/o/otherworldly_gaze.txt
@@ -2,6 +2,6 @@ Name:Otherworldly Gaze
 ManaCost:U
 Types:Instant
 K:Flashback:1 U
-A:SP$ Dig | DigNum$ 3 | AnyNumber$ True | DestinationZone$ Graveyard | LibraryPosition2$ 0 | AILogic$ EmulateScry | SpellDescription$ Look at the top three cards of your library. Put any number of them into your graveyard and the rest back on top of your library in any order.
-DeckHas:Ability$Graveyard
-Oracle:Look at the top three cards of your library. Put any number of them into your graveyard and the rest back on top of your library in any order.\nFlashback {1}{U} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
+A:SP$ Surveil | Cost$ 1 U | Amount$ 3 | SpellDescription$ Surveil 3. (Look at the top three cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
+DeckHas:Ability$Surveil|Graveyard
+Oracle:Surveil 3. (Look at the top three cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)\nFlashback {1}{U} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
diff --git a/forge-gui/res/cardsfolder/r/rummaging_wizard.txt b/forge-gui/res/cardsfolder/r/rummaging_wizard.txt
index 7828b92393e..deb1d314a2f 100644
--- a/forge-gui/res/cardsfolder/r/rummaging_wizard.txt
+++ b/forge-gui/res/cardsfolder/r/rummaging_wizard.txt
@@ -2,6 +2,8 @@ Name:Rummaging Wizard
 ManaCost:3 U
 Types:Creature Human Wizard
 PT:2/2
-A:AB$ Dig | Cost$ 2 U | DigNum$ 1 | DestinationZone$ Graveyard | Optional$ True | LibraryPosition2$ 0 | SpellDescription$ Look at the top card of your library. You may put that card into your graveyard.
+A:AB$ Surveil | Cost$ 2 U | Amount$ 1 | SpellDescription$ Surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
 AI:RemoveDeck:All
-Oracle:{2}{U}: Look at the top card of your library. You may put that card into your graveyard.
+SVar:TrigSurveil:DB$ Surveil | Amount$ 1
+DeckHas:Ability$Surveil|Graveyard
+Oracle:{2}{U}: Surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/s/sanguine_spy.txt b/forge-gui/res/cardsfolder/s/sanguine_spy.txt
index 537d44b8967..046170a66b3 100644
--- a/forge-gui/res/cardsfolder/s/sanguine_spy.txt
+++ b/forge-gui/res/cardsfolder/s/sanguine_spy.txt
@@ -4,10 +4,10 @@ Types:Creature Vampire Rogue
 PT:2/3
 K:Menace
 K:Lifelink
-A:AB$ Dig | Cost$ 1 Sac<1/Creature.Other/another creature> | DigNum$ 1 | ChangeNum$ 1 | DestinationZone$ Graveyard | Optional$ True | LibraryPosition2$ 0 | SpellDescription$ Look at the top card of your library. You may put that card into your graveyard.
+A:AB$ Surveil | Cost$ 1 Sac<1/Creature.Other/another creature> | Amount$ 1 | SpellDescription$ Surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE5 | Execute$ TrigDraw | TriggerDescription$ At the beginning of your end step, if there are five or more mana values among cards in your graveyard, you may pay 2 life. If you do, draw a card.
 SVar:TrigDraw:AB$ Draw | Cost$ PayLife<2>
 SVar:X:Count$ValidGraveyard Card.YouOwn$DifferentCMC
-DeckHas:Ability$Sacrifice|LifeGain|Graveyard
+DeckHas:Ability$Sacrifice|LifeGain|Surveil|Graveyard
 SVar:AIPreference:SacCost$Creature.token,Creature.cmcLE2
-Oracle:Menace, lifelink\n{1}, Sacrifice another creature: Look at the top card of your library. You may put that card into your graveyard.\nAt the beginning of your end step, if there are five or more mana values among cards in your graveyard, you may pay 2 life. If you do, draw a card.
+Oracle:Menace, lifelink\n{1}, Sacrifice another creature: Surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)\nAt the beginning of your end step, if there are five or more mana values among cards in your graveyard, you may pay 2 life. If you do, draw a card.
diff --git a/forge-gui/res/cardsfolder/s/search_for_azcanta_azcanta_the_sunken_ruin.txt b/forge-gui/res/cardsfolder/s/search_for_azcanta_azcanta_the_sunken_ruin.txt
index 91bdda07076..9076ff00823 100644
--- a/forge-gui/res/cardsfolder/s/search_for_azcanta_azcanta_the_sunken_ruin.txt
+++ b/forge-gui/res/cardsfolder/s/search_for_azcanta_azcanta_the_sunken_ruin.txt
@@ -1,12 +1,13 @@
 Name:Search for Azcanta
 ManaCost:1 U
 Types:Legendary Enchantment
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDig | TriggerDescription$ At the beginning of your upkeep, look at the top card of your library. You may put it into your graveyard. Then if you have seven or more cards in your graveyard, you may transform CARDNAME.
-SVar:TrigDig:DB$ Dig | DigNum$ 1 | DestinationZone$ Graveyard | Optional$ True | LibraryPosition2$ 0 | SubAbility$ DBTransform | SpellDescription$ Look at the top card of your library. You may put that card into your graveyard. Then if you have seven or more cards in your graveyard, you may transform CARDNAME.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSurveil | TriggerDescription$ At the beginning of your upkeep, surveil 1. Then if you have seven or more cards in your graveyard, you may transform CARDNAME. (Look at the top card of your library. You may put that card into your graveyard.)
+SVar:TrigSurveil:DB$ Surveil | Amount$ 1 | SubAbility$ DBTransform | SpellDescription$ Surveil 1. Then if you have seven or more cards in your graveyard, you may transform CARDNAME (Look at the top card of your library. You may put that card into your graveyard.)
 SVar:DBTransform:DB$ SetState | Defined$ Self | Mode$ Transform | Optional$ True | ConditionCheckSVar$ GraveCount | ConditionSVarCompare$ GE7
 SVar:GraveCount:Count$ValidGraveyard Card.YouOwn
+DeckHas:Ability$Surveil|Graveyard
 AlternateMode:DoubleFaced
-Oracle:At the beginning of your upkeep, look at the top card of your library. You may put it into your graveyard. Then if you have seven or more cards in your graveyard, you may transform Search for Azcanta.
+Oracle:At the beginning of your upkeep, surveil 1. Then if you have seven or more cards in your graveyard, you may transform Search for Azcanta. (Look at the top card of your library. You may put that card into your graveyard.)
 
 ALTERNATE
 
diff --git a/forge-gui/res/cardsfolder/s/sultai_ascendancy.txt b/forge-gui/res/cardsfolder/s/sultai_ascendancy.txt
index 09bc4ae5f60..33069ddd04c 100644
--- a/forge-gui/res/cardsfolder/s/sultai_ascendancy.txt
+++ b/forge-gui/res/cardsfolder/s/sultai_ascendancy.txt
@@ -1,7 +1,8 @@
 Name:Sultai Ascendancy
 ManaCost:B G U
 Types:Enchantment
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ DBDig | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, look at the top two cards of your library. Put any number of them into your graveyard and the rest back on top of your library in any order.
-SVar:DBDig:DB$ Dig | ValidTgts$ You | DigNum$ 2 | AnyNumber$ | DestinationZone$ Graveyard | LibraryPosition2$ 0
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSurveil | TriggerDescription$ At the beginning of your upkeep, surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
 AI:RemoveDeck:All
-Oracle:At the beginning of your upkeep, look at the top two cards of your library. Put any number of them into your graveyard and the rest back on top of your library in any order.
+SVar:TrigSurveil:DB$ Surveil | Amount$ 2
+DeckHas:Ability$Surveil|Graveyard
+Oracle:At the beginning of your upkeep, surveil 2. (Look at the top two cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
diff --git a/forge-gui/res/cardsfolder/t/taigams_scheming.txt b/forge-gui/res/cardsfolder/t/taigams_scheming.txt
index 9a271637fb0..c5d30b8d8d7 100644
--- a/forge-gui/res/cardsfolder/t/taigams_scheming.txt
+++ b/forge-gui/res/cardsfolder/t/taigams_scheming.txt
@@ -1,6 +1,7 @@
 Name:Taigam's Scheming
 ManaCost:1 U
 Types:Sorcery
-A:SP$ Dig | Cost$ 1 U | DigNum$ 5 | AnyNumber$ True | DestinationZone$ Graveyard | LibraryPosition2$ 0 | SpellDescription$ Look at the top five cards of your library. Put any number of them into your graveyard and the rest back on top of your library in any order.
+A:SP$ Surveil | Cost$ 1 U | Amount$ 5 | SpellDescription$ Surveil 5. (Look at the top five cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
 AI:RemoveDeck:All
-Oracle:Look at the top five cards of your library. Put any number of them into your graveyard and the rest back on top of your library in any order.
+DeckHas:Ability$Surveil|Graveyard
+Oracle:Surveil 5. (Look at the top five cards of your library, then put any number of them into your graveyard and the rest on top of your library in any order.)
diff --git a/forge-gui/res/cardsfolder/t/think_tank.txt b/forge-gui/res/cardsfolder/t/think_tank.txt
index a4cec8cefe8..535383cf2cc 100644
--- a/forge-gui/res/cardsfolder/t/think_tank.txt
+++ b/forge-gui/res/cardsfolder/t/think_tank.txt
@@ -1,7 +1,8 @@
 Name:Think Tank
 ManaCost:2 U
 Types:Enchantment
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDig | TriggerDescription$ At the beginning of your upkeep, look at the top card of your library. You may put that card into your graveyard.
-SVar:TrigDig:DB$ Dig | DigNum$ 1 | ChangeNum$ 1 | DestinationZone$ Graveyard | Optional$ True | LibraryPosition2$ 0
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSurveil | TriggerDescription$ At the beginning of your upkeep, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
 AI:RemoveDeck:All
-Oracle:At the beginning of your upkeep, look at the top card of your library. You may put that card into your graveyard.
+SVar:TrigSurveil:DB$ Surveil | Amount$ 1
+DeckHas:Ability$Surveil|Graveyard
+Oracle:At the beginning of your upkeep, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
diff --git a/forge-gui/res/cardsfolder/t/titans_nest.txt b/forge-gui/res/cardsfolder/t/titans_nest.txt
index ef111c90629..fffd845510f 100644
--- a/forge-gui/res/cardsfolder/t/titans_nest.txt
+++ b/forge-gui/res/cardsfolder/t/titans_nest.txt
@@ -1,8 +1,9 @@
 Name:Titans' Nest
 ManaCost:1 B G U
 Types:Enchantment
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDig | TriggerDescription$ At the beginning of your upkeep, look at the top card of your library. You may put that card into your graveyard.
-SVar:TrigDig:DB$ Dig | DigNum$ 1 | ChangeNum$ 1 | DestinationZone$ Graveyard | Optional$ True | LibraryPosition2$ 0
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSurveil | TriggerDescription$ At the beginning of your upkeep, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
+SVar:TrigSurveil:DB$ Surveil | Amount$ 1
 A:AB$ Mana | Cost$ ExileFromGrave<1/Card> | Produced$ C | RestrictValid$ Spell.nonColorless+!hasXCost | SpellDescription$ Add {C}. Spend this mana only to cast a spell that's one or more colors without {X} in its mana cost.
 AI:RemoveDeck:All
-Oracle:At the beginning of your upkeep, look at the top card of your library. You may put that card into your graveyard.\nExile a card from your graveyard: Add {C}. Spend this mana only to cast a spell that's one or more colors without {X} in its mana cost.
+DeckHas:Ability$Surveil|Graveyard
+Oracle:At the beginning of your upkeep, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)\nExile a card from your graveyard: Add {C}. Spend this mana only to cast a spell that's one or more colors without {X} in its mana cost.
diff --git a/forge-gui/res/cardsfolder/u/uurg_spawn_of_turg.txt b/forge-gui/res/cardsfolder/u/uurg_spawn_of_turg.txt
index 3b9bc1ac44e..867731a221b 100644
--- a/forge-gui/res/cardsfolder/u/uurg_spawn_of_turg.txt
+++ b/forge-gui/res/cardsfolder/u/uurg_spawn_of_turg.txt
@@ -3,10 +3,10 @@ ManaCost:B B G
 Types:Legendary Creature Frog Beast
 PT:*/5
 S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | Description$ CARDNAME's power is equal to the number of land cards in your graveyard.
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDig | TriggerDescription$ At the beginning of your upkeep, look at the top card of your library. You may put that card into your graveyard.
-SVar:TrigDig:DB$ Dig | DigNum$ 1 | DestinationZone$ Graveyard | Optional$ True | LibraryPosition2$ 0
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSurveil | TriggerDescription$ At the beginning of your upkeep, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)
+SVar:TrigSurveil:DB$ Surveil | Amount$ 1
 A:AB$ GainLife | Cost$ B G Sac<1/Land> | LifeAmount$ 2
 SVar:X:Count$TypeInYourYard.Land
 DeckHas:Ability$LifeGain|Graveyard
 DeckHints:Ability$Graveyard
-Oracle:Uurg, Spawn of Turg's power is equal to the number of land cards in your graveyard.\nAt the beginning of your upkeep, look at the top card of your library. You may put that card into your graveyard.\n{B}{G}, Sacrifice a land: You gain 2 life.
+Oracle:Uurg, Spawn of Turg's power is equal to the number of land cards in your graveyard.\nAt the beginning of your upkeep, surveil 1. (Look at the top card of your library. You may put that card into your graveyard.)\n{B}{G}, Sacrifice a land: You gain 2 life.