diff --git a/.gitattributes b/.gitattributes
index 99c872fc0d2..62b9260f194 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1714,7 +1714,7 @@ res/cardsfolder/dream_cache.txt -text svneol=native#text/plain
 res/cardsfolder/dream_fracture.txt -text svneol=native#text/plain
 res/cardsfolder/dream_prowler.txt -text svneol=native#text/plain
 res/cardsfolder/dream_stalker.txt -text svneol=native#text/plain
-res/cardsfolder/dreamcatcher.txt svneol=native#text/plain
+res/cardsfolder/dreamcatcher.txt -text svneol=native#text/plain
 res/cardsfolder/dreamscape_artist.txt -text svneol=native#text/plain
 res/cardsfolder/dreamstone_hedron.txt -text svneol=native#text/plain
 res/cardsfolder/dredge.txt -text svneol=native#text/plain
@@ -1809,7 +1809,7 @@ res/cardsfolder/earthcraft.txt -text svneol=native#text/plain
 res/cardsfolder/earthen_goo.txt -text svneol=native#text/plain
 res/cardsfolder/earthlink.txt -text svneol=native#text/plain
 res/cardsfolder/earthquake.txt -text svneol=native#text/plain
-res/cardsfolder/earthshaker.txt svneol=native#text/plain
+res/cardsfolder/earthshaker.txt -text svneol=native#text/plain
 res/cardsfolder/eastern_paladin.txt -text svneol=native#text/plain
 res/cardsfolder/eater_of_days.txt -text svneol=native#text/plain
 res/cardsfolder/ebon_dragon.txt -text svneol=native#text/plain
@@ -2758,6 +2758,7 @@ res/cardsfolder/guan_yus_1000_li_march.txt -text svneol=native#text/plain
 res/cardsfolder/guard_duty.txt -text svneol=native#text/plain
 res/cardsfolder/guard_gomazoa.txt -text svneol=native#text/plain
 res/cardsfolder/guardian_of_cloverdell.txt -text svneol=native#text/plain
+res/cardsfolder/guardian_of_solitude.txt -text svneol=native#text/plain
 res/cardsfolder/guardian_of_the_guildpact.txt -text svneol=native#text/plain
 res/cardsfolder/guardian_seraph.txt -text svneol=native#text/plain
 res/cardsfolder/guardians_magemark.txt -text svneol=native#text/plain
@@ -3210,7 +3211,7 @@ res/cardsfolder/jaces_ingenuity.txt -text svneol=native#text/plain
 res/cardsfolder/jackal_pup.txt -text svneol=native#text/plain
 res/cardsfolder/jackalope_herd.txt -text svneol=native#text/plain
 res/cardsfolder/jacques_le_vert.txt -text svneol=native#text/plain
-res/cardsfolder/jade_idol.txt svneol=native#text/plain
+res/cardsfolder/jade_idol.txt -text svneol=native#text/plain
 res/cardsfolder/jade_leech.txt -text svneol=native#text/plain
 res/cardsfolder/jade_statue.txt -text svneol=native#text/plain
 res/cardsfolder/jagged_lightning.txt -text svneol=native#text/plain
@@ -3312,6 +3313,7 @@ res/cardsfolder/kami_of_the_honored_dead.txt svneol=native#text/plain
 res/cardsfolder/kami_of_the_hunt.txt -text svneol=native#text/plain
 res/cardsfolder/kami_of_the_palace_fields.txt -text svneol=native#text/plain
 res/cardsfolder/kami_of_the_tended_garden.txt -text svneol=native#text/plain
+res/cardsfolder/kami_of_the_waning_moon.txt -text svneol=native#text/plain
 res/cardsfolder/karakas.txt -text svneol=native#text/plain
 res/cardsfolder/kargan_dragonlord.txt -text svneol=native#text/plain
 res/cardsfolder/karma.txt -text svneol=native#text/plain
