diff --git a/forge-gui/res/cardsfolder/a/ajani_valiant_protector.txt b/forge-gui/res/cardsfolder/a/ajani_valiant_protector.txt
index 8c43b1d505f..1e9f4172580 100644
--- a/forge-gui/res/cardsfolder/a/ajani_valiant_protector.txt
+++ b/forge-gui/res/cardsfolder/a/ajani_valiant_protector.txt
@@ -4,9 +4,8 @@ Types:Legendary Planeswalker Ajani
 Loyalty:4
 A:AB$ PutCounter | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | CounterNum$ 2 | CounterType$ P1P1 | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | Planeswalker$ True | SpellDescription$ Put two +1/+1 counters on up to one target creature.
 A:AB$ DigUntil | Cost$ AddCounter<1/LOYALTY> | Valid$ Card.Creature | ValidDescription$ creature | RevealedDestination$ Library | RevealedLibraryPosition$ -1 | RevealRandomOrder$ True | FoundDestination$ Hand | Planeswalker$ True | SpellDescription$ Reveal cards from the top of your library until you reveal a creature card. Put that card into your hand and the rest on the bottom of your library in a random order.
-A:AB$ PutCounter | Cost$ SubCounter<11/LOYALTY> | Planeswalker$ True | Ultimate$ True | CounterNum$ X | CounterType$ P1P1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBPump | SpellDescription$ Put X +1/+1 counters on target creature, where X is your life total. That creature gains trample until end of turn.
+A:AB$ PutCounter | Cost$ SubCounter<11/LOYALTY> | Planeswalker$ True | Ultimate$ True | CounterNum$ X | References$ X | CounterType$ P1P1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBPump | SpellDescription$ Put X +1/+1 counters on target creature, where X is your life total. That creature gains trample until end of turn.
 SVar:DBPump:DB$ Pump | Defined$ Targeted | KW$ Trample
 SVar:X:Count$YourLifeTotal
 DeckHints:Name$Ajani's Aid
-SVar:Picture:http://www.wizards.com/global/images/magic/general/ajani_valiant_protector.jpg
 Oracle:[+2]: Put two +1/+1 counters on up to one target creature.\n[+1]: Reveal cards from the top of your library until you reveal a creature card. Put that card into your hand and the rest on the bottom of your library in a random order.\n[−11]: Put X +1/+1 counters on target creature, where X is your life total. That creature gains trample until end of turn.
diff --git a/forge-gui/res/cardsfolder/a/arsenal_thresher.txt b/forge-gui/res/cardsfolder/a/arsenal_thresher.txt
index 1ed3faebb83..eee9b140561 100644
--- a/forge-gui/res/cardsfolder/a/arsenal_thresher.txt
+++ b/forge-gui/res/cardsfolder/a/arsenal_thresher.txt
@@ -4,9 +4,8 @@ Types:Artifact Creature Construct
 PT:2/2
 K:ETBReplacement:Other:DBReveal
 SVar:DBReveal:DB$ Reveal | RevealValid$ Card.Artifact+YouCtrl | AnyNumber$ True | RememberRevealed$ True | SubAbility$ DBPutCounters | SpellDescription$ As CARDNAME enters the battlefield, you may reveal any number of other artifact cards from your hand. CARDNAME enters the battlefield with a +1/+1 counter on it for each card revealed this way.
-SVar:DBPutCounters:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X | SubAbility$ DBCleanup
+SVar:DBPutCounters:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X | References$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 AI:RemoveDeck:All
-SVar:Picture:http://www.wizards.com/global/images/magic/general/arsenal_thresher.jpg
 Oracle:As Arsenal Thresher enters the battlefield, you may reveal any number of other artifact cards from your hand. Arsenal Thresher enters the battlefield with a +1/+1 counter on it for each card revealed this way.
diff --git a/forge-gui/res/cardsfolder/b/beastmasters_magemark.txt b/forge-gui/res/cardsfolder/b/beastmasters_magemark.txt
index 596f6f197b2..c750bca3377 100644
--- a/forge-gui/res/cardsfolder/b/beastmasters_magemark.txt
+++ b/forge-gui/res/cardsfolder/b/beastmasters_magemark.txt
@@ -5,7 +5,6 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 2 G | ValidTgts$ Creature | AILogic$ Pump
 S:Mode$ Continuous | Affected$ Creature.enchanted+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures you control that are enchanted get +1/+1.
 T:Mode$ AttackerBlocked | ValidCard$ Creature.enchanted+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever a creature you control that's enchanted becomes blocked, it gets +1/+1 until end of turn for each creature blocking it.
