diff --git a/.gitattributes b/.gitattributes
index 8c29c142130..7f537840a90 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3124,7 +3124,7 @@ res/cardsfolder/hair_strung_koto.txt -text svneol=native#text/plain
 res/cardsfolder/halberdier.txt -text svneol=native#text/plain
 res/cardsfolder/halcyon_glaze.txt -text svneol=native#text/plain
 res/cardsfolder/halimar_depths.txt -text svneol=native#text/plain
-res/cardsfolder/halimar_excavator.txt svneol=native#text/plain
+res/cardsfolder/halimar_excavator.txt -text svneol=native#text/plain
 res/cardsfolder/halimar_wavewatch.txt -text svneol=native#text/plain
 res/cardsfolder/hallowed_burial.txt -text svneol=native#text/plain
 res/cardsfolder/hallowed_fountain.txt -text svneol=native#text/plain
@@ -3193,7 +3193,7 @@ res/cardsfolder/heart_of_yavimaya.txt -text svneol=native#text/plain
 res/cardsfolder/heart_sliver.txt -text svneol=native#text/plain
 res/cardsfolder/heart_warden.txt -text svneol=native#text/plain
 res/cardsfolder/hearth_charm.txt svneol=native#text/plain
-res/cardsfolder/hearthcage_giant.txt svneol=native#text/plain
+res/cardsfolder/hearthcage_giant.txt -text svneol=native#text/plain
 res/cardsfolder/hearthfire_hobgoblin.txt -text svneol=native#text/plain
 res/cardsfolder/heartlash_cinder.txt svneol=native#text/plain
 res/cardsfolder/heartless_hidetsugu.txt svneol=native#text/plain
diff --git a/res/cardsfolder/hada_freeblade.txt b/res/cardsfolder/hada_freeblade.txt
index ecf58430717..4542a72ce26 100644
--- a/res/cardsfolder/hada_freeblade.txt
+++ b/res/cardsfolder/hada_freeblade.txt
@@ -3,7 +3,8 @@ ManaCost:W
 Types:Creature Human Soldier Ally
 Text:no text
 PT:0/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Ally
diff --git a/res/cardsfolder/hagra_diabolist.txt b/res/cardsfolder/hagra_diabolist.txt
index 0557b836ff7..39eea5e62a6 100644
--- a/res/cardsfolder/hagra_diabolist.txt
+++ b/res/cardsfolder/hagra_diabolist.txt
@@ -3,7 +3,8 @@ ManaCost:4 B
 Types:Creature Orge Shaman Ally
 Text:no text
 PT:3/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have target player lose life equal to the number of Allies you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have target player lose life equal to the number of Allies you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigLoseLife | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have target player lose life equal to the number of Allies you control.
 SVar:TrigLoseLife:AB$LoseLife | Cost$ 0 | ValidTgts$ Player | LifeAmount$ NumAllies | TgtPrompt$ Select a target player.
 SVar:NumAllies:Count$Valid Ally.YouCtrl
 SVar:PlayMain1:TRUE