@@ -3443,6 +3445,7 @@ res/cardsfolder/kobold_taskmaster.txt -text svneol=native#text/plain
 res/cardsfolder/kobolds_of_kher_keep.txt -text svneol=native#text/plain
 res/cardsfolder/kodama_of_the_center_tree.txt svneol=native#text/plain
 res/cardsfolder/kodama_of_the_north_tree.txt -text svneol=native#text/plain
+res/cardsfolder/kodama_of_the_south_tree.txt -text svneol=native#text/plain
 res/cardsfolder/kodamas_reach.txt -text svneol=native#text/plain
 res/cardsfolder/kokusho_the_evening_star.txt -text svneol=native#text/plain
 res/cardsfolder/konda_lord_of_eiganjo.txt -text svneol=native#text/plain
@@ -3505,7 +3508,7 @@ res/cardsfolder/kulrath_knight.txt -text svneol=native#text/plain
 res/cardsfolder/kurgadon.txt svneol=native#text/plain
 res/cardsfolder/kuro_pitlord.txt -text svneol=native#text/plain
 res/cardsfolder/kuros_taken.txt -text svneol=native#text/plain
-res/cardsfolder/kyoki_sanitys_eclipse.txt svneol=native#text/plain
+res/cardsfolder/kyoki_sanitys_eclipse.txt -text svneol=native#text/plain
 res/cardsfolder/kyren_glider.txt -text svneol=native#text/plain
 res/cardsfolder/kyren_negotiations.txt -text svneol=native#text/plain
 res/cardsfolder/kyren_sniper.txt -text svneol=native#text/plain
@@ -3675,7 +3678,7 @@ res/cardsfolder/llanowar_knight.txt -text svneol=native#text/plain
 res/cardsfolder/llanowar_mentor.txt -text svneol=native#text/plain
 res/cardsfolder/llanowar_sentinel.txt -text svneol=native#text/plain
 res/cardsfolder/llanowar_wastes.txt -text svneol=native#text/plain
-res/cardsfolder/loam_dweller.txt svneol=native#text/plain
+res/cardsfolder/loam_dweller.txt -text svneol=native#text/plain
 res/cardsfolder/loam_lion.txt -text svneol=native#text/plain
 res/cardsfolder/loamdragger_giant.txt -text svneol=native#text/plain
 res/cardsfolder/lobotomy.txt -text svneol=native#text/plain
@@ -4465,7 +4468,7 @@ res/cardsfolder/order_of_the_white_shield.txt -text svneol=native#text/plain
 res/cardsfolder/order_of_whiteclay.txt -text svneol=native#text/plain
 res/cardsfolder/order_of_yawgmoth.txt -text svneol=native#text/plain
 res/cardsfolder/ordered_migration.txt -text svneol=native#text/plain
-res/cardsfolder/ore_gorger[!!-~].txt svneol=native#text/plain
+res/cardsfolder/ore_gorger[!!-~].txt -text svneol=native#text/plain
 res/cardsfolder/organ_grinder.txt -text svneol=native#text/plain
 res/cardsfolder/orgg.txt -text svneol=native#text/plain
 res/cardsfolder/origin_spellbomb.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/bounteous_kirin.txt b/res/cardsfolder/bounteous_kirin.txt
index fc5189dd5ec..2f0264d2c3f 100644
--- a/res/cardsfolder/bounteous_kirin.txt
+++ b/res/cardsfolder/bounteous_kirin.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Kirin Spirit
 Text:no text
 PT:4/4
 K:Flying