-SVar:TrigPump:DB$Pump | Defined$ TriggeredAttacker | NumAtt$ +X | NumDef$ +X
+SVar:TrigPump:DB$Pump | Defined$ TriggeredAttacker | NumAtt$ +X | NumDef$ +X | References$ X
 SVar:X:TriggerCount$NumBlockers
-SVar:Picture:http://www.wizards.com/global/images/magic/general/beastmasters_magemark.jpg
 Oracle:Enchant creature\nCreatures you control that are enchanted get +1/+1.\nWhenever a creature you control that's enchanted becomes blocked, it gets +1/+1 until end of turn for each creature blocking it.
diff --git a/forge-gui/res/cardsfolder/b/blood_tyrant.txt b/forge-gui/res/cardsfolder/b/blood_tyrant.txt
index b8945f17369..a89e1e7cec3 100644
--- a/forge-gui/res/cardsfolder/b/blood_tyrant.txt
+++ b/forge-gui/res/cardsfolder/b/blood_tyrant.txt
@@ -6,9 +6,8 @@ K:Flying
 K:Trample
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of your upkeep, each player loses 1 life. Put a +1/+1 counter on CARDNAME for each 1 life lost this way.
 SVar:TrigLoseLife:DB$LoseLife | Defined$ Player | LifeAmount$ 1 | SubAbility$ DBPutCounter
-SVar:DBPutCounter:DB$PutCounter | CounterType$ P1P1 | CounterNum$ AFLifeLost
+SVar:DBPutCounter:DB$PutCounter | CounterType$ P1P1 | CounterNum$ AFLifeLost | References$ AFLifeLost
 T:Mode$ LosesGame | Execute$ TrigCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever a player loses the game, put five +1/+1 counters on CARDNAME.
 SVar:TrigCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 5
 SVar:AFLifeLost:Number$0
-SVar:Picture:http://www.wizards.com/global/images/magic/general/blood_tyrant.jpg
 Oracle:Flying, trample\nAt the beginning of your upkeep, each player loses 1 life. Put a +1/+1 counter on Blood Tyrant for each 1 life lost this way.\nWhenever a player loses the game, put five +1/+1 counters on Blood Tyrant.
diff --git a/forge-gui/res/cardsfolder/c/crown_of_empires.txt b/forge-gui/res/cardsfolder/c/crown_of_empires.txt
index 5ea49da31e7..fe20880d98b 100644
--- a/forge-gui/res/cardsfolder/c/crown_of_empires.txt
+++ b/forge-gui/res/cardsfolder/c/crown_of_empires.txt
@@ -1,13 +1,12 @@
 Name:Crown of Empires
 ManaCost:2
 Types:Artifact
-A:AB$ Tap | Cost$ 3 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | ConditionCheckSVar$ M12Complete | ConditionSVarCompare$ EQ0 | SubAbility$ DBControl | SpellDescription$ Tap target creature. Gain control of that creature instead if you control artifacts named Scepter of Empires and Throne of Empires.
-SVar:DBControl:DB$ GainControl | Defined$ Targeted | ConditionCheckSVar$ M12Complete
+A:AB$ Tap | Cost$ 3 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | ConditionCheckSVar$ M12Complete | ConditionSVarCompare$ EQ0 | References$ M12Complete,AllM12Empires,X,Y | SubAbility$ DBControl | SpellDescription$ Tap target creature. Gain control of that creature instead if you control artifacts named Scepter of Empires and Throne of Empires.
+SVar:DBControl:DB$ GainControl | Defined$ Targeted | ConditionCheckSVar$ M12Complete | References$ M12Complete,AllM12Empires,X,Y
 AI:RemoveDeck:Random
 DeckHints:Name$Scepter of Empires|Throne of Empires
 SVar:M12Complete:Count$Compare AllM12Empires GT0.1.0
 SVar:AllM12Empires:SVar$X/Times.Y
 SVar:X:Count$Valid Artifact.namedScepter of Empires+YouCtrl
 SVar:Y:Count$Valid Artifact.namedThrone of Empires+YouCtrl
-SVar:Picture:http://www.wizards.com/global/images/magic/general/crown_of_empires.jpg
 Oracle:{3}, {T}: Tap target creature. Gain control of that creature instead if you control artifacts named Scepter of Empires and Throne of Empires.
diff --git a/forge-gui/res/cardsfolder/e/exotic_curse.txt b/forge-gui/res/cardsfolder/e/exotic_curse.txt
index 9ac428b4ebd..bcf3893ebbe 100644
--- a/forge-gui/res/cardsfolder/e/exotic_curse.txt
+++ b/forge-gui/res/cardsfolder/e/exotic_curse.txt
@@ -3,8 +3,7 @@ ManaCost:2 B
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 2 B | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ -X | AddToughness$ -X | Description$ Domain — Enchanted creature gets -1/-1 for each basic land type among lands you control.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ -X | AddToughness$ -X | References$ X | Description$ Domain — Enchanted creature gets -1/-1 for each basic land type among lands you control.
 SVar:X:Count$Domain
 SVar:BuffedBy:Plains,Island,Swamp,Mountain,Forest
