diff --git a/forge-gui/res/blockdata/blocks.txt b/forge-gui/res/blockdata/blocks.txt
index 5d062be3068..67d158df0af 100644
--- a/forge-gui/res/blockdata/blocks.txt
+++ b/forge-gui/res/blockdata/blocks.txt
@@ -84,4 +84,4 @@ Modern Horizons, 3/6/WAR, MH1
 Core Set 2020, 3/6/M20, M20
 Throne of Eldraine, 3/6/ELD, ELD
 Theros Beyond Death, 3/6/THB, THB
-Mystery Booster, 3/6/MB1, MB1
\ No newline at end of file
+Mystery Booster, 3/6/THB, MB1
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/g/ghastly_demise.txt b/forge-gui/res/cardsfolder/g/ghastly_demise.txt
index 78ced7746b3..f04b0f2ac15 100644
--- a/forge-gui/res/cardsfolder/g/ghastly_demise.txt
+++ b/forge-gui/res/cardsfolder/g/ghastly_demise.txt
@@ -1,7 +1,7 @@
 Name:Ghastly Demise
 ManaCost:B
 Types:Instant
-A:SP$ Destroy | Cost$ B | ValidTgts$ Creature.nonBlack+toughnessLEX | TgtPrompt$ Select target nonblack creature with toughness less than or equal to the number of cards in your graveyard. | References$ X | SpellDescription$ Destroy target nonblack creature if its toughness is less than or equal to the number of cards in your graveyard.
+A:SP$ Destroy | Cost$ B | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | ConditionCheckSVar$ Y | ConditionSVarCompare$ LEX | References$ X,Y | StackDescription$ SpellDescription | SpellDescription$ Destroy target nonblack creature if its toughness is less than or equal to the number of cards in your graveyard.
+SVar:Y:Targeted$CardToughness
 SVar:X:Count$InYourYard
-SVar:Picture:http://www.wizards.com/global/images/magic/general/ghastly_demise.jpg
 Oracle:Destroy target nonblack creature if its toughness is less than or equal to the number of cards in your graveyard.
diff --git a/forge-gui/res/cardsfolder/n/nissas_pilgrimage.txt b/forge-gui/res/cardsfolder/n/nissas_pilgrimage.txt
index 3ad0c877919..f89143a06a0 100644
--- a/forge-gui/res/cardsfolder/n/nissas_pilgrimage.txt
+++ b/forge-gui/res/cardsfolder/n/nissas_pilgrimage.txt
@@ -1,9 +1,10 @@
 Name:Nissa's Pilgrimage
 ManaCost:2 G
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ 2 G | Origin$ Library | Destination$ Battlefield | Tapped$ True | ChangeType$ Land.Basic+Forest | ChangeNum$ 1 | SubAbility$ DBChangeZone1 | NoShuffle$ True | SpellDescription$ Search your library for up to two basic Forest cards, reveal those cards, and put one onto the battlefield tapped and the rest into your hand. Then shuffle your library. Spell mastery — If there are two or more instant or sorcery cards in your graveyard, search your library for up to three basic Forest cards instead of two.
-SVar:DBChangeZone1:DB$ChangeZone | Origin$ Library | Destination$ Hand | SubAbility$ DBChangeZone2 | ChangeType$ Land.Basic+Forest | ChangeNum$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ LT2 | References$ X
-SVar:DBChangeZone2:DB$ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Basic+Forest | ChangeNum$ 2 | ConditionCheckSVar$ X | ConditionSVarCompare$ GE2 | References$ X
-SVar:X:Count$ValidGraveyard Instant.YouOwn,Sorcery.YouOwn
-SVar:Picture:http://www.wizards.com/global/images/magic/general/nissas_pilgrimage.jpg
+A:SP$ ChangeZone | Cost$ 2 G | Origin$ Library | Destination$ Library | ChangeType$ Land.Basic+Forest | ChangeNum$ X | References$ X,Y | RememberChanged$ True | SubAbility$ DBBattlefield | Shuffle$ False | StackDescription$ SpellDescription | SpellDescription$ Search your library for up to two basic Forest cards, reveal those cards, and put one onto the battlefield tapped and the rest into your hand. Then shuffle your library. Spell mastery — If there are two or more instant or sorcery cards in your graveyard, search your library for up to three basic Forest cards instead of two.
+SVar:DBBattlefield:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | Tapped$ True | SubAbility$ DBHand | ChangeType$ Card.IsRemembered | ChangeNum$ 1 | Mandatory$ True | NoLooking$ True | SelectPrompt$ Select a card to go to the battlefield | Shuffle$ False | StackDescription$ None
+SVar:DBHand:DB$ ChangeZone | Origin$ Library | Destination$ Hand | Defined$ Remembered | NoLooking$ True | StackDescription$ None | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:X:Count$Compare Y GE2.3.2
+SVar:Y:Count$ValidGraveyard Instant.YouOwn,Sorcery.YouOwn
 Oracle:Search your library for up to two basic Forest cards, reveal those cards, and put one onto the battlefield tapped and the rest into your hand. Then shuffle your library.\nSpell mastery — If there are two or more instant or sorcery cards in your graveyard, search your library for up to three basic Forest cards instead of two.