-T:Mode$ SpellCast | ValidCard$ Spirit.YouCtrl,Arcane.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigGainLife | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may gain life equal to that spell's converted mana cost.
+T:Mode$ SpellCast | ValidCard$ Card.Spirit,Card.Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigGainLife | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may gain life equal to that spell's converted mana cost.
 SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X
 SVar:X:TriggeredCard$CardManaCost
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/briarknit_kami.txt b/res/cardsfolder/briarknit_kami.txt
index 6ad8494df08..41e113ea043 100644
--- a/res/cardsfolder/briarknit_kami.txt
+++ b/res/cardsfolder/briarknit_kami.txt
@@ -5,6 +5,7 @@ Text:no text
 PT:3/3
 T:Mode$ SpellCast | ValidCard$ Card.Spirit,Card.Arcane | ValidActivatingPlayer$ You  | TriggerZones$ Battlefield  | Execute$ TrigPutCounter | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, put a +1/+1 counter on target creature.
 SVar:TrigPutCounter:AB$PutCounter | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1
+SVar:BuffedBy:Arcane,Spirit
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/briarknit_kami.jpg
diff --git a/res/cardsfolder/dreamcatcher.txt b/res/cardsfolder/dreamcatcher.txt
index 7e498245037..085bf56c117 100644
--- a/res/cardsfolder/dreamcatcher.txt
+++ b/res/cardsfolder/dreamcatcher.txt
@@ -1,12 +1,12 @@
-Name:Dreamcatcher
-ManaCost:U
-Types:Creature Spirit
-Text:no text
-PT:1/1
-T:Mode$ SpellCast | ValidCard$ Spirit.YouCtrl,Arcane.YouCtrl | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may sacrifice Dreamcatcher. If you do, draw a card.
-SVar:TrigDraw:AB$Draw | Cost$ Sac<1/CARDNAME>  | Defined$ You | NumCards$ 1
-SVar:RemAIDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/dreamcatcher.jpg
-SetInfo:SOK|Common|http://magiccards.info/scans/en/sok/34.jpg
+Name:Dreamcatcher
+ManaCost:U
+Types:Creature Spirit
+Text:no text
+PT:1/1
+T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may sacrifice Dreamcatcher. If you do, draw a card.
+SVar:TrigDraw:AB$Draw | Cost$ Sac<1/CARDNAME>  | Defined$ You | NumCards$ 1
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/dreamcatcher.jpg
+SetInfo:SOK|Common|http://magiccards.info/scans/en/sok/34.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/earthshaker.txt b/res/cardsfolder/earthshaker.txt
index 80875951163..796487f295d 100644
--- a/res/cardsfolder/earthshaker.txt
+++ b/res/cardsfolder/earthshaker.txt
@@ -1,12 +1,13 @@
-Name:Earthshaker
-ManaCost:4 R R
-Types:Creature Spirit
-Text:no text
-PT:4/5
-T:Mode$ SpellCast | ValidCard$ Card.Spirit,Card.Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigTremor | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, CARDNAME deals 2 damage to each creature without flying.
-SVar:TrigTremor:AB$ DamageAll | Cost$ 0 | ValidCards$ Creature.withoutFlying | NumDmg$ 2 | ValidDescription$ each creature without flying. | SpellDescription$ CARDNAME deals 2 damage to each creature without flying.
-SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/earthshaker.jpg
-SetInfo:CHK|Uncommon|http://magiccards.info/scans/en/chk/165.jpg
+Name:Earthshaker
+ManaCost:4 R R
+Types:Creature Spirit
+Text:no text
+PT:4/5
+T:Mode$ SpellCast | ValidCard$ Card.Spirit,Card.Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigTremor | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, CARDNAME deals 2 damage to each creature without flying.
+SVar:TrigTremor:AB$ DamageAll | Cost$ 0 | ValidCards$ Creature.withoutFlying | NumDmg$ 2 | ValidDescription$ each creature without flying. | SpellDescription$ CARDNAME deals 2 damage to each creature without flying.
+SVar:BuffedBy:Arcane,Spirit
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/earthshaker.jpg
+SetInfo:CHK|Uncommon|http://magiccards.info/scans/en/chk/165.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/fiddlehead_kami.txt b/res/cardsfolder/fiddlehead_kami.txt
index 046c27b314f..ec07c7ab08b 100644
--- a/res/cardsfolder/fiddlehead_kami.txt
+++ b/res/cardsfolder/fiddlehead_kami.txt
@@ -5,6 +5,7 @@ Text:no text
 PT:3/3
 T:Mode$ SpellCast | ValidCard$ Card.Spirit,Card.Arcane | ValidActivatingPlayer$ You  | TriggerZones$ Battlefield  | Execute$ TrigRegen | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, regenerate CARDNAME.
 SVar:TrigRegen:AB$Regenerate | Cost$ 0 | Defined$ Self
