diff --git a/forge-game/src/main/java/forge/game/keyword/Keyword.java b/forge-game/src/main/java/forge/game/keyword/Keyword.java
index 711aeb2d65c..8bedf0ab974 100644
--- a/forge-game/src/main/java/forge/game/keyword/Keyword.java
+++ b/forge-game/src/main/java/forge/game/keyword/Keyword.java
@@ -90,7 +90,7 @@ public enum Keyword {
     LIFELINK("Lifelink", SimpleKeyword.class, true, "Damage dealt by this creature also causes its controller to gain that much life."),
     LIVING_WEAPON("Living weapon", SimpleKeyword.class, true, "When this Equipment enters the battlefield, create a 0/0 black Germ creature token, then attach this to it."),
     MADNESS("Madness", KeywordWithCost.class, false, "If you discard this card, discard it into exile. When you do, cast it for %s  or put it into your graveyard."),
-    MELEE("Melee", SimpleKeyword.class, false, "Whenever this creature attacks, it gets +1/+1 until end of turn for each opponent you attacked with a creature this combat."),
+    MELEE("Melee", SimpleKeyword.class, false, "Whenever this creature attacks, it gets +1/+1 until end of turn for each opponent you attacked this combat."),
     MENTOR("Mentor", SimpleKeyword.class, false, "Whenever this creature attacks, put a +1/+1 counter on target attacking creature with lesser power."),
     MENACE("Menace", SimpleKeyword.class, true, "This creature can't be blocked except by two or more creatures."),
     MEGAMORPH("Megamorph", KeywordWithCost.class, false, "You may cast this card face down as a 2/2 creature for {3}. Turn it face up any time for its megamorph cost and put a +1/+1 counter on it."),
diff --git a/forge-gui/res/cardsfolder/a/admirals_order.txt b/forge-gui/res/cardsfolder/a/admirals_order.txt
index d5d3ba01aa4..7e1902f6f16 100644
--- a/forge-gui/res/cardsfolder/a/admirals_order.txt
+++ b/forge-gui/res/cardsfolder/a/admirals_order.txt
@@ -2,7 +2,6 @@ Name:Admiral's Order
 ManaCost:1 U U
 Types:Instant
 A:SP$ Counter | Cost$ 1 U U | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SpellDescription$ Counter target spell.
-A:SP$ Counter | Cost$ U | CheckSVar$ X | References$ X | SVarCompare$ GE1 | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SpellDescription$ Raid — If you attacked with a creature this turn, you may pay {U} rather than pay this spell's mana cost. Counter target spell.
+A:SP$ Counter | Cost$ U | CheckSVar$ X | References$ X | SVarCompare$ GE1 | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SpellDescription$ Raid — If you attacked this turn, you may pay {U} rather than pay this spell's mana cost. Counter target spell.
 SVar:X:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/admirals_order.jpg
-Oracle:Raid — If you attacked with a creature this turn, you may pay {U} rather than pay this spell's mana cost.\nCounter target spell.
\ No newline at end of file
+Oracle:Raid — If you attacked this turn, you may pay {U} rather than pay this spell's mana cost.\nCounter target spell.
diff --git a/forge-gui/res/cardsfolder/a/adriana_captain_of_the_guard.txt b/forge-gui/res/cardsfolder/a/adriana_captain_of_the_guard.txt
index a8bdcea1d20..cb72899c064 100644
--- a/forge-gui/res/cardsfolder/a/adriana_captain_of_the_guard.txt
+++ b/forge-gui/res/cardsfolder/a/adriana_captain_of_the_guard.txt
@@ -5,5 +5,4 @@ PT:4/4
 K:Melee
 S:Mode$ Continuous | Affected$ Creature.Other+YouCtrl | AddKeyword$ Melee | Description$ Other creatures you control have melee. (If a creature has multiple instances of melee, each triggers separately.)
 SVar:PlayMain1:TRUE
-SVar:Picture:http://www.wizards.com/global/images/magic/general/adriana_captain_of_the_guard.jpg
-Oracle:Melee (Whenever this creature attacks, it gets +1/+1 until end of turn for each opponent you attacked with a creature this combat.)\nOther creatures you control have melee. (If a creature has multiple instances of melee, each triggers separately.)
\ No newline at end of file
+Oracle:Melee (Whenever this creature attacks, it gets +1/+1 until end of turn for each opponent you attacked this combat.)\nOther creatures you control have melee. (If a creature has multiple instances of melee, each triggers separately.)
diff --git a/forge-gui/res/cardsfolder/a/arrow_storm.txt b/forge-gui/res/cardsfolder/a/arrow_storm.txt
index f99e9f22fd0..f72224ee197 100644
--- a/forge-gui/res/cardsfolder/a/arrow_storm.txt
+++ b/forge-gui/res/cardsfolder/a/arrow_storm.txt
@@ -1,8 +1,7 @@
 Name:Arrow Storm
 ManaCost:3 R R
 Types:Sorcery
-A:SP$ DealDamage | Cost$ 3 R R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 4 | ConditionCheckSVar$ RaidTest | ConditionSVarCompare$ EQ0 | References$ RaidTest | SubAbility$ DBDmg | SpellDescription$ CARDNAME deals 4 damage to any target. Raid — If you attacked with a creature this turn, instead CARDNAME deals 5 damage to that permanent or player and the damage can't be prevented.
-SVar:DBDmg:DB$ DealDamage | Defined$ Targeted | NumDmg$ 5 | NoPrevention$ True | ConditionCheckSVar$ RaidTest | ConditionSVarCompare$ GE1 | References$ RaidTest | StackDescription$ Raid — If you attacked with a creature this turn, instead CARDNAME deals 5 damage to {Targeted} and the damage can't be prevented.
+A:SP$ DealDamage | Cost$ 3 R R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 4 | ConditionCheckSVar$ RaidTest | ConditionSVarCompare$ EQ0 | References$ RaidTest | SubAbility$ DBDmg | SpellDescription$ CARDNAME deals 4 damage to any target. Raid — If you attacked this turn, instead CARDNAME deals 5 damage to that permanent or player and the damage can't be prevented.
+SVar:DBDmg:DB$ DealDamage | Defined$ Targeted | NumDmg$ 5 | NoPrevention$ True | ConditionCheckSVar$ RaidTest | ConditionSVarCompare$ GE1 | References$ RaidTest | StackDescription$ Raid — If you attacked this turn, instead CARDNAME deals 5 damage to {Targeted} and the damage can't be prevented.
 SVar:RaidTest:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/arrow_storm.jpg
-Oracle:Arrow Storm deals 4 damage to any target.\nRaid — If you attacked with a creature this turn, instead Arrow Storm deals 5 damage to that permanent or player and the damage can't be prevented.
\ No newline at end of file
+Oracle:Arrow Storm deals 4 damage to any target.\nRaid — If you attacked this turn, instead Arrow Storm deals 5 damage to that permanent or player and the damage can't be prevented.
diff --git a/forge-gui/res/cardsfolder/b/bellowing_saddlebrute.txt b/forge-gui/res/cardsfolder/b/bellowing_saddlebrute.txt
index ff7b1eb1115..f08c51d6c1e 100644
--- a/forge-gui/res/cardsfolder/b/bellowing_saddlebrute.txt
+++ b/forge-gui/res/cardsfolder/b/bellowing_saddlebrute.txt
@@ -2,9 +2,8 @@ Name:Bellowing Saddlebrute
 ManaCost:3 B
 Types:Creature Orc Warrior
 PT:4/5
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ Raid — When CARDNAME enters the battlefield, you lose 4 life unless you attacked with a creature this turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigLoseLife | TriggerDescription$ Raid — When CARDNAME enters the battlefield, you lose 4 life unless you attacked this turn.
 SVar:TrigLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ 4 | ConditionCheckSVar$ RaidTest | ConditionSVarCompare$ EQ0 | References$ RaidTest
 SVar:RaidTest:Count$AttackersDeclared
 SVar:NeedsToPlayVar:RaidTest GE1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/bellowing_saddlebrute.jpg
-Oracle:Raid — When Bellowing Saddlebrute enters the battlefield, you lose 4 life unless you attacked with a creature this turn.
+Oracle:Raid — When Bellowing Saddlebrute enters the battlefield, you lose 4 life unless you attacked this turn.
diff --git a/forge-gui/res/cardsfolder/b/bloodsoaked_champion.txt b/forge-gui/res/cardsfolder/b/bloodsoaked_champion.txt
index 18ccfd6a1eb..f5dbadd2008 100644
--- a/forge-gui/res/cardsfolder/b/bloodsoaked_champion.txt
+++ b/forge-gui/res/cardsfolder/b/bloodsoaked_champion.txt
@@ -3,9 +3,8 @@ ManaCost:B
 Types:Creature Human Warrior
 PT:2/1
 K:CARDNAME can't block.
-A:AB$ ChangeZone | Cost$ 1 B | PrecostDesc$ Raid — | Origin$ Graveyard | Destination$ Battlefield | ActivationZone$ Graveyard | CheckSVar$ RaidTest | References$ RaidTest | SpellDescription$ Return CARDNAME from your graveyard to the battlefield. Activate this ability only if you attacked with a creature this turn.
+A:AB$ ChangeZone | Cost$ 1 B | PrecostDesc$ Raid — | Origin$ Graveyard | Destination$ Battlefield | ActivationZone$ Graveyard | CheckSVar$ RaidTest | References$ RaidTest | SpellDescription$ Return CARDNAME from your graveyard to the battlefield. Activate this ability only if you attacked this turn.
 SVar:RaidTest:Count$AttackersDeclared
 SVar:DiscardMe:1
 SVar:SacMe:1
-SVar:Picture:http://www.wizards.com/global/images/magic/general/bloodsoaked_champion.jpg
-Oracle:Bloodsoaked Champion can't block.\nRaid — {1}{B}: Return Bloodsoaked Champion from your graveyard to the battlefield. Activate this ability only if you attacked with a creature this turn.
+Oracle:Bloodsoaked Champion can't block.\nRaid — {1}{B}: Return Bloodsoaked Champion from your graveyard to the battlefield. Activate this ability only if you attacked this turn.
diff --git a/forge-gui/res/cardsfolder/c/chart_a_course.txt b/forge-gui/res/cardsfolder/c/chart_a_course.txt
index fa8b73d15f6..cf16c9eb5e3 100644
--- a/forge-gui/res/cardsfolder/c/chart_a_course.txt
+++ b/forge-gui/res/cardsfolder/c/chart_a_course.txt
@@ -1,8 +1,7 @@
 Name:Chart a Course
 ManaCost:1 U
 Types:Sorcery
-A:SP$ Draw | Cost$ 1 U | NumCards$ 2 | SubAbility$ DBDiscard | SpellDescription$ Draw two cards. Then discard a card unless you attacked with a creature this turn.
+A:SP$ Draw | Cost$ 1 U | NumCards$ 2 | SubAbility$ DBDiscard | SpellDescription$ Draw two cards. Then discard a card unless you attacked this turn.
 SVar:DBDiscard:DB$ Discard | NumCards$ 1 | Mode$ TgtChoose | ConditionCheckSVar$ RaidTest | ConditionSVarCompare$ EQ0 | References$ RaidTest
 SVar:RaidTest:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/chart_a_course.jpg
-Oracle:Draw two cards. Then discard a card unless you attacked with a creature this turn.
+Oracle:Draw two cards. Then discard a card unless you attacked this turn.
diff --git a/forge-gui/res/cardsfolder/c/custodi_soulcaller.txt b/forge-gui/res/cardsfolder/c/custodi_soulcaller.txt
index 1912f661aca..84746f92ced 100644
--- a/forge-gui/res/cardsfolder/c/custodi_soulcaller.txt
+++ b/forge-gui/res/cardsfolder/c/custodi_soulcaller.txt
@@ -3,7 +3,7 @@ ManaCost:1 W W
 Types:Creature Human Cleric
 PT:1/2
 K:Melee
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigSoulcall | TriggerDescription$ Whenever CARDNAME attacks, return target creature card with converted mana cost X or less from your graveyard to the battlefield, where X is the number of players you attacked with a creature this combat
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigSoulcall | TriggerDescription$ Whenever CARDNAME attacks, return target creature card with converted mana cost X or less from your graveyard to the battlefield, where X is the number of players you attacked this combat.
 SVar:TrigSoulcall:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl+cmcLEX | References$ X
 SVar:X:TriggeredPlayersDefenders$Amount
-Oracle:Melee (Whenever this creature attacks, it gets +1/+1 until end of turn for each opponent you attacked with a creature this combat.)\nWhenever Custodi Soulcaller attacks, return target creature card with converted mana cost X or less from your graveyard to the battlefield, where X is the number of players you attacked with a creature this combat.
+Oracle:Melee (Whenever this creature attacks, it gets +1/+1 until end of turn for each opponent you attacked this combat.)\nWhenever Custodi Soulcaller attacks, return target creature card with converted mana cost X or less from your graveyard to the battlefield, where X is the number of players you attacked this combat.
diff --git a/forge-gui/res/cardsfolder/d/deadeye_rig_hauler.txt b/forge-gui/res/cardsfolder/d/deadeye_rig_hauler.txt
index bb00191c065..c125b04c014 100644
--- a/forge-gui/res/cardsfolder/d/deadeye_rig_hauler.txt
+++ b/forge-gui/res/cardsfolder/d/deadeye_rig_hauler.txt
@@ -2,8 +2,7 @@ Name:Deadeye Rig-Hauler
 ManaCost:3 U
 Types:Creature Human Pirate
 PT:3/2
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | CheckSVar$ RaidTest | OptionalDecider$ You | Execute$ TrigChangeZone | References$ RaidTest | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked with a creature this turn, you may return target creature to its owner's hand.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | CheckSVar$ RaidTest | OptionalDecider$ You | Execute$ TrigChangeZone | References$ RaidTest | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked this turn, you may return target creature to its owner's hand.
 SVar:TrigChangeZone:DB$ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Battlefield | Destination$ Hand
 SVar:RaidTest:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/deadeye_rig_hauler.jpg 
-Oracle:Raid — When Deadeye Rig-Hauler enters the battlefield, if you attacked with a creature this turn, you may return target creature to its owner's hand.
\ No newline at end of file
+Oracle:Raid — When Deadeye Rig-Hauler enters the battlefield, if you attacked this turn, you may return target creature to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/d/deadeye_tormentor.txt b/forge-gui/res/cardsfolder/d/deadeye_tormentor.txt
index 26c496f7eee..637cccbeb96 100644
--- a/forge-gui/res/cardsfolder/d/deadeye_tormentor.txt
+++ b/forge-gui/res/cardsfolder/d/deadeye_tormentor.txt
@@ -2,8 +2,7 @@ Name:Deadeye Tormentor
 ManaCost:2 B
 Types:Creature Human Pirate
 PT:2/2
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | CheckSVar$ RaidTest | Execute$ TrigDiscard | References$ RaidTest | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked with a creature this turn, target opponent discards a card.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | CheckSVar$ RaidTest | Execute$ TrigDiscard | References$ RaidTest | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked this turn, target opponent discards a card.
 SVar:TrigDiscard:DB$ Discard | ValidTgts$ Opponent | NumCards$ 1 | Mode$ TgtChoose
 SVar:RaidTest:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/deadeye_tormentor.jpg
-Oracle:Raid — When Deadeye Tormentor enters the battlefield, if you attacked with a creature this turn, target opponent discards a card.
+Oracle:Raid — When Deadeye Tormentor enters the battlefield, if you attacked this turn, target opponent discards a card.
diff --git a/forge-gui/res/cardsfolder/d/deputized_protester.txt b/forge-gui/res/cardsfolder/d/deputized_protester.txt
index b01cca58383..19a77f40666 100644
--- a/forge-gui/res/cardsfolder/d/deputized_protester.txt
+++ b/forge-gui/res/cardsfolder/d/deputized_protester.txt
@@ -4,5 +4,4 @@ Types:Creature Human Warrior
 PT:2/1
 K:Menace
 K:Melee
-SVar:Picture:http://www.wizards.com/global/images/magic/general/deputized_protester.jpg
-Oracle:Menace (This creature can't be blocked except by two or more creatures.)\nMelee (Whenever this creature attacks, it gets +1/+1 until end of turn for each opponent you attacked with a creature this combat.)
\ No newline at end of file
+Oracle:Menace (This creature can't be blocked except by two or more creatures.)\nMelee (Whenever this creature attacks, it gets +1/+1 until end of turn for each opponent you attacked this combat.)
diff --git a/forge-gui/res/cardsfolder/f/fang_of_the_pack.txt b/forge-gui/res/cardsfolder/f/fang_of_the_pack.txt
index f910a39df27..a6c5dce4234 100644
--- a/forge-gui/res/cardsfolder/f/fang_of_the_pack.txt
+++ b/forge-gui/res/cardsfolder/f/fang_of_the_pack.txt
@@ -6,5 +6,4 @@ K:Melee
 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, another target creature you control gains melee until end of turn. (If a creature has multiple instances of melee, each triggers separately.)
 SVar:TrigPump:DB$ Pump | ValidTgts$ Creature.Other+YouCtrl | TgtPrompt$ Select another target creature you control | KW$ Melee
 SVar:PlayMain1:TRUE
-SVar:Picture:http://www.wizards.com/global/images/magic/general/fang_of_the_pack.jpg
-Oracle:Melee (Whenever this creature attacks, it gets +1/+1 until end of turn for each opponent you attacked with a creature this combat.)\nAt the beginning of combat on your turn, another target creature you control gains melee until end of turn. (If a creature has multiple instances of melee, each triggers separately.)
\ No newline at end of file
+Oracle:Melee (Whenever this creature attacks, it gets +1/+1 until end of turn for each opponent you attacked this combat.)\nAt the beginning of combat on your turn, another target creature you control gains melee until end of turn. (If a creature has multiple instances of melee, each triggers separately.)
diff --git a/forge-gui/res/cardsfolder/f/firecannon_blast.txt b/forge-gui/res/cardsfolder/f/firecannon_blast.txt
index 7c944ba72c8..4db35b928a8 100644
--- a/forge-gui/res/cardsfolder/f/firecannon_blast.txt
+++ b/forge-gui/res/cardsfolder/f/firecannon_blast.txt
@@ -1,8 +1,7 @@
 Name:Firecannon Blast
 ManaCost:1 R R
 Types:Sorcery
-A:SP$ DealDamage | Cost$ 1 R R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 3 | AILogic$ ProcRaid.6 | ConditionCheckSVar$ RaidTest | ConditionSVarCompare$ EQ0 | References$ RaidTest | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 3 damage to target creature. Raid — CARDNAME deals 6 damage to that creature instead if you attacked with a creature this turn.
+A:SP$ DealDamage | Cost$ 1 R R | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 3 | AILogic$ ProcRaid.6 | ConditionCheckSVar$ RaidTest | ConditionSVarCompare$ EQ0 | References$ RaidTest | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 3 damage to target creature. Raid — CARDNAME deals 6 damage to that creature instead if you attacked this turn.
 SVar:DBDealDamage:DB$ DealDamage | Defined$ Targeted | NumDmg$ 6 | ConditionCheckSVar$ RaidTest | ConditionSVarCompare$ GE1 | References$ RaidTest
 SVar:RaidTest:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/firecannon_blast.jpg
-Oracle:Firecannon Blast deals 3 damage to target creature.\nRaid — Firecannon Blast deals 6 damage to that creature instead if you attacked with a creature this turn.
\ No newline at end of file
+Oracle:Firecannon Blast deals 3 damage to target creature.\nRaid — Firecannon Blast deals 6 damage to that creature instead if you attacked this turn.
diff --git a/forge-gui/res/cardsfolder/g/grenzos_ruffians.txt b/forge-gui/res/cardsfolder/g/grenzos_ruffians.txt
index c70e5d31a09..01db27861e7 100644
--- a/forge-gui/res/cardsfolder/g/grenzos_ruffians.txt
+++ b/forge-gui/res/cardsfolder/g/grenzos_ruffians.txt
@@ -6,5 +6,4 @@ K:Melee
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigDmg | TriggerDescription$ Whenever CARDNAME deals combat damage to an opponent, it deals that much damage to each other opponent.
 SVar:TrigDmg:DB$ DamageAll | ValidPlayers$ OppNonTriggeredTarget | NumDmg$ X | References$ X
 SVar:X:TriggerCount$DamageAmount
-SVar:Picture:http://www.wizards.com/global/images/magic/general/grenzos_ruffians.jpg
-Oracle:Melee (Whenever this creature attacks, it gets +1/+1 for each opponent you attacked with a creature this combat.)\nWhenever Grenzo's Ruffians deals combat damage to an opponent, it deals that much damage to each other opponent.
\ No newline at end of file
+Oracle:Melee (Whenever this creature attacks, it gets +1/+1 for each opponent you attacked this combat.)\nWhenever Grenzo's Ruffians deals combat damage to an opponent, it deals that much damage to each other opponent.
diff --git a/forge-gui/res/cardsfolder/h/heartless_pillage.txt b/forge-gui/res/cardsfolder/h/heartless_pillage.txt
index 9fab3ac0843..1894bd47a35 100644
--- a/forge-gui/res/cardsfolder/h/heartless_pillage.txt
+++ b/forge-gui/res/cardsfolder/h/heartless_pillage.txt
@@ -1,8 +1,7 @@
 Name:Heartless Pillage
 ManaCost:2 B
 Types:Sorcery
-A:SP$ Discard | Cost$ 2 B | ValidTgts$ Opponent | Mode$ TgtChoose | NumCards$ 2 | TgtPrompt$ Select target opponent | SubAbility$ DBTreasure | SpellDescription$ Target opponent discards two cards. Raid — If you attacked with a creature this turn, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
-SVar:DBTreasure:DB$ Token | ConditionCheckSVar$ RaidTest | ConditionSVarCompare$ GE1 | References$ RaidTest | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You | LegacyImage$ c a treasure sac xln
+A:SP$ Discard | Cost$ 2 B | ValidTgts$ Opponent | Mode$ TgtChoose | NumCards$ 2 | TgtPrompt$ Select target opponent | SubAbility$ DBTreasure | SpellDescription$ Target opponent discards two cards. Raid — If you attacked this turn, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
+SVar:DBTreasure:DB$ Token | ConditionCheckSVar$ RaidTest | ConditionSVarCompare$ GE1 | References$ RaidTest | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
 SVar:RaidTest:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/heartless_pillage.jpg
-Oracle:Target opponent discards two cards.\nRaid — If you attacked with a creature this turn, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
\ No newline at end of file
+Oracle:Target opponent discards two cards.\nRaid — If you attacked this turn, create a colorless Treasure artifact token with "{T}, Sacrifice this artifact: Add one mana of any color."
diff --git a/forge-gui/res/cardsfolder/h/howl_of_the_horde.txt b/forge-gui/res/cardsfolder/h/howl_of_the_horde.txt
index 5b809676fcb..7ab1185033a 100644
--- a/forge-gui/res/cardsfolder/h/howl_of_the_horde.txt
+++ b/forge-gui/res/cardsfolder/h/howl_of_the_horde.txt
@@ -1,12 +1,11 @@
 Name:Howl of the Horde
 ManaCost:2 R
 Types:Sorcery
-A:SP$ Effect | Cost$ 2 R | AILogic$ SpellCopy | Name$ Howl of the Horde Effect 1 | Triggers$ TrigCopy | SVars$ TrigCopyMain,DBCleanup | SubAbility$ DBEffect | SpellDescription$ When you cast your next instant or sorcery spell this turn, copy that spell. You may choose new targets for the copy. Raid — If you attacked with a creature this turn, when you cast your next instant or sorcery spell this turn, copy that spell an additional time. You may choose new targets for the copy.
+A:SP$ Effect | Cost$ 2 R | AILogic$ SpellCopy | Name$ Howl of the Horde Effect 1 | Triggers$ TrigCopy | SVars$ TrigCopyMain,DBCleanup | SubAbility$ DBEffect | SpellDescription$ When you cast your next instant or sorcery spell this turn, copy that spell. You may choose new targets for the copy. Raid — If you attacked this turn, when you cast your next instant or sorcery spell this turn, copy that spell an additional time. You may choose new targets for the copy.
 SVar:DBEffect:DB$ Effect | Name$ Howl of the Horde Effect 2 | Triggers$ TrigCopy | SVars$ TrigCopyMain,DBCleanup | ConditionCheckSVar$ RaidTest | ConditionSVarCompare$ GE1 | References$ RaidTest
 SVar:RaidTest:Count$AttackersDeclared
 SVar:TrigCopy:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | OneOff$ True | Execute$ TrigCopyMain | TriggerZones$ Command | TriggerDescription$ When you cast your next instant or sorcery spell this turn, copy that spell. You may choose new targets for the copy.
 SVar:TrigCopyMain:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:AIPriorityModifier:9
-SVar:Picture:http://www.wizards.com/global/images/magic/general/howl_of_the_horde.jpg
-Oracle:When you cast your next instant or sorcery spell this turn, copy that spell. You may choose new targets for the copy.\nRaid — If you attacked with a creature this turn, when you cast your next instant or sorcery spell this turn, copy that spell an additional time. You may choose new targets for the copy.
+Oracle:When you cast your next instant or sorcery spell this turn, copy that spell. You may choose new targets for the copy.\nRaid — If you attacked this turn, when you cast your next instant or sorcery spell this turn, copy that spell an additional time. You may choose new targets for the copy.
diff --git a/forge-gui/res/cardsfolder/m/marauding_looter.txt b/forge-gui/res/cardsfolder/m/marauding_looter.txt
index 7f435c6b6f3..039a6e3b392 100644
--- a/forge-gui/res/cardsfolder/m/marauding_looter.txt
+++ b/forge-gui/res/cardsfolder/m/marauding_looter.txt
@@ -2,9 +2,8 @@ Name:Marauding Looter
 ManaCost:2 U R
 Types:Creature Human Pirate
 PT:4/3
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ RaidTest | References$ RaidTest | OptionalDecider$ You | Execute$ TrigLoot | TriggerDescription$ Raid — At the beginning of your end step, if you attacked with a creature this turn, you may draw a card. If you do, discard a card.
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ RaidTest | References$ RaidTest | OptionalDecider$ You | Execute$ TrigLoot | TriggerDescription$ Raid — At the beginning of your end step, if you attacked this turn, you may draw a card. If you do, discard a card.
 SVar:TrigLoot:DB$ Draw | NumCards$ 1 | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$ Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 1
 SVar:RaidTest:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/marauding_looter.jpg
-Oracle:Raid — At the beginning of your end step, if you attacked with a creature this turn, you may draw a card. If you do, discard a card.
+Oracle:Raid — At the beginning of your end step, if you attacked this turn, you may draw a card. If you do, discard a card.
diff --git a/forge-gui/res/cardsfolder/m/mardu_heart_piercer.txt b/forge-gui/res/cardsfolder/m/mardu_heart_piercer.txt
index 9562b63429b..1cf9579849a 100644
--- a/forge-gui/res/cardsfolder/m/mardu_heart_piercer.txt
+++ b/forge-gui/res/cardsfolder/m/mardu_heart_piercer.txt
@@ -2,8 +2,7 @@ Name:Mardu Heart-Piercer
 ManaCost:3 R
 Types:Creature Human Archer
 PT:2/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ TrigDealDamage | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked with a creature this turn, CARDNAME deals 2 damage to any target.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ TrigDealDamage | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked this turn, CARDNAME deals 2 damage to any target.
 SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2
 SVar:RaidTest:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/mardu_heart_piercer.jpg
-Oracle:Raid — When Mardu Heart-Piercer enters the battlefield, if you attacked with a creature this turn, Mardu Heart-Piercer deals 2 damage to any target.
+Oracle:Raid — When Mardu Heart-Piercer enters the battlefield, if you attacked this turn, Mardu Heart-Piercer deals 2 damage to any target.
diff --git a/forge-gui/res/cardsfolder/m/mardu_hordechief.txt b/forge-gui/res/cardsfolder/m/mardu_hordechief.txt
index cf9e082a708..41865b7720f 100644
--- a/forge-gui/res/cardsfolder/m/mardu_hordechief.txt
+++ b/forge-gui/res/cardsfolder/m/mardu_hordechief.txt
@@ -3,7 +3,6 @@ ManaCost:2 W
 Types:Creature Human Warrior
 PT:2/3
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ TrigToken | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked with a creature this turn, create a 1/1 white Warrior creature token.
-SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_warrior | TokenOwner$ You | LegacyImage$ w 1 1 warrior ktk
+SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_warrior | TokenOwner$ You
 SVar:RaidTest:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/mardu_hordechief.jpg
 Oracle:Raid — When Mardu Hordechief enters the battlefield, if you attacked with a creature this turn, create a 1/1 white Warrior creature token.
diff --git a/forge-gui/res/cardsfolder/m/mardu_skullhunter.txt b/forge-gui/res/cardsfolder/m/mardu_skullhunter.txt
index a2cb2417019..8835ea41648 100644
--- a/forge-gui/res/cardsfolder/m/mardu_skullhunter.txt
+++ b/forge-gui/res/cardsfolder/m/mardu_skullhunter.txt
@@ -3,8 +3,7 @@ ManaCost:1 B
 Types:Creature Human Warrior
 PT:2/1
 K:CARDNAME enters the battlefield tapped.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ TrigDiscard | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked with a creature this turn, target opponent discards a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ TrigDiscard | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked this turn, target opponent discards a card.
 SVar:TrigDiscard:DB$ Discard | ValidTgts$ Opponent | NumCards$ 1 | Mode$ TgtChoose
 SVar:RaidTest:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/mardu_skullhunter.jpg
-Oracle:Mardu Skullhunter enters the battlefield tapped.\nRaid — When Mardu Skullhunter enters the battlefield, if you attacked with a creature this turn, target opponent discards a card.
+Oracle:Mardu Skullhunter enters the battlefield tapped.\nRaid — When Mardu Skullhunter enters the battlefield, if you attacked this turn, target opponent discards a card.
diff --git a/forge-gui/res/cardsfolder/m/mardu_warshrieker.txt b/forge-gui/res/cardsfolder/m/mardu_warshrieker.txt
index ea442f22a7e..5659c7a86af 100644
--- a/forge-gui/res/cardsfolder/m/mardu_warshrieker.txt
+++ b/forge-gui/res/cardsfolder/m/mardu_warshrieker.txt
@@ -2,8 +2,7 @@ Name:Mardu Warshrieker
 ManaCost:3 R
 Types:Creature Orc Shaman
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ ABMana | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked with a creature this turn, add {R}{W}{B}.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ ABMana | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked this turn, add {R}{W}{B}.
 SVar:RaidTest:Count$AttackersDeclared
 SVar:ABMana:DB$ Mana | Produced$ R W B
-SVar:Picture:http://www.wizards.com/global/images/magic/general/mardu_warshrieker.jpg
-Oracle:Raid — When Mardu Warshrieker enters the battlefield, if you attacked with a creature this turn, add {R}{W}{B}.
+Oracle:Raid — When Mardu Warshrieker enters the battlefield, if you attacked this turn, add {R}{W}{B}.
diff --git a/forge-gui/res/cardsfolder/m/menagerie_liberator.txt b/forge-gui/res/cardsfolder/m/menagerie_liberator.txt
index fa42f40fe81..6e7874ae5fe 100644
--- a/forge-gui/res/cardsfolder/m/menagerie_liberator.txt
+++ b/forge-gui/res/cardsfolder/m/menagerie_liberator.txt
@@ -4,5 +4,4 @@ Types:Creature Human Warrior
 PT:3/2
 K:Trample
 K:Melee
-SVar:Picture:http://www.wizards.com/global/images/magic/general/menagerie_liberator.jpg
-Oracle:Trample\nMelee (Whenever this creature attacks, it gets +1/+1 until end of turn for each opponent you attacked with a creature this combat.)
\ No newline at end of file
+Oracle:Trample\nMelee (Whenever this creature attacks, it gets +1/+1 until end of turn for each opponent you attacked this combat.)
diff --git a/forge-gui/res/cardsfolder/n/navigators_ruin.txt b/forge-gui/res/cardsfolder/n/navigators_ruin.txt
index 0a54ffb6320..0c44a239099 100644
--- a/forge-gui/res/cardsfolder/n/navigators_ruin.txt
+++ b/forge-gui/res/cardsfolder/n/navigators_ruin.txt
@@ -1,8 +1,7 @@
 Name:Navigator's Ruin
 ManaCost:2 U
 Types:Enchantment
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | CheckSVar$ RaidTest | References$ RaidTest | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Raid — At the beginning of your end step, if you attacked with a creature this turn, target opponent puts the top four cards of their library into their graveyard.
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | CheckSVar$ RaidTest | References$ RaidTest | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Raid — At the beginning of your end step, if you attacked this turn, target opponent puts the top four cards of their library into their graveyard.
 SVar:TrigMill:DB$ Mill | NumCards$ 4 | ValidTgts$ Opponent | TgtPrompt$ Select target opponent
 SVar:RaidTest:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/navigators_ruin.jpg
-Oracle:Raid — At the beginning of your end step, if you attacked with a creature this turn, target opponent puts the top four cards of their library into their graveyard.
\ No newline at end of file
+Oracle:Raid — At the beginning of your end step, if you attacked this turn, target opponent puts the top four cards of their library into their graveyard.
diff --git a/forge-gui/res/cardsfolder/p/protean_raider.txt b/forge-gui/res/cardsfolder/p/protean_raider.txt
index dc40c46a1a5..7f89dd84d7d 100644
--- a/forge-gui/res/cardsfolder/p/protean_raider.txt
+++ b/forge-gui/res/cardsfolder/p/protean_raider.txt
@@ -2,9 +2,8 @@ Name:Protean Raider
 ManaCost:1 U R
 Types:Creature Shapeshifter Pirate
 PT:2/2
-R:Event$ Moved | Destination$ Battlefield | ValidCard$ Card.Self | Layer$ Copy | Optional$ True | ReplaceWith$ DBCopy | CheckSVar$ RaidTest | References$ RaidTest | Description$ Raid — If you attacked with a creature this turn, you may have CARDNAME enter the battlefield as a copy of any creature on the battlefield.
-SVar:DBCopy:DB$ Clone | Choices$ Creature.Other | SubAbility$ DBChangeZone | SpellDescription$ Raid — If you attacked with a creature this turn, you may have CARDNAME enter the battlefield as a copy of any creature on the battlefield.
+R:Event$ Moved | Destination$ Battlefield | ValidCard$ Card.Self | Layer$ Copy | Optional$ True | ReplaceWith$ DBCopy | CheckSVar$ RaidTest | References$ RaidTest | Description$ Raid — If you attacked this turn, you may have CARDNAME enter the battlefield as a copy of any creature on the battlefield.
+SVar:DBCopy:DB$ Clone | Choices$ Creature.Other | SubAbility$ DBChangeZone | SpellDescription$ Raid — If you attacked this turn, you may have CARDNAME enter the battlefield as a copy of any creature on the battlefield.
 SVar:DBChangeZone:DB$ ChangeZone | Hidden$ True | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard
 SVar:RaidTest:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/protean_raider.jpg
-Oracle:Raid — If you attacked with a creature this turn, you may have Protean Raider enter the battlefield as a copy of any creature on the battlefield.
+Oracle:Raid — If you attacked this turn, you may have Protean Raider enter the battlefield as a copy of any creature on the battlefield.
diff --git a/forge-gui/res/cardsfolder/r/raiders_wake.txt b/forge-gui/res/cardsfolder/r/raiders_wake.txt
index fc89bb5f30d..304921650fd 100644
--- a/forge-gui/res/cardsfolder/r/raiders_wake.txt
+++ b/forge-gui/res/cardsfolder/r/raiders_wake.txt
@@ -3,8 +3,7 @@ ManaCost:3 B
 Types:Enchantment
 T:Mode$ Discarded | ValidCard$ Card.OppOwn | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ Whenever an opponent discards a card, that player loses 2 life.
 SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredCardController | LifeAmount$ 2
-T:Mode$ Phase | Phase$ End of Turn | CheckSVar$ RaidTest | TriggerZones$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ Raid — At the beginning of your end step, if you attacked with a creature this turn, target opponent discards a card.
+T:Mode$ Phase | Phase$ End of Turn | CheckSVar$ RaidTest | TriggerZones$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ Raid — At the beginning of your end step, if you attacked this turn, target opponent discards a card.
 SVar:TrigDiscard:DB$ Discard | ValidTgts$ Opponent | NumCards$ 1 | Mode$ TgtChoose
 SVar:RaidTest:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/raiders_wake.jpg
-Oracle:Whenever an opponent discards a card, that player loses 2 life.\nRaid — At the beginning of your end step, if you attacked with a creature this turn, target opponent discards a card.
+Oracle:Whenever an opponent discards a card, that player loses 2 life.\nRaid — At the beginning of your end step, if you attacked this turn, target opponent discards a card.
diff --git a/forge-gui/res/cardsfolder/r/repeating_barrage.txt b/forge-gui/res/cardsfolder/r/repeating_barrage.txt
index ab06ade70fe..48065c0da10 100644
--- a/forge-gui/res/cardsfolder/r/repeating_barrage.txt
+++ b/forge-gui/res/cardsfolder/r/repeating_barrage.txt
@@ -2,7 +2,6 @@ Name:Repeating Barrage
 ManaCost:1 R R
 Types:Sorcery
 A:SP$ DealDamage | Cost$ 1 R R | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to any target.
-A:AB$ ChangeZone | Cost$ 3 R R | PrecostDesc$ Raid — | Origin$ Graveyard | Destination$ Hand | ActivationZone$ Graveyard | CheckSVar$ RaidTest | References$ RaidTest | AILogic$ CheckCondition | SpellDescription$ Return CARDNAME from your graveyard to your hand. Activate this ability only if you attacked with a creature this turn.
+A:AB$ ChangeZone | Cost$ 3 R R | PrecostDesc$ Raid — | Origin$ Graveyard | Destination$ Hand | ActivationZone$ Graveyard | CheckSVar$ RaidTest | References$ RaidTest | AILogic$ CheckCondition | SpellDescription$ Return CARDNAME from your graveyard to your hand. Activate this ability only if you attacked this turn.
 SVar:RaidTest:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/repeating_barrage.jpg
-Oracle:Repeating Barrage deals 3 damage to any target.\nRaid — {3}{R}{R}: Return Repeating Barrage from your graveyard to your hand. Activate this ability only if you attacked with a creature this turn.
+Oracle:Repeating Barrage deals 3 damage to any target.\nRaid — {3}{R}{R}: Return Repeating Barrage from your graveyard to your hand. Activate this ability only if you attacked this turn.
diff --git a/forge-gui/res/cardsfolder/r/rigging_runner.txt b/forge-gui/res/cardsfolder/r/rigging_runner.txt
index 99ba6ff0b02..78bee777ae1 100644
--- a/forge-gui/res/cardsfolder/r/rigging_runner.txt
+++ b/forge-gui/res/cardsfolder/r/rigging_runner.txt
@@ -3,7 +3,6 @@ ManaCost:R
 Types:Creature Goblin Pirate
 PT:1/1
 K:First Strike
-K:etbCounter:P1P1:1:CheckSVar$ RaidTest: Raid — CARDNAME enters the battlefield with a +1/+1 counter on it if you attacked with a creature this turn.
+K:etbCounter:P1P1:1:CheckSVar$ RaidTest: Raid — CARDNAME enters the battlefield with a +1/+1 counter on it if you attacked this turn.
 SVar:RaidTest:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/rigging_runner.jpg
-Oracle:First strike\nRaid — Rigging Runner enters the battlefield with a +1/+1 counter on it if you attacked with a creature this turn.
+Oracle:First strike\nRaid — Rigging Runner enters the battlefield with a +1/+1 counter on it if you attacked this turn.
diff --git a/forge-gui/res/cardsfolder/r/ruin_raider.txt b/forge-gui/res/cardsfolder/r/ruin_raider.txt
index 7f7adb835ab..f400b6dbb9f 100644
--- a/forge-gui/res/cardsfolder/r/ruin_raider.txt
+++ b/forge-gui/res/cardsfolder/r/ruin_raider.txt
@@ -2,11 +2,10 @@ Name:Ruin Raider
 ManaCost:2 B
 Types:Creature Orc Pirate
 PT:3/2
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ RaidTest | Execute$ TrigDig | References$ RaidTest | TriggerDescription$ Raid — At the beginning of your end step, if you attacked with a creature this turn, reveal the top card of your library and put that card into your hand. You lose life equal to the card's converted mana cost.
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ RaidTest | Execute$ TrigDig | References$ RaidTest | TriggerDescription$ Raid — At the beginning of your end step, if you attacked this turn, reveal the top card of your library and put that card into your hand. You lose life equal to the card's converted mana cost.
 SVar:TrigDig:DB$ Dig | DigNum$ 1 | Reveal$ True | ChangeNum$ All | ChangeValid$ Card | DestinationZone$ Hand | RememberChanged$ True | SubAbility$ DBLose
 SVar:DBLose:DB$ LoseLife | LifeAmount$ X | SubAbility$ DBCleanup | References$ X
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$CardManaCost
 SVar:RaidTest:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/ruin_raider.jpg
-Oracle:Raid — At the beginning of your end step, if you attacked with a creature this turn, reveal the top card of your library and put that card into your hand. You lose life equal to the card's converted mana cost.
+Oracle:Raid — At the beginning of your end step, if you attacked this turn, reveal the top card of your library and put that card into your hand. You lose life equal to the card's converted mana cost.
diff --git a/forge-gui/res/cardsfolder/s/shipwreck_looter.txt b/forge-gui/res/cardsfolder/s/shipwreck_looter.txt
index 93a35185263..3c1988ab0bc 100644
--- a/forge-gui/res/cardsfolder/s/shipwreck_looter.txt
+++ b/forge-gui/res/cardsfolder/s/shipwreck_looter.txt
@@ -2,9 +2,8 @@ Name:Shipwreck Looter
 ManaCost:1 U
 Types:Creature Human Pirate
 PT:2/1
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked with a creature this turn, you may draw a card. If you do, discard a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ TrigDraw | OptionalDecider$ You | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked this turn, you may draw a card. If you do, discard a card.
 SVar:TrigDraw:DB$Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
 SVar:RaidTest:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/shipwreck_looter.jpg
-Oracle:Raid — When Shipwreck Looter enters the battlefield, if you attacked with a creature this turn, you may draw a card. If you do, discard a card.
\ No newline at end of file
+Oracle:Raid — When Shipwreck Looter enters the battlefield, if you attacked this turn, you may draw a card. If you do, discard a card.
diff --git a/forge-gui/res/cardsfolder/s/siren_reaver.txt b/forge-gui/res/cardsfolder/s/siren_reaver.txt
index e45883c5634..7cc3c4034c4 100644
--- a/forge-gui/res/cardsfolder/s/siren_reaver.txt
+++ b/forge-gui/res/cardsfolder/s/siren_reaver.txt
@@ -2,8 +2,7 @@ Name:Siren Reaver
 ManaCost:3 U
 Types:Creature Siren Pirate
 PT:3/2
-S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 1 | EffectZone$ All | CheckSVar$ RaidTest | SVarCompare$ GE1 | Description$ Raid — CARDNAME costs {1} less to cast if you attacked with a creature this turn.
+S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 1 | EffectZone$ All | CheckSVar$ RaidTest | SVarCompare$ GE1 | Description$ Raid — CARDNAME costs {1} less to cast if you attacked this turn.
 K:Flying
 SVar:RaidTest:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/siren_reaver.jpg
-Oracle:Raid — Siren Reaver costs {1} less to cast if you attacked with a creature this turn.\nFlying
+Oracle:Raid — Siren Reaver costs {1} less to cast if you attacked this turn.\nFlying
diff --git a/forge-gui/res/cardsfolder/s/storm_fleet_aerialist.txt b/forge-gui/res/cardsfolder/s/storm_fleet_aerialist.txt
index ff30fed2065..b618f1d34a8 100644
--- a/forge-gui/res/cardsfolder/s/storm_fleet_aerialist.txt
+++ b/forge-gui/res/cardsfolder/s/storm_fleet_aerialist.txt
@@ -3,8 +3,7 @@ ManaCost:1 U
 Types:Creature Human Pirate
 PT:1/2
 K:Flying
-K:etbCounter:P1P1:1:CheckSVar$ RaidTest: Raid — CARDNAME enters the battlefield with a +1/+1 counter on it if you attacked with a creature this turn.
+K:etbCounter:P1P1:1:CheckSVar$ RaidTest: Raid — CARDNAME enters the battlefield with a +1/+1 counter on it if you attacked this turn.
 SVar:RaidTest:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/storm_fleet_aerialist.jpg
 DeckHas:Ability$Counters
-Oracle:Flying\nRaid — Storm Fleet Aerialist enters the battlefield with a +1/+1 counter on it if you attacked with a creature this turn.
+Oracle:Flying\nRaid — Storm Fleet Aerialist enters the battlefield with a +1/+1 counter on it if you attacked this turn.
diff --git a/forge-gui/res/cardsfolder/s/storm_fleet_arsonist.txt b/forge-gui/res/cardsfolder/s/storm_fleet_arsonist.txt
index f9e80f63968..092de43b887 100644
--- a/forge-gui/res/cardsfolder/s/storm_fleet_arsonist.txt
+++ b/forge-gui/res/cardsfolder/s/storm_fleet_arsonist.txt
@@ -2,8 +2,7 @@ Name:Storm Fleet Arsonist
 ManaCost:4 R
 Types:Creature Orc Pirate
 PT:4/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ TrigSacPerm | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked with a creature this turn, target opponent sacrifices a permanent.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ TrigSacPerm | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked this turn, target opponent sacrifices a permanent.
 SVar:RaidTest:Count$AttackersDeclared
 SVar:TrigSacPerm:DB$ Sacrifice | ValidTgts$ Opponent | SacValid$ Permanent | SacMessage$ Permanent | SpellDescription$ Target opponent sacrifices a permanent.
-SVar:Picture:http://www.wizards.com/global/images/magic/general/storm_fleet_arsonist.jpg
-Oracle:Raid — When Storm Fleet Arsonist enters the battlefield, if you attacked with a creature this turn, target opponent sacrifices a permanent.
+Oracle:Raid — When Storm Fleet Arsonist enters the battlefield, if you attacked this turn, target opponent sacrifices a permanent.
diff --git a/forge-gui/res/cardsfolder/s/storm_fleet_pyromancer.txt b/forge-gui/res/cardsfolder/s/storm_fleet_pyromancer.txt
index 26e282d3f8d..74f2eba0136 100644
--- a/forge-gui/res/cardsfolder/s/storm_fleet_pyromancer.txt
+++ b/forge-gui/res/cardsfolder/s/storm_fleet_pyromancer.txt
@@ -2,8 +2,7 @@ Name:Storm Fleet Pyromancer
 ManaCost:4 R
 Types:Creature Human Pirate Wizard
 PT:3/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ TrigDealDamage | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked with a creature this turn, Storm Fleet Pyromancer deals 2 damage to any target.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ TrigDealDamage | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked this turn, CARDNAME deals 2 damage to any target.
 SVar:TrigDealDamage:DB$DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 
 SVar:RaidTest:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/storm_fleet_pyromancer.jpg
-Oracle:Raid — When Storm Fleet Pyromancer enters the battlefield, if you attacked with a creature this turn, Storm Fleet Pyromancer deals 2 damage to any target.
\ No newline at end of file
+Oracle:Raid — When Storm Fleet Pyromancer enters the battlefield, if you attacked this turn, Storm Fleet Pyromancer deals 2 damage to any target.
diff --git a/forge-gui/res/cardsfolder/s/storm_fleet_spy.txt b/forge-gui/res/cardsfolder/s/storm_fleet_spy.txt
index b9b67b67ba8..11375e2d8df 100644
--- a/forge-gui/res/cardsfolder/s/storm_fleet_spy.txt
+++ b/forge-gui/res/cardsfolder/s/storm_fleet_spy.txt
@@ -2,8 +2,7 @@ Name:Storm Fleet Spy
 ManaCost:2 U
 Types:Creature Human Pirate
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ TrigDraw | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked with a creature this turn, draw a card.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ TrigDraw | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked this turn, draw a card.
 SVar:TrigDraw:DB$ Draw | NumCards$ 1
 SVar:RaidTest:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/storm_fleet_spy.jpg
-Oracle:Raid — When Storm Fleet Spy enters the battlefield, if you attacked with creature this turn, draw a card.
\ No newline at end of file
+Oracle:Raid — When Storm Fleet Spy enters the battlefield, if you attacked this turn, draw a card.
diff --git a/forge-gui/res/cardsfolder/s/swaggering_corsair.txt b/forge-gui/res/cardsfolder/s/swaggering_corsair.txt
index 67592216231..88385b73bfb 100644
--- a/forge-gui/res/cardsfolder/s/swaggering_corsair.txt
+++ b/forge-gui/res/cardsfolder/s/swaggering_corsair.txt
@@ -2,7 +2,7 @@ Name:Swaggering Corsair
 ManaCost:2 R
 Types:Creature Human Pirate
 PT:2/2
-K:etbCounter:P1P1:1:CheckSVar$ RaidTest: Raid — CARDNAME enters the battlefield with a +1/+1 counter on it if you attacked with a creature this turn.
+K:etbCounter:P1P1:1:CheckSVar$ RaidTest: Raid — CARDNAME enters the battlefield with a +1/+1 counter on it if you attacked this turn.
 SVar:RaidTest:Count$AttackersDeclared
 SVar:Picture:http://www.wizards.com/global/images/magic/general/swaggering_corsair.jpg
-Oracle:Raid — Swaggering Corsair enters the battlefield with a +1/+1 counter on it if you attacked with a creature this turn.
+Oracle:Raid — Swaggering Corsair enters the battlefield with a +1/+1 counter on it if you attacked this turn.
diff --git a/forge-gui/res/cardsfolder/t/timely_hordemate.txt b/forge-gui/res/cardsfolder/t/timely_hordemate.txt
index 25aa37b4893..4ea56c4428b 100644
--- a/forge-gui/res/cardsfolder/t/timely_hordemate.txt
+++ b/forge-gui/res/cardsfolder/t/timely_hordemate.txt
@@ -2,8 +2,7 @@ Name:Timely Hordemate
 ManaCost:3 W
 Types:Creature Human Warrior
 PT:3/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ TrigChange | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked with a creature this turn, return target creature card with converted mana cost 2 or less from your graveyard to the battlefield.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ TrigChange | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked this turn, return target creature card with converted mana cost 2 or less from your graveyard to the battlefield.
 SVar:RaidTest:Count$AttackersDeclared
 SVar:TrigChange:AB$ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Creature.YouCtrl+cmcLE2 | Cost$ 0
-SVar:Picture:http://www.wizards.com/global/images/magic/general/timely_hordemate.jpg
-Oracle:Raid — When Timely Hordemate enters the battlefield, if you attacked with a creature this turn, return target creature card with converted mana cost 2 or less from your graveyard to the battlefield.
+Oracle:Raid — When Timely Hordemate enters the battlefield, if you attacked this turn, return target creature card with converted mana cost 2 or less from your graveyard to the battlefield.
diff --git a/forge-gui/res/cardsfolder/w/war_name_aspirant.txt b/forge-gui/res/cardsfolder/w/war_name_aspirant.txt
index 7ff2cfa4259..82f8cd49e10 100644
--- a/forge-gui/res/cardsfolder/w/war_name_aspirant.txt
+++ b/forge-gui/res/cardsfolder/w/war_name_aspirant.txt
@@ -3,7 +3,6 @@ ManaCost:1 R
 Types:Creature Human Warrior
 PT:2/1
 K:CantBeBlockedBy Creature.powerLE1
-K:etbCounter:P1P1:1:CheckSVar$ RaidTest: Raid — CARDNAME enters the battlefield with a +1/+1 counter on it if you attacked with a creature this turn.
+K:etbCounter:P1P1:1:CheckSVar$ RaidTest: Raid — CARDNAME enters the battlefield with a +1/+1 counter on it if you attacked this turn.
 SVar:RaidTest:Count$AttackersDeclared
-SVar:Picture:http://www.wizards.com/global/images/magic/general/war_name_aspirant.jpg
-Oracle:Raid — War-Name Aspirant enters the battlefield with a +1/+1 counter on it if you attacked with a creature this turn.\nWar-Name Aspirant can't be blocked by creatures with power 1 or less.
+Oracle:Raid — War-Name Aspirant enters the battlefield with a +1/+1 counter on it if you attacked this turn.\nWar-Name Aspirant can't be blocked by creatures with power 1 or less.
diff --git a/forge-gui/res/cardsfolder/w/wingmate_roc.txt b/forge-gui/res/cardsfolder/w/wingmate_roc.txt
index a077e778d04..b2906e793a6 100644
--- a/forge-gui/res/cardsfolder/w/wingmate_roc.txt
+++ b/forge-gui/res/cardsfolder/w/wingmate_roc.txt
@@ -3,12 +3,11 @@ ManaCost:3 W W
 Types:Creature Bird
 PT:3/4
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ TrigToken | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked with a creature this turn, create a 3/4 white Bird creature token with flying.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | CheckSVar$ RaidTest | Execute$ TrigToken | TriggerDescription$ Raid — When CARDNAME enters the battlefield, if you attacked this turn, create a 3/4 white Bird creature token with flying.
 SVar:RaidTest:Count$AttackersDeclared
 SVar:TrigToken:DB$ Token | TokenScript$ w_3_4_bird_flying | LegacyImage$ w 3 4 bird flying ktk | TokenAmount$ 1 | TokenOwner$ You
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigGainLife | TriggerDescription$ Whenever CARDNAME attacks, you gain 1 life for each attacking creature.
 SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X
 SVar:X:Count$Valid Creature.attacking
 SVar:HasAttackEffect:TRUE
-SVar:Picture:http://www.wizards.com/global/images/magic/general/wingmate_roc.jpg
-Oracle:Flying\nRaid — When Wingmate Roc enters the battlefield, if you attacked with a creature this turn, create a 3/4 white Bird creature token with flying.\nWhenever Wingmate Roc attacks, you gain 1 life for each attacking creature.
+Oracle:Flying\nRaid — When Wingmate Roc enters the battlefield, if you attacked this turn, create a 3/4 white Bird creature token with flying.\nWhenever Wingmate Roc attacks, you gain 1 life for each attacking creature.
diff --git a/forge-gui/res/cardsfolder/w/wings_of_the_guard.txt b/forge-gui/res/cardsfolder/w/wings_of_the_guard.txt
index 6ac188df89e..132af3c8d7e 100644
--- a/forge-gui/res/cardsfolder/w/wings_of_the_guard.txt
+++ b/forge-gui/res/cardsfolder/w/wings_of_the_guard.txt
@@ -4,5 +4,4 @@ Types:Creature Bird
 PT:1/1
 K:Flying
 K:Melee
-SVar:Picture:http://www.wizards.com/global/images/magic/general/wings_of_the_guard.jpg
-Oracle:Flying\nMelee (Whenever this creature attacks, it gets +1/+1 until end of turn for each opponent you attacked with a creature this combat.)
\ No newline at end of file
+Oracle:Flying\nMelee (Whenever this creature attacks, it gets +1/+1 until end of turn for each opponent you attacked this combat.)