diff --git a/res/cardsfolder/halimar_excavator.txt b/res/cardsfolder/halimar_excavator.txt
index ab5719c1932..8c51ee66b45 100644
--- a/res/cardsfolder/halimar_excavator.txt
+++ b/res/cardsfolder/halimar_excavator.txt
@@ -1,15 +1,16 @@
-Name:Halimar Excavator
-ManaCost:1 U
-Types:Creature Human Wizard Ally
-Text:no text
-PT:1/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, target player puts the top X cards of his or her library into his or her graveyard, where X is the number of Allies you control.
-SVar:TrigMill:AB$Mill | Cost$ 0 | ValidTgts$ Player | NumCards$ X | TgtPrompt$ Select a target player. | SpellDescription$ Target player puts the top X cards of his or her library into his or her graveyard, where X is the number of Allies you control.
-SVar:X:Count$Valid Ally.YouCtrl
-SVar:PlayMain1:TRUE
-SVar:BuffedBy:Ally
-SVar:RemRandomDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/halimar_excavator.jpg
-SetInfo:WWK|Common|http://magiccards.info/scans/en/wwk/29.jpg
+Name:Halimar Excavator
+ManaCost:1 U
+Types:Creature Human Wizard Ally
+Text:no text
+PT:1/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigMill | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, target player puts the top X cards of his or her library into his or her graveyard, where X is the number of Allies you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigMill | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, target player puts the top X cards of his or her library into his or her graveyard, where X is the number of Allies you control.
+SVar:TrigMill:AB$Mill | Cost$ 0 | ValidTgts$ Player | NumCards$ X | TgtPrompt$ Select a target player. | SpellDescription$ Target player puts the top X cards of his or her library into his or her graveyard, where X is the number of Allies you control.
+SVar:X:Count$Valid Ally.YouCtrl
+SVar:PlayMain1:TRUE
+SVar:BuffedBy:Ally
+SVar:RemRandomDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/halimar_excavator.jpg
+SetInfo:WWK|Common|http://magiccards.info/scans/en/wwk/29.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/hearthcage_giant.txt b/res/cardsfolder/hearthcage_giant.txt
index 732812fc898..291ac701339 100644
--- a/res/cardsfolder/hearthcage_giant.txt
+++ b/res/cardsfolder/hearthcage_giant.txt
@@ -1,12 +1,12 @@
-Name:Hearthcage Giant
-ManaCost:6 R R
-Types:Creature Giant Warrior
-Text:no text
-PT:5/5
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put two 3/1 red Elemental Shaman creature tokens onto the battlefield.
-SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ R 3 1 Elemental Shaman | TokenName$ Elemental Shaman | TokenColors$ Red | TokenTypes$ Creature,Elemental,Shaman | TokenPower$ 3 | TokenToughness$ 1 | TokenOwner$ You | TokenAmount$ 2
-A:AB$ Pump | Cost$ Sac<1/Elemental> | ValidTgts$ Creature.Giant | TgtPrompt$ Select target Giant creature | NumAtt$ +3 | NumDef$ +1 | SpellDescription$ Target Giant creature gets +3/+1 until end of turn.
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/hearthcage_giant.jpg
-SetInfo:LRW|Uncommon|http://magiccards.info/scans/en/lw/174.jpg
+Name:Hearthcage Giant
+ManaCost:6 R R
+Types:Creature Giant Warrior
+Text:no text
+PT:5/5
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put two 3/1 red Elemental Shaman creature tokens onto the battlefield.
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ R 3 1 Elemental Shaman | TokenName$ Elemental Shaman | TokenColors$ Red | TokenTypes$ Creature,Elemental,Shaman | TokenPower$ 3 | TokenToughness$ 1 | TokenOwner$ You | TokenAmount$ 2
+A:AB$ Pump | Cost$ Sac<1/Elemental> | ValidTgts$ Creature.Giant | TgtPrompt$ Select target Giant creature | NumAtt$ +3 | NumDef$ +1 | SpellDescription$ Target Giant creature gets +3/+1 until end of turn.
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/hearthcage_giant.jpg
+SetInfo:LRW|Uncommon|http://magiccards.info/scans/en/lw/174.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/highland_berserker.txt b/res/cardsfolder/highland_berserker.txt
index 738d53eac8c..b51e46e4d39 100644
--- a/res/cardsfolder/highland_berserker.txt
+++ b/res/cardsfolder/highland_berserker.txt
@@ -3,7 +3,8 @@ ManaCost:1 R
 Types:Creature Human Berserker Ally
 Text:no text
 PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Ally creatures you control gain first strike until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Ally creatures you control gain first strike until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPump | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Ally creatures you control gain first strike until end of turn.
 SVar:TrigPump:AB$PumpAll | Cost$ 0 | ValidCards$ Ally.YouCtrl | KW$ First Strike
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Ally
diff --git a/res/cardsfolder/joraga_bard.txt b/res/cardsfolder/joraga_bard.txt
index 6a9280bd2c0..32989971db8 100644
--- a/res/cardsfolder/joraga_bard.txt
+++ b/res/cardsfolder/joraga_bard.txt
@@ -3,7 +3,8 @@ ManaCost:3 G
 Types:Creature Elf Rogue Ally
 Text:no text
 PT:1/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Ally creatures you control gain vigilance until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Ally creatures you control gain vigilance until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPump | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Ally creatures you control gain vigilance until end of turn.
 SVar:TrigPump:AB$PumpAll | Cost$ 0 | ValidCards$ Ally.YouCtrl | KW$ Vigilance
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Ally
diff --git a/res/cardsfolder/kazandu_blademaster.txt b/res/cardsfolder/kazandu_blademaster.txt
index b3e29d54f16..6a6a4391c46 100644
--- a/res/cardsfolder/kazandu_blademaster.txt
+++ b/res/cardsfolder/kazandu_blademaster.txt
@@ -5,7 +5,8 @@ Text:no text
 PT:1/1
 K:First Strike
 K:Vigilance
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Ally
diff --git a/res/cardsfolder/kazuul_warlord.txt b/res/cardsfolder/kazuul_warlord.txt
index d8cc11689cf..ed6e574d347 100644
--- a/res/cardsfolder/kazuul_warlord.txt
+++ b/res/cardsfolder/kazuul_warlord.txt
@@ -3,7 +3,8 @@ ManaCost:4 R
 Types:Creature Minotaur Warrior Ally
 Text:no text
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a +1/+1 counter on each Ally creature you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a +1/+1 counter on each Ally creature you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a +1/+1 counter on each Ally creature you control.
 SVar:TrigPutCounter:AB$PutCounterAll | Cost$ 0 | ValidCards$ Ally.YouCtrl | CounterType$ P1P1 | CounterNum$ 1
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Ally
diff --git a/res/cardsfolder/kithkin_harbinger.txt b/res/cardsfolder/kithkin_harbinger.txt
index 2ad5d79ed82..236639e05bb 100644
--- a/res/cardsfolder/kithkin_harbinger.txt
+++ b/res/cardsfolder/kithkin_harbinger.txt
@@ -3,7 +3,7 @@ ManaCost:2 W
 Types:Creature Kithkin Wizard
 Text:no text
 PT:1/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a Kithkin card, reveal it, then shuffle your library and put that card on top of it.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a Kithkin card, reveal it, then shuffle your library and put that card on top of it.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Card.Kithkin | ChangeNum$ 1
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/krovikan_fetish.txt b/res/cardsfolder/krovikan_fetish.txt
index ac3d492d481..b8cb542dfb9 100644
--- a/res/cardsfolder/krovikan_fetish.txt
+++ b/res/cardsfolder/krovikan_fetish.txt
@@ -4,7 +4,7 @@ Types:Enchantment Aura
 Text:no text
 K:Enchant creature
 K:enPump:+1/+1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card at the beginning of the next turn's upkeep.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, draw a card at the beginning of the next turn's upkeep.
 SVar:TrigDraw:AB$Draw | Cost$ 0 | NumCards$ 1 | NextUpkeep$ True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/krovikan_fetish.jpg