+SVar:BuffedBy:Arcane,Spirit
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fiddlehead_kami.jpg
diff --git a/res/cardsfolder/guardian_of_solitude.txt b/res/cardsfolder/guardian_of_solitude.txt
new file mode 100644
index 00000000000..804c52ca2a4
--- /dev/null
+++ b/res/cardsfolder/guardian_of_solitude.txt
@@ -0,0 +1,11 @@
+Name:Guardian of Solitude
+ManaCost:1 U
+Types:Creature Spirit
+Text:no text
+PT:1/2
+T:Mode$ SpellCast | ValidCard$ Card.Spirit,Card.Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, target creature gains flying until end of turn.
+SVar:TrigPump:AB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Flying 
+SVar:BuffedBy:Arcane,Spirit
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/guardian_of_solitude.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/haru_onna.txt b/res/cardsfolder/haru_onna.txt
index 89c954e05d2..130afa0f8c6 100644
--- a/res/cardsfolder/haru_onna.txt
+++ b/res/cardsfolder/haru_onna.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:2/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1
-T:Mode$ SpellCast | ValidCard$ Spirit.YouCtrl,Arcane.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may return CARDNAME to its owner's hand.
+T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may return CARDNAME to its owner's hand.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ Self
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/haru_onna.jpg
diff --git a/res/cardsfolder/innocence_kami.txt b/res/cardsfolder/innocence_kami.txt
index 8622615ef82..4a3e0a839dc 100644
--- a/res/cardsfolder/innocence_kami.txt
+++ b/res/cardsfolder/innocence_kami.txt
@@ -3,11 +3,11 @@ ManaCost:3 W W
 Types:Creature Spirit
 Text:no text
 PT:2/3
-T:Mode$ SpellCast | ValidCard$ Spirit.YouCtrl,Arcane.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, untap CARDNAME.
+T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, untap CARDNAME.
 A:AB$Tap | Cost$ W T | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Tap target creature.
 SVar:TrigUntap:AB$Untap | Cost$ 0 | Defined$ Self
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/innocence_kami.jpg
 SetInfo:CHK|Uncommon|http://magiccards.info/scans/en/chk/18.jpg
-End
+End
diff --git a/res/cardsfolder/jade_idol.txt b/res/cardsfolder/jade_idol.txt
index 1ee41261147..a0aa768e0ef 100644
--- a/res/cardsfolder/jade_idol.txt
+++ b/res/cardsfolder/jade_idol.txt
@@ -1,9 +1,11 @@
-Name:Jade Idol
-ManaCost:4
-Types:Artifact
-Text:no text
-T:Mode$ SpellCast | ValidCard$ Card.Spirit,Card.Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigAnimate | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, CARDNAME becomes a 4/4 Spirit artifact creature until end of turn.  
-SVar:TrigAnimate:AB$Animate | Cost$ 0 | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Artifact,Spirit
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/jade_idol.jpg
+Name:Jade Idol
+ManaCost:4
+Types:Artifact
+Text:no text
+T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigAnimate | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, CARDNAME becomes a 4/4 Spirit artifact creature until end of turn.  
+SVar:TrigAnimate:AB$Animate | Cost$ 0 | Defined$ Self | Power$ 4 | Toughness$ 4 | Types$ Creature,Artifact,Spirit
+SVar:BuffedBy:Arcane,Spirit
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/jade_idol.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/kami_of_tattered_shoji.txt b/res/cardsfolder/kami_of_tattered_shoji.txt
index ffdce140a45..4c451ebbf25 100644
--- a/res/cardsfolder/kami_of_tattered_shoji.txt
+++ b/res/cardsfolder/kami_of_tattered_shoji.txt
@@ -3,7 +3,7 @@ ManaCost:4 W
 Types:Creature Spirit
 Text:no text
 PT:2/5