-SVar:Picture:http://www.wizards.com/global/images/magic/general/exotic_curse.jpg
 Oracle:Enchant creature\nDomain — Enchanted creature gets -1/-1 for each basic land type among lands you control.
diff --git a/forge-gui/res/cardsfolder/k/kagemaros_clutch.txt b/forge-gui/res/cardsfolder/k/kagemaros_clutch.txt
index 77138caf9fe..7c2cbd57bc6 100644
--- a/forge-gui/res/cardsfolder/k/kagemaros_clutch.txt
+++ b/forge-gui/res/cardsfolder/k/kagemaros_clutch.txt
@@ -3,8 +3,7 @@ ManaCost:3 B
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ 3 B | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ -X | AddToughness$ -X | Description$ Enchanted creature gets -X/-X, where X is the number of cards in your hand.
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ -X | AddToughness$ -X | References$ X | Description$ Enchanted creature gets -X/-X, where X is the number of cards in your hand.
 SVar:X:Count$InYourHand
 AI:RemoveDeck:All
-SVar:Picture:http://www.wizards.com/global/images/magic/general/kagemaros_clutch.jpg
 Oracle:Enchant creature\nEnchanted creature gets -X/-X, where X is the number of cards in your hand.
diff --git a/forge-gui/res/cardsfolder/p/phantom_nomad.txt b/forge-gui/res/cardsfolder/p/phantom_nomad.txt
index 83a54fb265b..a39bb6f42d7 100644
--- a/forge-gui/res/cardsfolder/p/phantom_nomad.txt
+++ b/forge-gui/res/cardsfolder/p/phantom_nomad.txt
@@ -8,9 +8,8 @@ T:Mode$ Phase | Static$ True | Phase$ EndCombat | Execute$ DBCleanup
 R:Event$ DamageDone | IsCombat$ True | ActiveZones$ Battlefield | ValidTarget$ Card.Self | ReplaceWith$ DBRemoveCountersInCombat | PreventionEffect$ True | Description$ If damage would be dealt to CARDNAME, prevent that damage. Remove a +1/+1 counter from CARDNAME.
 R:Event$ DamageDone | IsCombat$ False | ActiveZones$ Battlefield | ValidTarget$ Card.Self | ReplaceWith$ DBRemoveCounters | PreventionEffect$ True | Secondary$ True | Description$ If damage would be dealt to CARDNAME, prevent that damage. Remove a +1/+1 counter from CARDNAME.
 SVar:DBRemoveCountersInCombat:DB$ RemoveCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionCheckSVar$ TimesFlagged | ConditionSVarCompare$ EQ0 | SubAbility$ DBFlagRemoveCounters
-SVar:DBFlagRemoveCounters:DB$ StoreSVar | SVar$ TimesFlagged | Type$ CountSVar | Expression$ TimesFlagged/Plus.1
+SVar:DBFlagRemoveCounters:DB$ StoreSVar | SVar$ TimesFlagged | Type$ CountSVar | Expression$ TimesFlagged/Plus.1 | References$ TimesFlagged
 SVar:DBRemoveCounters:DB$ RemoveCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:TimesFlagged:Number$0
 SVar:DBCleanup:DB$ StoreSVar | SVar$ TimesFlagged | Type$ Number | Expression$ 0
-SVar:Picture:http://www.wizards.com/global/images/magic/general/phantom_nomad.jpg
 Oracle:Phantom Nomad enters the battlefield with two +1/+1 counters on it.\nIf damage would be dealt to Phantom Nomad, prevent that damage. Remove a +1/+1 counter from Phantom Nomad.
diff --git a/forge-gui/res/cardsfolder/s/souls_of_the_faultless.txt b/forge-gui/res/cardsfolder/s/souls_of_the_faultless.txt
index f988e928ce6..ddc7d9c8b84 100644
--- a/forge-gui/res/cardsfolder/s/souls_of_the_faultless.txt
+++ b/forge-gui/res/cardsfolder/s/souls_of_the_faultless.txt
@@ -4,9 +4,8 @@ Types:Creature Spirit
 PT:0/4
 K:Defender
 T:Mode$ DamageDoneOnce | CombatDamage$ True | ValidTarget$ Card.Self | Execute$ TrigGain | TriggerDescription$ Whenever CARDNAME is dealt combat damage, you gain that much life and attacking player loses that much life.
