diff --git a/forge-gui/res/cardsfolder/f/figure_of_destiny.txt b/forge-gui/res/cardsfolder/f/figure_of_destiny.txt
index 89e00e84ba0..64e1eab845e 100644
--- a/forge-gui/res/cardsfolder/f/figure_of_destiny.txt
+++ b/forge-gui/res/cardsfolder/f/figure_of_destiny.txt
@@ -3,7 +3,7 @@ ManaCost:RW
 Types:Creature Kithkin
 PT:1/1
 A:AB$ Animate | Cost$ RW | Types$ Kithkin,Spirit | Permanent$ True | Power$ 2 | Toughness$ 2 | SpellDescription$ CARDNAME becomes a Kithkin Spirit with base power and toughness 2/2.
-A:AB$ Animate | Cost$ RW RW RW | IsPresent$ Card.Self+Spirit | PresentCompare$ EQ1 | Types$ Kithkin,Spirit,Warrior | Permanent$ True | Power$ 4 | Toughness$ 4 | SpellDescription$ If CARDNAME is a Spirit, it becomes a Kithkin Spirit Warrior with base power and toughness 4/4.
-A:AB$ Animate | Cost$ RW RW RW RW RW RW| IsPresent$ Card.Self+Warrior | PresentCompare$ EQ1 | Types$ Kithkin,Spirit,Warrior,Avatar | Permanent$ True | Power$ 8 | Toughness$ 8 | Keywords$ Flying & First Strike | SpellDescription$ If CARDNAME is a Warrior, it becomes a Kithkin Spirit Warrior Avatar with base power and toughness 8/8, flying, and first strike.
+A:AB$ Animate | Cost$ RW RW RW | ConditionPresent$ Card.Self+Spirit | Types$ Kithkin,Spirit,Warrior | Permanent$ True | Power$ 4 | Toughness$ 4 | SpellDescription$ If CARDNAME is a Spirit, it becomes a Kithkin Spirit Warrior with base power and toughness 4/4.
+A:AB$ Animate | Cost$ RW RW RW RW RW RW| ConditionPresent$ Card.Self+Warrior | Types$ Kithkin,Spirit,Warrior,Avatar | Permanent$ True | Power$ 8 | Toughness$ 8 | Keywords$ Flying & First Strike | SpellDescription$ If CARDNAME is a Warrior, it becomes a Kithkin Spirit Warrior Avatar with base power and toughness 8/8, flying, and first strike.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/figure_of_destiny.jpg
 Oracle:{R/W}: Figure of Destiny becomes a Kithkin Spirit with base power and toughness 2/2.\n{R/W}{R/W}{R/W}: If Figure of Destiny is a Spirit, it becomes a Kithkin Spirit Warrior with base power and toughness 4/4.\n{R/W}{R/W}{R/W}{R/W}{R/W}{R/W}: If Figure of Destiny is a Warrior, it becomes a Kithkin Spirit Warrior Avatar with base power and toughness 8/8, flying, and first strike.
diff --git a/forge-gui/res/cardsfolder/w/warden_of_the_first_tree.txt b/forge-gui/res/cardsfolder/w/warden_of_the_first_tree.txt
index 567d81f1ba5..d0f19da75db 100644
--- a/forge-gui/res/cardsfolder/w/warden_of_the_first_tree.txt
+++ b/forge-gui/res/cardsfolder/w/warden_of_the_first_tree.txt
@@ -3,7 +3,7 @@ ManaCost:G
 Types:Creature Human
 PT:1/1
 A:AB$ Animate | Cost$ 1 WB | Types$ Human,Warrior | Permanent$ True | Power$ 3 | Toughness$ 3 | SpellDescription$ CARDNAME becomes a Human Warrior with base power and toughness 3/3.
-A:AB$ Animate | Cost$ 2 WB WB | Defined$ Self | IsPresent$ Card.Self+Warrior | PresentCompare$ EQ1 | Types$ Human,Warrior,Spirit | Permanent$ True | Keywords$ Trample & Lifelink | SpellDescription$ If CARDNAME is a Warrior, it becomes a Human Spirit Warrior with trample and lifelink.
-A:AB$ PutCounter | Cost$ 3 WB WB WB | IsPresent$ Card.Self+Spirit | PresentCompare$ EQ1 | CounterType$ P1P1 | CounterNum$ 5 | SpellDescription$ If CARDNAME is a Spirit, put five +1/+1 counters on it.
+A:AB$ Animate | Cost$ 2 WB WB | Defined$ Self | ConditionPresent$ Card.Self+Warrior | Types$ Human,Warrior,Spirit | Permanent$ True | Keywords$ Trample & Lifelink | SpellDescription$ If CARDNAME is a Warrior, it becomes a Human Spirit Warrior with trample and lifelink.
+A:AB$ PutCounter | Cost$ 3 WB WB WB | ConditionPresent$ Card.Self+Spirit | CounterType$ P1P1 | CounterNum$ 5 | SpellDescription$ If CARDNAME is a Spirit, put five +1/+1 counters on it.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/warden_of_the_first_tree.jpg
 Oracle:{1}{W/B}: Warden of the First Tree becomes a Human Warrior with base power and toughness 3/3.\n{2}{W/B}{W/B}: If Warden of the First Tree is a Warrior, it becomes a Human Spirit Warrior with trample and lifelink.\n{3}{W/B}{W/B}{W/B}: If Warden of the First Tree is a Spirit, put five +1/+1 counters on it.