-T:Mode$ SpellCast | ValidCard$ Spirit.YouCtrl,Arcane.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, CARDNAME gains flying until end of turn.
+T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, CARDNAME gains flying until end of turn.
 SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | KW$ Flying
 SVar:BuffedBy:Arcane,Spirit
 SVar:Rarity:Common
diff --git a/res/cardsfolder/kami_of_the_hunt.txt b/res/cardsfolder/kami_of_the_hunt.txt
index 750679adf94..9b6d7047dff 100644
--- a/res/cardsfolder/kami_of_the_hunt.txt
+++ b/res/cardsfolder/kami_of_the_hunt.txt
@@ -3,7 +3,7 @@ ManaCost:2 G
 Types:Creature Spirit
 Text:no text
 PT:2/2
-T:Mode$ SpellCast | ValidCard$ Spirit.YouCtrl,Arcane.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, Kami of the Hunt gets +1/+1 until end of turn.
+T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, CARDNAME gets +1/+1 until end of turn.
 SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 1 | NumDef$ 1
 SVar:BuffedBy:Arcane,Spirit
 SVar:Rarity:Common
diff --git a/res/cardsfolder/kami_of_the_waning_moon.txt b/res/cardsfolder/kami_of_the_waning_moon.txt
new file mode 100644
index 00000000000..f13b751e659
--- /dev/null
+++ b/res/cardsfolder/kami_of_the_waning_moon.txt
@@ -0,0 +1,13 @@
+Name:Kami of the Waning Moon
+ManaCost:2 B
+Types:Creature Spirit
+Text:no text
+PT:1/1
+K:Flying
+T:Mode$ SpellCast | ValidCard$ Card.Spirit,Card.Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, target creature gains fear until end of turn. (It can't be blocked except by artifact creatures and/or black creatures.)
+SVar:TrigPump:AB$Pump | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ Fear 
+SVar:BuffedBy:Arcane,Spirit
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/kami_of_the_waning_moon.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/kemuri_onna.txt b/res/cardsfolder/kemuri_onna.txt
index 39f8e3a0a02..4c2046223ec 100644
--- a/res/cardsfolder/kemuri_onna.txt
+++ b/res/cardsfolder/kemuri_onna.txt
@@ -4,7 +4,7 @@ Types:Creature Spirit
 Text:no text
 PT:3/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, target player discards a card.
-T:Mode$ SpellCast | ValidCard$ Spirit.YouCtrl,Arcane.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may return CARDNAME to its owner's hand.
+T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may return CARDNAME to its owner's hand.
 SVar:TrigDiscard:AB$Discard | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select a player | NumCards$ 1 | Mode$ TgtChoose 
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ Self
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/kiri_onna.txt b/res/cardsfolder/kiri_onna.txt
index aa3508c9934..f8968990cd4 100644
--- a/res/cardsfolder/kiri_onna.txt
+++ b/res/cardsfolder/kiri_onna.txt
@@ -4,7 +4,7 @@ Types:Creature Spirit
 Text:no text
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturnOther | TriggerDescription$ When CARDNAME enters the battlefield, return target creature to its owner's hand.
-T:Mode$ SpellCast | ValidCard$ Spirit.YouCtrl,Arcane.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigReturnThis | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may return CARDNAME to its owner's hand.
+T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigReturnThis | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may return CARDNAME to its owner's hand.
 SVar:TrigReturnOther:AB$ChangeZone | Cost$ 0 | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand
 SVar:TrigReturnThis:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Battlefield | Destination$ Hand
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/kodama_of_the_south_tree.txt b/res/cardsfolder/kodama_of_the_south_tree.txt
new file mode 100644
index 00000000000..7b3195c2b8b
--- /dev/null
+++ b/res/cardsfolder/kodama_of_the_south_tree.txt
@@ -0,0 +1,11 @@
+Name:Kodama of the South Tree
+ManaCost:2 G G
+Types:Legendary Creature Spirit
+Text:no text
+PT:4/4
+T:Mode$ SpellCast | ValidCard$ Card.Spirit,Card.Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, each other creature you control gets +1/+1 and gains trample until end of turn.
+SVar:TrigPump:AB$PumpAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | KW$ Trample 
+SVar:BuffedBy:Arcane,Spirit
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/kodama_of_the_south_tree.jpg
+End
\ No newline at end of file
diff --git a/res/cardsfolder/kyoki_sanitys_eclipse.txt b/res/cardsfolder/kyoki_sanitys_eclipse.txt
index 1ab3ca5a36c..9f8b0a13659 100644
--- a/res/cardsfolder/kyoki_sanitys_eclipse.txt
+++ b/res/cardsfolder/kyoki_sanitys_eclipse.txt
@@ -1,13 +1,12 @@
-Name:Kyoki, Sanity's Eclipse
-ManaCost:4 B B
-Types:Legendary Creature Demon Spirit
-Text:no text
-PT:6/4
-T:Mode$ SpellCast | ValidCard$ Spirit.YouCtrl,Arcane.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, target opponent exiles a card from his or her hand.
-#This needs Defined$ Opponent because ValidTgts$ Opponent lets Kyoki's controller select the card to be exiled
-SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Origin$ Hand | Destination$ Exile | ChangeType$ Card | Defined$ Opponent | TgtPrompt$ Select target opponent | ChangeNum$ 1
-SVar:RemAIDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/kyoki_sanitys_eclipse.jpg
-SetInfo:BOK|Rare|http://magiccards.info/scans/en/bok/72.jpg
+Name:Kyoki, Sanity's Eclipse
+ManaCost:4 B B
+Types:Legendary Creature Demon Spirit
+Text:no text
+PT:6/4
+T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, target opponent exiles a card from his or her hand.
+#This needs Defined$ Opponent because ValidTgts$ Opponent lets Kyoki's controller select the card to be exiled
+SVar:TrigExile:AB$ChangeZone | Cost$ 0 | Origin$ Hand | Destination$ Exile | ChangeType$ Card | Defined$ Opponent | TgtPrompt$ Select target opponent | ChangeNum$ 1
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/kyoki_sanitys_eclipse.jpg
+SetInfo:BOK|Rare|http://magiccards.info/scans/en/bok/72.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/loam_dweller.txt b/res/cardsfolder/loam_dweller.txt
index fb44d4f90dd..e7932213e53 100644
--- a/res/cardsfolder/loam_dweller.txt
+++ b/res/cardsfolder/loam_dweller.txt
@@ -1,11 +1,11 @@
-Name:Loam Dweller
-ManaCost:1 G
-Types:Creature Spirit
-Text:no text
-PT:2/2
-T:Mode$ SpellCast | ValidCard$ Spirit.YouCtrl,Arcane.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigLand | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may put a land card from your hand onto the battlefield tapped.
-SVar:TrigLand:AB$ChangeZone | Cost$ 0 | Origin$ Hand | Destination$ Battlefield | ChangeType$ Land | ChangeNum$ 1 | Tapped$ True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/loam_dweller.jpg
-SetInfo:BOK|Uncommon|http://magiccards.info/scans/en/bok/134.jpg
+Name:Loam Dweller
+ManaCost:1 G
+Types:Creature Spirit
+Text:no text
+PT:2/2
+T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigLand | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may put a land card from your hand onto the battlefield tapped.
+SVar:TrigLand:AB$ChangeZone | Cost$ 0 | Origin$ Hand | Destination$ Battlefield | ChangeType$ Land | ChangeNum$ 1 | Tapped$ True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/loam_dweller.jpg
+SetInfo:BOK|Uncommon|http://magiccards.info/scans/en/bok/134.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/nikko_onna.txt b/res/cardsfolder/nikko_onna.txt
index 82b84702bb2..5c21b791c1d 100644
--- a/res/cardsfolder/nikko_onna.txt
+++ b/res/cardsfolder/nikko_onna.txt
@@ -4,7 +4,7 @@ Types:Creature Spirit
 Text:no text
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target enchantment. 
-T:Mode$ SpellCast | ValidCard$ Spirit.YouCtrl,Arcane.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may return CARDNAME to its owner's hand.
+T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may return CARDNAME to its owner's hand.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Defined$ Self | Origin$ Battlefield | Destination$ Hand
 SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Enchantment | TgtPrompt$ Choose target enchantment
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/orbweaver_kumo.txt b/res/cardsfolder/orbweaver_kumo.txt
index 87b54057d37..83f4de23e36 100644
--- a/res/cardsfolder/orbweaver_kumo.txt
+++ b/res/cardsfolder/orbweaver_kumo.txt
@@ -4,7 +4,7 @@ Types:Creature Spirit
 Text:no text
 PT:3/4
 K:Reach
-T:Mode$ SpellCast | ValidCard$ Spirit.YouCtrl,Arcane.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, CARDNAME gains forestwalk until end of turn.
+T:Mode$ SpellCast | ValidCard$ Card.Spirit,Card.Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, CARDNAME gains forestwalk until end of turn.
 SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | KW$ Forestwalk
 SVar:BuffedBy:Arcane,Spirit
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/ore_gorger .txt b/res/cardsfolder/ore_gorger .txt
index 7673c9ff3c1..17ea03fb1cf 100644
--- a/res/cardsfolder/ore_gorger .txt	
+++ b/res/cardsfolder/ore_gorger .txt	
@@ -1,11 +1,11 @@
-Name:Ore Gorger
-ManaCost:3 R R
-Types:Creature Spirit
-Text:no text
-PT:3/1
-T:Mode$ SpellCast | ValidCard$ Spirit.YouCtrl,Arcane.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may destroy target nonbasic land.
-SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Land.nonBasic | TgtPrompt$ Select target nonbasic land
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/ore_gorger.jpg
-SetInfo:CHK|Uncommon|http://magiccards.info/scans/en/chk/182.jpg
+Name:Ore Gorger
+ManaCost:3 R R
+Types:Creature Spirit
+Text:no text
+PT:3/1
+T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may destroy target nonbasic land.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Land.nonBasic | TgtPrompt$ Select target nonbasic land
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/ore_gorger.jpg
+SetInfo:CHK|Uncommon|http://magiccards.info/scans/en/chk/182.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/oyobi_who_split_the_heavens.txt b/res/cardsfolder/oyobi_who_split_the_heavens.txt
index 10042636f19..dbd7c2f7d69 100644
--- a/res/cardsfolder/oyobi_who_split_the_heavens.txt
+++ b/res/cardsfolder/oyobi_who_split_the_heavens.txt
@@ -4,7 +4,7 @@ Types:Legendary Creature Spirit
 Text:no text
 PT:3/6
 K:Flying
-T:Mode$ SpellCast | ValidCard$ Spirit.YouCtrl,Arcane.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, put a 3/3 white Spirit creature token with flying onto the battlefield.
+T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, put a 3/3 white Spirit creature token with flying onto the battlefield.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ W 3 3 Spirit | TokenAmount$ 1 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ You | TokenColors$ White | TokenPower$ 3 | TokenToughness$ 3 | TokenKeywords$ Flying
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/oyobi_who_split_the_heavens.jpg
diff --git a/res/cardsfolder/scaled_hulk.txt b/res/cardsfolder/scaled_hulk.txt
index 4fac360add7..95fd10f48ae 100644
--- a/res/cardsfolder/scaled_hulk.txt
+++ b/res/cardsfolder/scaled_hulk.txt
@@ -3,7 +3,7 @@ ManaCost:5 G
 Types:Creature Spirit
 Text:no text
 PT:4/4
-T:Mode$ SpellCast | ValidCard$ Spirit.YouCtrl,Arcane.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, CARDNAME gets +2/+2 until end of turn.
+T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, CARDNAME gets +2/+2 until end of turn.
 SVar:TrigPump:AB$Pump | Cost$ 0 | Defined$ Self | NumAtt$ 2 | NumDef$ 2
 SVar:BuffedBy:Arcane,Spirit
 SVar:Rarity:Common
diff --git a/res/cardsfolder/sire_of_the_storm.txt b/res/cardsfolder/sire_of_the_storm.txt
index ce2474d5157..145d1256915 100644
--- a/res/cardsfolder/sire_of_the_storm.txt
+++ b/res/cardsfolder/sire_of_the_storm.txt
@@ -4,7 +4,7 @@ Types:Creature Spirit
 Text:no text
 PT:3/3
 K:Flying
-T:Mode$ SpellCast | ValidCard$ Spirit.YouCtrl,Arcane.YouCtrl | Execute$ TrigDraw | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may draw a card.
+T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | Execute$ TrigDraw | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may draw a card.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | Defined$ You | NumCards$ 1 
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sire_of_the_storm.jpg
diff --git a/res/cardsfolder/thief_of_hope.txt b/res/cardsfolder/thief_of_hope.txt
index 2d1392e73a1..fabeed2665f 100644
--- a/res/cardsfolder/thief_of_hope.txt
+++ b/res/cardsfolder/thief_of_hope.txt
@@ -3,7 +3,7 @@ ManaCost:2 B
 Types:Creature Spirit
 Text:no text
 PT:2/2
-T:Mode$ SpellCast | ValidCard$ Spirit.YouCtrl,Arcane.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, target opponent loses 1 life and you gain 1 life.
+T:Mode$ SpellCast | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDrain | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, target opponent loses 1 life and you gain 1 life.
 SVar:TrigDrain:AB$LoseLife | Cost$ 0 | ValidTgts$ Opponent | LifeAmount$ 1 | SubAbility$SVar=DBGainLife
 SVar:DBGainLife:DB$GainLife | Defined$ You | LifeAmount$ 1
 K:Soulshift:2
diff --git a/res/cardsfolder/yuki_onna.txt b/res/cardsfolder/yuki_onna.txt
index 29dadfc5ff7..dfbe9fa4656 100644
--- a/res/cardsfolder/yuki_onna.txt
+++ b/res/cardsfolder/yuki_onna.txt
@@ -4,7 +4,7 @@ Types:Creature Spirit
 Text:no text
 PT:3/1
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, destroy target artifact.
-SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidTgts$ Artifact | TgtPrompt$ Select an artifact. | SpellDescription$ Destroy target artifact.
+SVar:TrigDestroy:AB$Destroy | Cost$ 0 | ValidCard$ Spirit,Arcane | ValidActivatingPlayer$ You | TgtPrompt$ Select an artifact. | SpellDescription$ Destroy target artifact.
 T:Mode$ SpellCast | ValidCard$ Spirit.YouCtrl,Arcane.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigReturn | TriggerDescription$ Whenever you cast a Spirit or Arcane spell, you may return CARDNAME to its owner's hand.
 SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Defined$ Self
 SVar:Rarity:Uncommon