-SVar:TrigGain:DB$ GainLife | Defined$ You | LifeAmount$ X | SubAbility$ DBDrain
-SVar:DBDrain:DB$ LoseLife | Defined$ AttackingPlayer | LifeAmount$ X
+SVar:TrigGain:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X | SubAbility$ DBDrain
+SVar:DBDrain:DB$ LoseLife | Defined$ AttackingPlayer | LifeAmount$ X | References$ X
 SVar:X:TriggerCount$DamageAmount
 SVar:HasCombatEffect:TRUE
-SVar:Picture:http://www.wizards.com/global/images/magic/general/souls_of_the_faultless.jpg
 Oracle:Defender (This creature can't attack.)\nWhenever Souls of the Faultless is dealt combat damage, you gain that much life and attacking player loses that much life.
diff --git a/forge-gui/res/cardsfolder/t/tribal_unity.txt b/forge-gui/res/cardsfolder/t/tribal_unity.txt
index cceb977a452..7a05d2b0f52 100644
--- a/forge-gui/res/cardsfolder/t/tribal_unity.txt
+++ b/forge-gui/res/cardsfolder/t/tribal_unity.txt
@@ -2,8 +2,7 @@ Name:Tribal Unity
 ManaCost:X 2 G
 Types:Instant
 A:SP$ ChooseType | Cost$ X 2 G | References$ X | Defined$ You | Type$ Creature | AILogic$ MostProminentComputerControls | SubAbility$ TribalPump | SpellDescription$ Creatures of the creature type of your choice get +X/+X until end of turn.
-SVar:TribalPump:DB$ PumpAll | ValidCards$ Creature.ChosenType | NumAtt$ +X | NumDef$ +X
+SVar:TribalPump:DB$ PumpAll | ValidCards$ Creature.ChosenType | NumAtt$ +X | NumDef$ +X | References$ X
 SVar:X:Count$xPaid
 AI:RemoveDeck:All
-SVar:Picture:http://www.wizards.com/global/images/magic/general/tribal_unity.jpg
 Oracle:Creatures of the creature type of your choice get +X/+X until end of turn.
diff --git a/forge-gui/res/cardsfolder/v/vein_drinker.txt b/forge-gui/res/cardsfolder/v/vein_drinker.txt
index 18c3e5027da..91aa8508d61 100644
--- a/forge-gui/res/cardsfolder/v/vein_drinker.txt
+++ b/forge-gui/res/cardsfolder/v/vein_drinker.txt
@@ -5,8 +5,8 @@ PT:4/4
 K:Flying
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.DamagedBy | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature dealt damage by CARDNAME this turn dies, put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | ConditionPresent$ Card.StrictlySelf
-A:AB$ DealDamage | Cost$ R T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | References$ X,Y | SubAbility$ DamageThis | SpellDescription$ CARDNAME deals damage equal to its power to target creature. That creature deals damage equal to its power to CARDNAME.
-SVar:DamageThis:DB$DealDamage | Defined$ Self | DamageSource$ Targeted | NumDmg$ Y
+A:AB$ DealDamage | Cost$ R T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ X | References$ X | SubAbility$ DamageThis | SpellDescription$ CARDNAME deals damage equal to its power to target creature. That creature deals damage equal to its power to CARDNAME.
+SVar:DamageThis:DB$DealDamage | Defined$ Self | DamageSource$ Targeted | NumDmg$ Y | References$ Y
 SVar:X:Count$CardPower
 SVar:Y:Targeted$CardPower
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vein_drinker.jpg
diff --git a/forge-gui/res/cardsfolder/w/wrack_with_madness.txt b/forge-gui/res/cardsfolder/w/wrack_with_madness.txt
index 590e1109bb3..364572dbcdf 100644
--- a/forge-gui/res/cardsfolder/w/wrack_with_madness.txt
+++ b/forge-gui/res/cardsfolder/w/wrack_with_madness.txt
@@ -1,8 +1,7 @@
 Name:Wrack with Madness
 ManaCost:3 R
 Types:Sorcery
-A:SP$ DealDamage | Cost$ 3 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | DamageSource$ Targeted | NumDmg$ X | SpellDescription$ Target creature deals damage to itself equal to its power.
+A:SP$ DealDamage | Cost$ 3 R | ValidTgts$ Creature | TgtPrompt$ Select target creature | DamageSource$ Targeted | NumDmg$ X | References$ X | SpellDescription$ Target creature deals damage to itself equal to its power.
 SVar:X:Targeted$CardPower
 AI:RemoveDeck:All
-SVar:Picture:http://www.wizards.com/global/images/magic/general/wrack_with_madness.jpg
 Oracle:Target creature deals damage to itself equal to its power.