diff --git a/forge-gui/res/cardsfolder/t/the_birth_of_meletis.txt b/forge-gui/res/cardsfolder/t/the_birth_of_meletis.txt
index 349f1e790d9..27021aac864 100644
--- a/forge-gui/res/cardsfolder/t/the_birth_of_meletis.txt
+++ b/forge-gui/res/cardsfolder/t/the_birth_of_meletis.txt
@@ -3,7 +3,7 @@ ManaCost:1 W
 Types:Enchantment Saga
 K:Saga:3:TrigChange,TrigToken,TrigGainLife
 SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Land.Plains+Basic | ChangeNum$ 1 | SpellDescription$ Search your library for a basic Plains card, reveal it, put it into your hand, then shuffle your library.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_0_4_wall_defender | TokenOwner$ You | LegacyImage$ c 0 4 wall defender thb | SpellDescription$ Create a 0/4 colorless Wall artifact creature token with defender.
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ c_0_4_a_wall_defender | TokenOwner$ You | LegacyImage$ c 0 4 wall defender thb | SpellDescription$ Create a 0/4 colorless Wall artifact creature token with defender.
 SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2 | SpellDescription$ You gain 2 life.
 DeckHas:Ability$LifeGain & Ability$Token
 Oracle:(As this Saga enters and after your draw step, add a lore counter. Sacrifice after III.)\nI - Search your library for a basic Plains card, reveal it, put it into your hand, then shuffle your library.\nII - Create a 0/4 colorless Wall artifact creature token with defender.\nIII - You gain 2 life.
diff --git a/forge-gui/res/editions/Theros Beyond Death.txt b/forge-gui/res/editions/Theros Beyond Death.txt
index b6d93e220f7..6d8b9f91a2d 100644
--- a/forge-gui/res/editions/Theros Beyond Death.txt	
+++ b/forge-gui/res/editions/Theros Beyond Death.txt	
@@ -377,7 +377,7 @@ Prerelease=6 Boosters, 1 RareMythic+
 
 [tokens]
 b_2_2_zombie
-c_0_4_wall_defender
+c_0_4_a_wall_defender
 g_1_2_spider_reach
 g_2_2_wolf
 r_x_1_elemental_trample_haste
diff --git a/forge-gui/res/tokenscripts/c_0_4_wall_defender.txt b/forge-gui/res/tokenscripts/c_0_4_a_wall_defender.txt
similarity index 67%
rename from forge-gui/res/tokenscripts/c_0_4_wall_defender.txt
rename to forge-gui/res/tokenscripts/c_0_4_a_wall_defender.txt
index 03a29952252..2b5be99e3e2 100644
--- a/forge-gui/res/tokenscripts/c_0_4_wall_defender.txt
+++ b/forge-gui/res/tokenscripts/c_0_4_a_wall_defender.txt
@@ -1,6 +1,6 @@
 Name:Wall
 ManaCost:no cost
-Types:Creature Wall
+Types:Artifact Creature Wall
 PT:0/4
 K:Defender
 Oracle:Defender