diff --git a/forge-gui/res/cardsfolder/upcoming/aphemia_the_cacophony.txt b/forge-gui/res/cardsfolder/upcoming/aphemia_the_cacophony.txt
index af936fe578b..30c2846cc09 100755
--- a/forge-gui/res/cardsfolder/upcoming/aphemia_the_cacophony.txt
+++ b/forge-gui/res/cardsfolder/upcoming/aphemia_the_cacophony.txt
@@ -3,9 +3,6 @@ ManaCost:1 B
 Types:Legendary Enchantment Creature Harpy
 PT:2/1
 K:Flying
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ DBChooseCard | TriggerDescription$ At the beginning of your end step, you may exile an enchantment card from your graveyard. If you do, create a 2/2 black Zombie creature token.
-SVar:DBChooseCard:DB$ ChooseCard | Choices$ Creature.YouCtrl,Enchantment.YouCtrl | Optional$ Yes | ChoiceTitle$ Choose an enchantment to exile | ChoiceZone$ Graveyard | Amount$ 1 | AILogic$ WorstCard | SubAbility$ DBChangeZone
-SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Exile | Defined$ ChosenCard | RememberChanged$ True | SubAbility$ DBToken
-SVar:DBToken:DB$ Token | LegacyImage$ b 2 2 zombie thb | TokenScript$ b_2_2_zombie | TokenOwner$ You | TokenAmount$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True | ClearRemembered$ True
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ DBToken | TriggerDescription$ At the beginning of your end step, you may exile an enchantment card from your graveyard. If you do, create a 2/2 black Zombie creature token.
+SVar:DBToken:AB$ Token | Cost$ ExileFromGrave<1/Enchantment> | LegacyImage$ b 2 2 zombie thb | TokenScript$ b_2_2_zombie | TokenOwner$ You | TokenAmount$ 1
 Oracle:Flying\nAt the beginning of your end step, you may exile an enchantment card from your graveyard. If you do, create a 2/2 black Zombie creature token.
diff --git a/forge-gui/res/cardsfolder/upcoming/atris_oracle_of_half_truths.txt b/forge-gui/res/cardsfolder/upcoming/atris_oracle_of_half_truths.txt
index cdfd27590b2..e22158e926d 100644
--- a/forge-gui/res/cardsfolder/upcoming/atris_oracle_of_half_truths.txt
+++ b/forge-gui/res/cardsfolder/upcoming/atris_oracle_of_half_truths.txt
@@ -4,10 +4,10 @@ Types:Legendary Creature Human Advisor
 PT:3/2
 K:Menace
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBChoosePlayer | TriggerDescription$ When CARDNAME enters the battlefield, target opponent looks at the top three cards of your library and separates them into a face-down pile and a face-up pile. Put one pile into your hand and the other into your graveyard.
-SVar:DBChoosePlayer:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | SubAbility$ DBPeekAndReveal
+SVar:DBChoosePlayer:DB$ Pump | ValidTgts$ Opponent | IsCurse$ True | SubAbility$ DBPeekAndReveal
 SVar:DBPeekAndReveal:DB$ PeekAndReveal | Defined$ You | PeekAmount$ 3 | NoPeek$ True | NoReveal$ True | RememberPeeked$ True | SubAbility$ Separate
-SVar:Separate:DB$ TwoPiles | Defined$ You | Separator$ ChosenPlayer | Chooser$ You | DefinedCards$ Remembered | ChosenPile$ DBHand | UnchosenPile$ DBGrave | Zone$ Library | FaceDown$ One | StackDescription$ None
+SVar:Separate:DB$ TwoPiles | Defined$ You | Separator$ Targeted | Chooser$ You | DefinedCards$ Remembered | ChosenPile$ DBHand | UnchosenPile$ DBGrave | Zone$ Library | FaceDown$ One | StackDescription$ None
 SVar:DBHand:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Hand | SubAbility$ DBCleanup
 SVar:DBGrave:DB$ ChangeZone | Defined$ Remembered | Origin$ Library | Destination$ Graveyard | SubAbility$ DBCleanup
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosen$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:Menace\nWhen Atris, Oracle of Half-Truths enters the battlefield, target opponent looks at the top three cards of your library and separates them into a face-down pile and a face-up pile. Put one pile into your hand and the other into your graveyard.
diff --git a/forge-gui/res/cardsfolder/upcoming/pharikas_spawn.txt b/forge-gui/res/cardsfolder/upcoming/pharikas_spawn.txt
index 2810c0ade69..1a5b8e249a9 100755
--- a/forge-gui/res/cardsfolder/upcoming/pharikas_spawn.txt
+++ b/forge-gui/res/cardsfolder/upcoming/pharikas_spawn.txt
@@ -3,8 +3,9 @@ ManaCost:3 B
 Types:Creature Gorgon
 PT:3/4
 K:Escape:5 B ExileFromGrave<3/Card.Other/other>
-K:etbCounter:P1P1:2:ValidCard$ Card.Self+escaped:CARDNAME escapes with two +1/+1 counters on it.
-K:ETBReplacement:Other:DBSac:Mandatory::Card.Self+escaped:When CARDNAME enters the battlefield this way, each opponent sacrifices a non-Gorgon creature.
-#ETBReplacement line needs some Hanmac attention
+R:Event$ Moved | ValidCard$ Card.Self+escaped | Destination$ Battlefield | ReplaceWith$ ETBCounters | Description$ CARDNAME escapes with two +1/+1 counters on it. When it enters the battlefield this way, each opponent sacrifices a non-Gorgon creature.
+SVar:ETBCounters:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | ETB$ True | CounterNum$ 2 | SubAbility$ MoveToPlay
+SVar:MoveToPlay:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard | SubAbility$ DBTrigger
+SVar:DBTrigger:DB$ ImmediateTrigger | Execute$ DBSac | TriggerDescription$ When it enters the battlefield this way, each opponent sacrifices a non-Gorgon creature.
 SVar:DBSac:DB$ Sacrifice | Defined$ Player.Opponent | SacValid$ Creature.nonGorgon
 Oracle:Escape—{5}{B}, Exile three other cards from your graveyard. (You may cast this card from your graveyard for its escape cost.)\nPharika's Spawn escapes with two +1/+1 counters on it. When it enters the battlefield this way, each opponent sacrifices a non-Gorgon creature.