diff --git a/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java b/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java
index 3584bb27e32..1798a8f9a33 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java
@@ -196,7 +196,7 @@ public class ChooseGenericEffectAi extends SpellAbilityAi {
             }
             
             // milling against Tamiyo is pointless
-            if (owner.isCardInCommand("Tamiyo, the Moon Sage emblem")) {
+            if (owner.isCardInCommand("Emblem Tamiyo, the Moon Sage")) {
                 return allow;
             }
             
diff --git a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
index 010532cc702..37bcdc4afdb 100644
--- a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
@@ -336,10 +336,10 @@ public abstract class SpellAbilityEffect {
         final Card eff = new Card(game.nextCardId(), game);
         eff.setTimestamp(game.getNextTimestamp());
         eff.setName(name);
-        // if name includes emplem then it should be one
-        eff.addType(name.endsWith("emblem") ? "Emblem" : "Effect");
+        // if name includes emblem then it should be one
+        eff.addType(name.startsWith("emblem") ? "Emblem" : "Effect");
         // add Planeswalker types into Emblem for fun
-        if (name.endsWith("emblem") && hostCard.isPlaneswalker()) {
+        if (name.startsWith("emblem") && hostCard.isPlaneswalker()) {
             for (final String type : hostCard.getType().getSubtypes()) {
                 if (CardType.isAPlaneswalkerType(type)) {
                     eff.addType(type);
diff --git a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
index 74727440305..665cdaa1234 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/EffectEffect.java
@@ -104,7 +104,7 @@ public class EffectEffect extends SpellAbilityEffect {
         String image;
         if (sa.hasParam("Image")) {
             image = ImageKeys.getTokenKey(sa.getParam("Image"));
-        } else if (name.endsWith("emblem")) { // try to get the image from name
+        } else if (name.startsWith("emblem")) { // try to get the image from name
             image = ImageKeys.getTokenKey(name.replace(",", "").replace(" ", "_").toLowerCase());
         } else { // use host image
             image = hostCard.getImageKey();
diff --git a/forge-gui/res/cardsfolder/a/ajani_steadfast.txt b/forge-gui/res/cardsfolder/a/ajani_steadfast.txt
index 8b95342dd6b..b3b3d054949 100644
--- a/forge-gui/res/cardsfolder/a/ajani_steadfast.txt
+++ b/forge-gui/res/cardsfolder/a/ajani_steadfast.txt
@@ -5,8 +5,8 @@ Loyalty:4
 A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | NumAtt$ +1 | NumDef$ +1 | KW$ First Strike & Vigilance & Lifelink | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Until end of turn, up to one target creature gets +1/+1 and gains first strike, vigilance, and lifelink.
 A:AB$ PutCounterAll | Cost$ SubCounter<2/LOYALTY> | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ 1 | Planeswalker$ True | SubAbility$ DBPutCounterAll | SpellDescription$ Put a +1/+1 counter on each creature you control and a loyalty counter on each other planeswalker you control.
 SVar:DBPutCounterAll:DB$ PutCounterAll | ValidCards$ Planeswalker.YouCtrl+Other | CounterType$ LOYALTY | CounterNum$ 1
-A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Ajani Steadfast emblem | Image$ ajani_steadfast_emblem | ReplacementEffects$ RPreventDamage | SVars$ PreventDmg | References$ RPreventDamage,PreventDmg | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "If a source would deal damage to you or a planeswalker you control, prevent all but 1 of that damage."
+A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem Ajani Steadfast | Image$ emblem_ajani_steadfast | ReplacementEffects$ RPreventDamage | SVars$ PreventDmg | References$ RPreventDamage,PreventDmg | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "If a source would deal damage to you or a planeswalker you control, prevent all but 1 of that damage."
 SVar:RPreventDamage:Event$ DamageDone | ValidTarget$ You,Planeswalker.YouCtrl | ReplaceWith$ PreventDmg | PreventionEffect$ True | Description$ If a source would deal damage to you or a planeswalker you control, prevent all but 1 of that damage.
 SVar:PreventDmg:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ajani_steadfast.jpg
-Oracle:[+1] Until end of turn, up to one target creature gets +1/+1 and gains first strike, vigilance, and lifelink.\n[-2] Put a +1/+1 counter on each creature you control and a loyalty counter on each other planeswalker you control.\n[-7] You get an emblem with "If a source would deal damage to you or a planeswalker you control, prevent all but 1 of that damage."
+Oracle:[+1]: Until end of turn, up to one target creature gets +1/+1 and gains first strike, vigilance, and lifelink.\n[-2]: Put a +1/+1 counter on each creature you control and a loyalty counter on each other planeswalker you control.\n[-7]: You get an emblem with "If a source would deal damage to you or a planeswalker you control, prevent all but 1 of that damage."
diff --git a/forge-gui/res/cardsfolder/a/arlinn_kord_arlinn_embraced_by_the_moon.txt b/forge-gui/res/cardsfolder/a/arlinn_kord_arlinn_embraced_by_the_moon.txt
index 8e2c85379ab..cc602c7b969 100644
--- a/forge-gui/res/cardsfolder/a/arlinn_kord_arlinn_embraced_by_the_moon.txt
+++ b/forge-gui/res/cardsfolder/a/arlinn_kord_arlinn_embraced_by_the_moon.txt
@@ -20,7 +20,7 @@ Loyalty:0
 A:AB$ PumpAll | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | KW$ Trample | SpellDescription$ Creatures you control get +1/+1 and gain trample until end of turn.
 A:AB$ DealDamage | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 3 | SubAbility$ DBTransform | SpellDescription$ CARDNAME deals 3 damage to target creature or player. Transform CARDNAME.
 SVar:DBTransform:DB$ SetState | Defined$ Self | Mode$ Transform
-A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Name$ Arlinn, Embraced by the Moon emblem | Image$ arlinn_embraced_by_the_moon_emblem | StaticAbilities$ STArlinn | SVars$ ArlinnX,ArlinnDealDamage | Planeswalker$ True | Ultimate$ True | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Creatures you control have haste and '{T}: This creature deals damage equal to its power to target creature or player.'"
+A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Name$ Emblem Arlinn, Embraced by the Moon | Image$ emblem_arlinn_embraced_by_the_moon | StaticAbilities$ STArlinn | SVars$ ArlinnX,ArlinnDealDamage | Planeswalker$ True | Ultimate$ True | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Creatures you control have haste and '{T}: This creature deals damage equal to its power to target creature or player.'"
 SVar:STArlinn:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.YouCtrl | AffectedZone$ Battlefield | AddKeyword$ Haste | AddAbility$ ArlinnDealDamage | AddSVar$ ArlinnX
 SVar:ArlinnDealDamage:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ ArlinnX | References$ ArlinnX | SpellDescription$ This creature deals damage equal to its power to target creature or player.
 SVar:ArlinnX:Count$CardPower 
diff --git a/forge-gui/res/cardsfolder/c/chandra_fire_of_kaladesh.txt b/forge-gui/res/cardsfolder/c/chandra_fire_of_kaladesh.txt
index 8decabec5e3..ce0c41e84e2 100644
--- a/forge-gui/res/cardsfolder/c/chandra_fire_of_kaladesh.txt
+++ b/forge-gui/res/cardsfolder/c/chandra_fire_of_kaladesh.txt
@@ -23,7 +23,7 @@ A:AB$ DealDamage | Cost$ AddCounter<1/LOYALTY> | ValidTgts$ Player | Planeswalke
 A:AB$ DealDamage | Cost$ SubCounter<2/LOYALTY> | ValidTgts$ Creature | Planeswalker$ True | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to target creature.
 A:AB$ DealDamage | Cost$ SubCounter<7/LOYALTY> | Defined$ Player.Opponent | Planeswalker$ True | Ultimate$ True | NumDmg$ 6 | RememberDamaged$ True | SubAbility$ DBRoaringFlame | SpellDescription$ CARDNAME deals 6 damage to each opponent. Each player dealt damage this way gets an emblem with "At the beginning of your upkeep, this emblem deals 3 damage to you."
 SVar:DBRoaringFlame:DB$ RepeatEach | RepeatPlayers$ Player.IsRemembered | RepeatSubAbility$ DBUltimateEmblem | ClearRememberedBeforeLoop$ True | StackDescription$ Each player dealt damage this way gets an emblem with "At the beginning of your upkeep, this emblem deals 3 damage to you."
-SVar:DBUltimateEmblem:DB$ Effect | Name$ Chandra, Roaring Flame emblem | Image$ chandra_roaring_flame_emblem | Stackable$ True | Triggers$ FlameTrigger | SVars$ TrigDealDamage | Duration$ Permanent | AILogic$ Always | EffectOwner$ Player.IsRemembered | SpellDescription$ You get an emblem with "Whenever a creature dies, return it to the battlefield under your control at the beginning of the next end step."
+SVar:DBUltimateEmblem:DB$ Effect | Name$ Emblem Chandra, Roaring Flame | Image$ emblem_chandra_roaring_flame | Stackable$ True | Triggers$ FlameTrigger | SVars$ TrigDealDamage | Duration$ Permanent | AILogic$ Always | EffectOwner$ Player.IsRemembered | SpellDescription$ You get an emblem with "Whenever a creature dies, return it to the battlefield under your control at the beginning of the next end step."
 SVar:FlameTrigger:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Command | Execute$ TrigDealDamage | TriggerDescription$ At the beginning of your upkeep, CARDNAME deals 3 damage to you.
 SVar:TrigDealDamage:DB$DealDamage | Defined$ You | NumDmg$ 3
-Oracle:+1: Chandra, Roaring Flame deals 2 damage to target player.\n-2: Chandra, Roaring Flame deals 2 damage to target creature.\n-7: Chandra, Roaring Flame deals 6 damage to each opponent. Each player dealt damage this way gets an emblem with "At the beginning of your upkeep, this emblem deals 3 damage to you."
\ No newline at end of file
+Oracle:[+1]: Chandra, Roaring Flame deals 2 damage to target player.\n[-2]: Chandra, Roaring Flame deals 2 damage to target creature.\n[-7]: Chandra, Roaring Flame deals 6 damage to each opponent. Each player dealt damage this way gets an emblem with "At the beginning of your upkeep, this emblem deals 3 damage to you."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/c/chandra_torch_of_defiance.txt b/forge-gui/res/cardsfolder/c/chandra_torch_of_defiance.txt
index e85963ebe51..fa10a3821c1 100644
--- a/forge-gui/res/cardsfolder/c/chandra_torch_of_defiance.txt
+++ b/forge-gui/res/cardsfolder/c/chandra_torch_of_defiance.txt
@@ -8,7 +8,7 @@ SVar:DBDamage:DB$ DealDamage | Defined$ Player.Opponent | NumDmg$ 2 | ConditionD
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True
 A:AB$ Mana | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Produced$ R | Amount$ 2 | AILogic$ ManaRitual | SpellDescription$ Add {R}{R} to your mana pool.
 A:AB$ DealDamage | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature.
-A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Chandra, Torch of Defiance emblem | Image$ chandra_torch_of_defiance_emblem | Triggers$ TrigSpellCast | SVars$ EffSpellCast | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever you cast a spell, this emblem deals 5 damage to target creature or player."
+A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem Chandra, Torch of Defiance | Image$ emblem_chandra_torch_of_defiance | Triggers$ TrigSpellCast | SVars$ EffSpellCast | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever you cast a spell, this emblem deals 5 damage to target creature or player."
 SVar:TrigSpellCast:Mode$ SpellCast | ValidActivatingPlayer$ You | Execute$ EffSpellCast | TriggerDescription$ Whenever you cast a spell, this emblem deals 5 damage to target creature or player.
 SVar:EffSpellCast:DB$ DealDamage | ValidTgts$ Creature,Player | NumDmg$ 5
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chandra_torch_of_defiance.jpg
diff --git a/forge-gui/res/cardsfolder/d/dack_fayden.txt b/forge-gui/res/cardsfolder/d/dack_fayden.txt
index 4b33730309e..d000f7d0f51 100644
--- a/forge-gui/res/cardsfolder/d/dack_fayden.txt
+++ b/forge-gui/res/cardsfolder/d/dack_fayden.txt
@@ -5,9 +5,9 @@ Loyalty:3
 A:AB$ Draw | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player draws two cards, then discards two cards. | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$ Discard | Defined$ Targeted | NumCards$ 2 | Mode$ TgtChoose
 A:AB$ GainControl | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ValidTgts$ Artifact | TgtPrompt$ Select target artifact | SpellDescription$ Gain control of target artifact.
-A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Dack Fayden emblem | Triggers$ TrigSpellCast | SVars$ EffSpellCast | Duration$ Permanent | AILogic$ Always | Stackable$ False | SpellDescription$ You get an emblem with "Whenever you cast a spell that targets one or more permanents, gain control of those permanents."
+A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem Dack Fayden | Triggers$ TrigSpellCast | SVars$ EffSpellCast | Duration$ Permanent | AILogic$ Always | Stackable$ False | SpellDescription$ You get an emblem with "Whenever you cast a spell that targets one or more permanents, gain control of those permanents."
 SVar:TrigSpellCast:Mode$ SpellCast | ValidActivatingPlayer$ You | TargetsValid$ Permanent | Execute$ EffSpellCast | TriggerDescription$ Whenever you cast a spell that targets one or more permanents, gain control of those permanents.
 SVar:EffSpellCast:AB$ GainControl | Cost$ 0 | Defined$ TriggeredSpellAbilityTargetingCards
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dack_fayden.jpg
-Oracle:[+1] Target player draws two cards, then discards two cards.\n[-2] Gain control of target artifact.\n[-6] You get an emblem with "Whenever you cast a spell that targets one or more permanents, gain control of those permanents."
+Oracle:[+1]: Target player draws two cards, then discards two cards.\n[-2]: Gain control of target artifact.\n[-6]: You get an emblem with "Whenever you cast a spell that targets one or more permanents, gain control of those permanents."
diff --git a/forge-gui/res/cardsfolder/d/daretti_scrap_savant.txt b/forge-gui/res/cardsfolder/d/daretti_scrap_savant.txt
index be0c7716669..707d1469a31 100644
--- a/forge-gui/res/cardsfolder/d/daretti_scrap_savant.txt
+++ b/forge-gui/res/cardsfolder/d/daretti_scrap_savant.txt
@@ -9,10 +9,10 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 A:AB$ Sacrifice | Cost$ SubCounter<2/LOYALTY> | SacValid$ Artifact | RememberSacrificed$ True | StackDescription$ SpellDescription | Planeswalker$ True | SubAbility$ DBChangeZone | SpellDescription$ Sacrifice an artifact. If you do, return target artifact card from your graveyard to the battlefield.
 SVar:DBChangeZone:DB$ ChangeZone | ValidTgts$ Artifact.YouCtrl | TgtPrompt$ Select target artifact card in your graveyard | Origin$ Graveyard | Destination$ Battlefield | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | References$ X | StackDescription$ None | SubAbility$ DBCleanup
-A:AB$ Effect | Cost$ SubCounter<10/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Daretti, Scrap Savant emblem | Image$ daretti_scrap_savant_emblem | Stackable$ False | Triggers$ TrigChangesZone | SVars$ DelTrigReturn,DBReturn | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever an artifact is put into your graveyard from the battlefield, return that card to the battlefield at the beginning of the next end step."
+A:AB$ Effect | Cost$ SubCounter<10/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem  Daretti, Scrap Savant | Image$ Emblem_daretti_scrap_savant | Stackable$ False | Triggers$ TrigChangesZone | SVars$ DelTrigReturn,DBReturn | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever an artifact is put into your graveyard from the battlefield, return that card to the battlefield at the beginning of the next end step."
 SVar:TrigChangesZone:Mode$ ChangesZone | ValidCard$ Artifact.YouOwn | Origin$ Battlefield | Destination$ Graveyard | Execute$ DelTrigReturn | TriggerZones$ Command | TriggerDescription$ Whenever an artifact is put into your graveyard from the battlefield, return that card to the battlefield at the beginning of the next end step.
 SVar:DelTrigReturn:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ DBReturn | RememberObjects$ TriggeredCard | TriggerDescription$ Return that card to the battlefield at the beginning of the next end step.
 SVar:DBReturn:DB$ ChangeZone | Defined$ DelayTriggerRemembered | Origin$ Graveyard | Destination$ Battlefield
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/daretti_scrap_savant.jpg
-Oracle:[+2] Discard up to two cards, then draw that many cards.\n[-2] Sacrifice an artifact. If you do, return target artifact card from your graveyard to the battlefield.\n[-10] You get an emblem with "Whenever an artifact is put into your graveyard from the battlefield, return that card to the battlefield at the beginning of the next end step."\nDaretti, Scrap Savant can be your commander.
+Oracle:[+2]: Discard up to two cards, then draw that many cards.\n[-2]: Sacrifice an artifact. If you do, return target artifact card from your graveyard to the battlefield.\n[-10]: You get an emblem with "Whenever an artifact is put into your graveyard from the battlefield, return that card to the battlefield at the beginning of the next end step."\nDaretti, Scrap Savant can be your commander.
diff --git a/forge-gui/res/cardsfolder/d/domri_rade.txt b/forge-gui/res/cardsfolder/d/domri_rade.txt
index eadf4ce8e31..04962135d97 100644
--- a/forge-gui/res/cardsfolder/d/domri_rade.txt
+++ b/forge-gui/res/cardsfolder/d/domri_rade.txt
@@ -7,7 +7,7 @@ SVar:DBChangeZone:DB$ ChangeZone | Defined$ TopOfLibrary | Origin$ Library | Des
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 A:AB$ Pump | Cost$ SubCounter<2/LOYALTY> | ValidTgts$ Creature.YouCtrl | AILogic$ Fight | TgtPrompt$ Choose target creature you control | Planeswalker$ True | SubAbility$ DomriFight | StackDescription$ None | SpellDescription$ Target creature you control fights another target creature.
 SVar:DomriFight:DB$ Fight | Defined$ ParentTarget | ValidTgts$ Creature | TargetUnique$ True | TgtPrompt$ Choose another target creature to fight the first target creature
-A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Name$ Domri Rade emblem | Image$ domri_rade_emblem | StaticAbilities$ STDomri | Planeswalker$ True | Ultimate$ True | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Creatures you control have double strike, trample, hexproof and haste."
+A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Name$ Emblem Domri Rade | Image$ emblem_domri_rade | StaticAbilities$ STDomri | Planeswalker$ True | Ultimate$ True | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Creatures you control have double strike, trample, hexproof and haste."
 SVar:STDomri:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.YouCtrl | AffectedZone$ Battlefield | AddKeyword$ Double Strike & Trample & Hexproof & Haste
 SVar:Picture:http://www.wizards.com/global/images/magic/general/domri_rade.jpg
-Oracle:[+1] Look at the top card of your library. If it's a creature card, you may reveal it and put it into your hand.\n[-2] Target creature you control fights another target creature.\n[-7] You get an emblem with "Creatures you control have double strike, trample, hexproof, and haste."
+Oracle:[+1]: Look at the top card of your library. If it's a creature card, you may reveal it and put it into your hand.\n[-2]: Target creature you control fights another target creature.\n[-7]: You get an emblem with "Creatures you control have double strike, trample, hexproof, and haste."
diff --git a/forge-gui/res/cardsfolder/d/dovin_baan.txt b/forge-gui/res/cardsfolder/d/dovin_baan.txt
index 1d3dbb72634..bd3a94250f8 100644
--- a/forge-gui/res/cardsfolder/d/dovin_baan.txt
+++ b/forge-gui/res/cardsfolder/d/dovin_baan.txt
@@ -5,7 +5,7 @@ Loyalty:3
 A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | NumAtt$ -3 | IsCurse$ True | UntilYourNextTurn$ True | TargetMin$ 0 | TargetMax$ 1 | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME's activated abilities can't be activated. | SpellDescription$ Until your next turn, up to one target creature gets -3/-0 and its activated abilities can't be activated.
 A:AB$ GainLife | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | Defined$ You | LifeAmount$ 2 | SubAbility$ DBDraw | SpellDescription$ You gain 2 life and draw a card.
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1
-A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Name$ Dovin Baan emblem | Image$ dovin_baan_emblem | StaticAbilities$ STDovin | Planeswalker$ True | Ultimate$ True | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Your opponents can't untap more than two permanents during their untap steps."
+A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Name$ Emblem Dovin Baan | Image$ Emblem_dovin_baan | StaticAbilities$ STDovin | Planeswalker$ True | Ultimate$ True | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Your opponents can't untap more than two permanents during their untap steps."
 SVar:STDovin:Mode$ Continuous | EffectZone$ Command | Affected$ Player.Opponent | AddKeyword$ UntapAdjust:Permanent:2 | Description$ Your opponents can't untap more than two permanents during their untap steps.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dovin_baan.jpg
 Oracle:[+1]: Until your next turn, up to one target creature gets -3/-0 and its activated abilities can't be activated.\n[-1]: You gain 2 life and draw a card.\n[-7]: You get an emblem with "Your opponents can't untap more than two permanents during their untap steps."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/e/elspeth_knight_errant.txt b/forge-gui/res/cardsfolder/e/elspeth_knight_errant.txt
index b2b631e763f..c558ac7f3d3 100644
--- a/forge-gui/res/cardsfolder/e/elspeth_knight_errant.txt
+++ b/forge-gui/res/cardsfolder/e/elspeth_knight_errant.txt
@@ -4,8 +4,8 @@ Types:Legendary Planeswalker Elspeth
 Loyalty:4
 A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | TokenAmount$ 1 | TokenName$ Soldier | TokenColors$ White | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenPower$ 1 | TokenToughness$ 1 | Planeswalker$ True | TokenImage$ w 1 1 soldier ALA | SpellDescription$ Create a 1/1 white Soldier creature token.
 A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 3 | NumDef$ 3 | KW$ Flying | Planeswalker$ True | SpellDescription$ Target creature gets +3/+3 and gains flying until end of turn.
-A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Name$ Elspeth, Knight-Errant emblem | Image$ elspeth_knight_errant_emblem | StaticAbilities$ STIndestructible | Keywords$ Indestructible | Planeswalker$ True | Ultimate$ True | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Artifacts, creatures, enchantments, and lands you control have indestructible."
+A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Name$ Emblem Elspeth, Knight-Errant | Image$ emblem_elspeth_knight_errant | StaticAbilities$ STIndestructible | Keywords$ Indestructible | Planeswalker$ True | Ultimate$ True | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Artifacts, creatures, enchantments, and lands you control have indestructible."
 SVar:STIndestructible:Mode$ Continuous | EffectZone$ Command | Affected$ Artifact.YouCtrl,Creature.YouCtrl,Enchantment.YouCtrl,Land.YouCtrl | AffectedZone$ Battlefield | AddKeyword$ Indestructible
 SVar:Indestructible:Artifacts, creatures, enchantments, and lands you control are indestructible.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elspeth_knight_errant.jpg
-Oracle:[+1] Create a 1/1 white Soldier creature token.\n[+1] Target creature gets +3/+3 and gains flying until end of turn.\n[-8] You get an emblem with "Artifacts, creatures, enchantments, and lands you control have indestructible."
+Oracle:[+1]: Create a 1/1 white Soldier creature token.\n[+1]: Target creature gets +3/+3 and gains flying until end of turn.\n[-8]: You get an emblem with "Artifacts, creatures, enchantments, and lands you control have indestructible."
diff --git a/forge-gui/res/cardsfolder/e/elspeth_suns_champion.txt b/forge-gui/res/cardsfolder/e/elspeth_suns_champion.txt
index f3be084e52e..6af1a9bfe06 100644
--- a/forge-gui/res/cardsfolder/e/elspeth_suns_champion.txt
+++ b/forge-gui/res/cardsfolder/e/elspeth_suns_champion.txt
@@ -4,7 +4,7 @@ Types:Legendary Planeswalker Elspeth
 Loyalty:4
 A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | TokenAmount$ 3 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | Planeswalker$ True | TokenImage$ w_1_1_soldier2_ths | SpellDescription$ Create three 1/1 white Soldier creature tokens.
 A:AB$ DestroyAll | Cost$ SubCounter<3/LOYALTY> | ValidCards$ Creature.powerGE4 | Planeswalker$ True | SpellDescription$ Destroy all creatures with power 4 or greater.
-A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Name$ Elspeth, Sun's Champion emblem | Image$ elspeth_suns_champion_emblem | StaticAbilities$ STFlying | Planeswalker$ True | Ultimate$ True | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Creatures you control get +2/+2 and have flying."
+A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Name$ Emblem Elspeth, Sun's Champion | Image$ emblem_elspeth_suns_champion | StaticAbilities$ STFlying | Planeswalker$ True | Ultimate$ True | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Creatures you control get +2/+2 and have flying."
 SVar:STFlying:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.YouCtrl | AffectedZone$ Battlefield | AddKeyword$ Flying | AddPower$ 2 | AddToughness$ 2 | Description$ Creatures you control get +2/+2 and have flying.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elspeth_suns_champion.jpg
-Oracle:[+1] Create three 1/1 white Soldier creature tokens.\n[-3] Destroy all creatures with power 4 or greater.\n[-7] You get an emblem with "Creatures you control get +2/+2 and have flying."
+Oracle:[+1]: Create three 1/1 white Soldier creature tokens.\n[-3]: Destroy all creatures with power 4 or greater.\n[-7]: You get an emblem with "Creatures you control get +2/+2 and have flying."
diff --git a/forge-gui/res/cardsfolder/g/garruk_apex_predator.txt b/forge-gui/res/cardsfolder/g/garruk_apex_predator.txt
index e58f8487b00..0fc0a30fa4c 100644
--- a/forge-gui/res/cardsfolder/g/garruk_apex_predator.txt
+++ b/forge-gui/res/cardsfolder/g/garruk_apex_predator.txt
@@ -7,8 +7,8 @@ A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | TokenAmount$ 1
 A:AB$ Destroy | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ DBGainLife | SpellDescription$ Destroy target creature. You gain life equal to its toughness.
 SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X
 SVar:X:TargetedLKI$CardToughness
-A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | ValidTgts$ Opponent | EffectOwner$ Targeted | Planeswalker$ True | Ultimate$ True | Name$ Garruk, Apex Predator emblem | Image$ garruk_apex_predator_emblem | Triggers$ TrigAttackYou | SVars$ DBPump | Duration$ Permanent | AILogic$ Always | SpellDescription$ Target opponent gets an emblem with "Whenever a creature attacks you, it gets +5/+5 and gains trample until end of turn."
+A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | ValidTgts$ Opponent | EffectOwner$ Targeted | Planeswalker$ True | Ultimate$ True | Name$ Emblem Garruk, Apex Predator | Image$ emblem_garruk_apex_predator | Triggers$ TrigAttackYou | SVars$ DBPump | Duration$ Permanent | AILogic$ Always | SpellDescription$ Target opponent gets an emblem with "Whenever a creature attacks you, it gets +5/+5 and gains trample until end of turn."
 SVar:TrigAttackYou:Mode$ Attacks | ValidCard$ Creature | Attacked$ You | TriggerZones$ Command | Execute$ DBPump | TriggerDescription$ Whenever a creature attacks you, it gets +5/+5 and gains trample until end of turn.
 SVar:DBPump:AB$ Pump | Cost$ 0 | Defined$ TriggeredAttacker | NumAtt$ 5 | NumDef$ 5 | KW$ Trample
 SVar:Picture:http://www.wizards.com/global/images/magic/general/garruk_apex_predator.jpg
-Oracle:[+1] Destroy another target planeswalker.\n[+1] Create a 3/3 black Beast creature token with deathtouch.\n[-3] Destroy target creature. You gain life equal to its toughness.\n[-8] Target opponent gets an emblem with "Whenever a creature attacks you, it gets +5/+5 and gains trample until end of turn."
+Oracle:[+1] Destroy another target planeswalker.\n[+1]: Create a 3/3 black Beast creature token with deathtouch.\n[-3]: Destroy target creature. You gain life equal to its toughness.\n[-8]: Target opponent gets an emblem with "Whenever a creature attacks you, it gets +5/+5 and gains trample until end of turn."
diff --git a/forge-gui/res/cardsfolder/g/garruk_caller_of_beasts.txt b/forge-gui/res/cardsfolder/g/garruk_caller_of_beasts.txt
index 7f478dc0d71..d33c8bcc2e5 100644
--- a/forge-gui/res/cardsfolder/g/garruk_caller_of_beasts.txt
+++ b/forge-gui/res/cardsfolder/g/garruk_caller_of_beasts.txt
@@ -4,8 +4,8 @@ Types:Legendary Planeswalker Garruk
 Loyalty:4
 A:AB$ Dig | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | DigNum$ 5 | Reveal$ True | ChangeNum$ All | ChangeValid$ Creature | SpellDescription$ Reveal the top five cards of your library. Put all creature cards revealed this way into your hand and the rest on the bottom of your library in any order.
 A:AB$ ChangeZone | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | Origin$ Hand | Destination$ Battlefield | ChangeType$ Creature.Green+YouCtrl | Optional$ True | SpellDescription$ You may put a Green creature card from your hand onto the battlefield.
-A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Garruk, Caller of Beasts emblem | Image$ garruk_caller_of_beasts_emblem | Triggers$ TrigSearch | SVars$ DBSearch | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever you cast a creature spell, you may search your library for a creature card, put it onto the battlefield, then shuffle your library."
+A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem Garruk, Caller of Beasts | Image$ emblem_garruk_caller_of_beasts | Triggers$ TrigSearch | SVars$ DBSearch | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever you cast a creature spell, you may search your library for a creature card, put it onto the battlefield, then shuffle your library."
 SVar:TrigSearch:Mode$ SpellCast | ValidCard$ Card.Creature | ValidActivatingPlayer$ You | TriggerZones$ Command | OptionalDecider$ You | Execute$ DBSearch | TriggerDescription$ Whenever you cast a creature spell, you may search your library for a creature card, put it onto the battlefield, then shuffle your library.
 SVar:DBSearch:AB$ ChangeZone | Cost$ 0 | ChangeType$ Creature | Origin$ Library | Destination$ Battlefield | ShuffleNonMandatory$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/garruk_caller_of_beasts.jpg
-Oracle:[+1] Reveal the top five cards of your library. Put all creature cards revealed this way into your hand and the rest on the bottom of your library in any order.\n[-3] You may put a green creature card from your hand onto the battlefield.\n[-7] You get an emblem with "Whenever you cast a creature spell, you may search your library for a creature card, put it onto the battlefield, then shuffle your library."
+Oracle:[+1]: Reveal the top five cards of your library. Put all creature cards revealed this way into your hand and the rest on the bottom of your library in any order.\n[-3]: You may put a green creature card from your hand onto the battlefield.\n[-7]: You get an emblem with "Whenever you cast a creature spell, you may search your library for a creature card, put it onto the battlefield, then shuffle your library."
diff --git a/forge-gui/res/cardsfolder/g/gideon_ally_of_zendikar.txt b/forge-gui/res/cardsfolder/g/gideon_ally_of_zendikar.txt
index 6ffa12786f3..eddf5d24553 100644
--- a/forge-gui/res/cardsfolder/g/gideon_ally_of_zendikar.txt
+++ b/forge-gui/res/cardsfolder/g/gideon_ally_of_zendikar.txt
@@ -5,7 +5,7 @@ Loyalty:4
 A:AB$ Animate | Cost$ AddCounter<1/LOYALTY> | Defined$ Self | Power$ 5 | Toughness$ 5 | Keywords$ Indestructible | Types$ Creature,Human,Soldier,Ally | SubAbility$ GideonPrevent | Planeswalker$ True | SpellDescription$ Until end of turn, CARDNAME becomes a 5/5 Human Soldier Ally creature with indestructible that is still a planeswalker. Prevent all damage that would be dealt to him this turn.
 SVar:GideonPrevent:DB$ Pump | Defined$ Self | KW$ Prevent all damage that would be dealt to CARDNAME.
 A:AB$ Token | Cost$ AddCounter<0/LOYALTY> | TokenAmount$ 1 | TokenName$ Knight Ally | TokenColors$ White | TokenTypes$ Creature,Knight,Ally | TokenOwner$ You | TokenPower$ 2 | TokenToughness$ 2 | Planeswalker$ True | SpellDescription$ Create a 2/2 white Knight Ally creature token.
-A:AB$ Effect | Cost$ SubCounter<4/LOYALTY> | Name$ Gideon, Ally of Zendikar emblem | StaticAbilities$ STPump | Planeswalker$ True | Ultimate$ True | Duration$ Permanent | AILogic$ NeedCreatures:3 | SpellDescription$ You get an emblem with "Creatures you control get +1/+1." 
+A:AB$ Effect | Cost$ SubCounter<4/LOYALTY> | Name$ Emblem Gideon, Ally of Zendikar | StaticAbilities$ STPump | Planeswalker$ True | Ultimate$ True | Duration$ Permanent | AILogic$ NeedCreatures:3 | SpellDescription$ You get an emblem with "Creatures you control get +1/+1." 
 SVar:STPump:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Creatures you control get +1/+1.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gideon_ally_of_zendikar.jpg
-Oracle:[+1] Until end of turn, Gideon, Ally of Zendikar becomes a 5/5 Human Soldier Ally creature with indestructible that is still a planeswalker. Prevent all damage that would be dealt to him this turn.\n[0] Create a 2/2 white Knight Ally creature token.\n[-4] You get an emblem with "Creatures you control get +1/+1."
+Oracle:[+1]: Until end of turn, Gideon, Ally of Zendikar becomes a 5/5 Human Soldier Ally creature with indestructible that is still a planeswalker. Prevent all damage that would be dealt to him this turn.\n[0]: Create a 2/2 white Knight Ally creature token.\n[-4]: You get an emblem with "Creatures you control get +1/+1."
diff --git a/forge-gui/res/cardsfolder/g/gideon_of_the_trials.txt b/forge-gui/res/cardsfolder/g/gideon_of_the_trials.txt
index a2568be79d1..46a0cb54cfb 100644
--- a/forge-gui/res/cardsfolder/g/gideon_of_the_trials.txt
+++ b/forge-gui/res/cardsfolder/g/gideon_of_the_trials.txt
@@ -5,7 +5,7 @@ Loyalty:3
 A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | Planeswalker$ True | KW$ Prevent all damage that would be dealt by CARDNAME. | IsCurse$ True | UntilYourNextTurn$ True | SpellDescription$ Until your next turn, prevent all damage target permanent would deal.
 A:AB$ Animate | Cost$ AddCounter<0/LOYALTY> | Defined$ Self | Power$ 4 | Toughness$ 4 | Keywords$ Indestructible | Types$ Creature,Human,Soldier | SubAbility$ GideonPrevent | Planeswalker$ True | SpellDescription$ Until end of turn, CARDNAME becomes a 4/4 Human Soldier creature with indestructible that's still a planeswalker. Prevent all damage that would be dealt to him this turn.
 SVar:GideonPrevent:DB$ Pump | Defined$ Self | KW$ Prevent all damage that would be dealt to CARDNAME.
-A:AB$ Effect | Cost$ AddCounter<0/LOYALTY> | Name$ Gideon of the Trials emblem | StaticAbilities$ STPump1,STPump2 | Planeswalker$ True | Ultimate$ True | Duration$ Permanent | AILogic$ Always | Stackable$ False | SpellDescription$ You get an emblem with "As long as you control a Gideon planeswalker, you can't lose the game and your opponents can't win the game."
+A:AB$ Effect | Cost$ AddCounter<0/LOYALTY> | Name$ Emblem Gideon of the Trials | StaticAbilities$ STPump1,STPump2 | Planeswalker$ True | Ultimate$ True | Duration$ Permanent | AILogic$ Always | Stackable$ False | SpellDescription$ You get an emblem with "As long as you control a Gideon planeswalker, you can't lose the game and your opponents can't win the game."
 SVar:STPump1:Mode$ Continuous | EffectZone$ Command | Affected$ You | IsPresent$ Planeswalker.Gideon+YouCtrl | AddKeyword$ You can't lose the game. | Description$ As long as you control a Gideon planeswalker, you can't lose the game and your opponents can't win the game.
 SVar:STPump2:Mode$ Continuous | EffectZone$ Command | Affected$ Player.Opponent | IsPresent$ Planeswalker.Gideon+YouCtrl | AddKeyword$ You can't win the game.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gideon_of_the_trials.jpg
diff --git a/forge-gui/res/cardsfolder/j/jace_unraveler_of_secrets.txt b/forge-gui/res/cardsfolder/j/jace_unraveler_of_secrets.txt
index dd483d46dc8..ccb2de9e0dc 100644
--- a/forge-gui/res/cardsfolder/j/jace_unraveler_of_secrets.txt
+++ b/forge-gui/res/cardsfolder/j/jace_unraveler_of_secrets.txt
@@ -5,7 +5,7 @@ Loyalty:5
 A:AB$ Scry | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ScryNum$ 1 | SubAbility$ DBDraw | SpellDescription$ Scry 1, then draw a card.
 SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1
 A:AB$ ChangeZone | Cost$ SubCounter<2/LOYALTY> | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Creature | TgtPrompt$ Select target creature | Planeswalker$ True | SpellDescription$ Return target creature to its owner's hand. 
-A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Name$ Jace, Unraveler of Secrets emblem | Image$ jace_unraveler_of_secrets_emblem | Triggers$ TrigCounter | SVars$ DBCounter | Planeswalker$ True | Ultimate$ True | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever an opponent casts his or her first spell each turn, counter that spell."
+A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Name$ Emblem Jace, Unraveler of Secrets | Image$ emblem_jace_unraveler_of_secrets | Triggers$ TrigCounter | SVars$ DBCounter | Planeswalker$ True | Ultimate$ True | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever an opponent casts his or her first spell each turn, counter that spell."
 SVar:TrigCounter:Mode$ SpellCast | ValidActivatingPlayer$ Player.Opponent | ActivatorThisTurnCast$ EQ1 | NoResolvingCheck$ True | Execute$ DBCounter | TriggerZones$ Command | TriggerDescription$ Whenever an opponent casts his or her first spell each turn, counter that spell.
 SVar:DBCounter:AB$Counter | Cost$ 0 | Defined$ TriggeredSpellAbility | Destination$ Graveyard 
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jace_unraveler_of_secrets.jpg
diff --git a/forge-gui/res/cardsfolder/j/jace_vryns_prodigy.txt b/forge-gui/res/cardsfolder/j/jace_vryns_prodigy.txt
index 1ed800503e7..67e62c62dd4 100644
--- a/forge-gui/res/cardsfolder/j/jace_vryns_prodigy.txt
+++ b/forge-gui/res/cardsfolder/j/jace_vryns_prodigy.txt
@@ -27,8 +27,8 @@ SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | ExileOnMoved$ Stack | Rep
 SVar:ReplaceGraveyard:Event$ Moved | ValidCard$ Card.IsRemembered | Origin$ Stack | Destination$ Graveyard | ReplaceWith$ MoveExile | Description$ If that card would be put into your graveyard this turn, exile it instead.
 SVar:MoveExile:DB$ ChangeZone | Defined$ ReplacedCard | Origin$ Stack | Destination$ Exile
 
-A:AB$ Effect | Cost$ SubCounter<9/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Jace, Telepath Unbound emblem | Image$ jace_telepath_unbound_emblem | Triggers$ TrigSpellCast | SVars$ EffSpellCast | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever you cast a spell, target opponent puts the top five cards of his or her library into his or her graveyard".
+A:AB$ Effect | Cost$ SubCounter<9/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem Jace, Telepath Unbound | Image$ emblem_jace_telepath_unbound | Triggers$ TrigSpellCast | SVars$ EffSpellCast | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever you cast a spell, target opponent puts the top five cards of his or her library into his or her graveyard".
 SVar:TrigSpellCast:Mode$ SpellCast | ValidActivatingPlayer$ You | Execute$ EffSpellCast | TriggerDescription$ Whenever you cast a spell, target opponent puts the top five cards of his or her library into his or her graveyard.
 SVar:EffSpellCast:AB$ Mill | Cost$ 0 | NumCards$ 5 | ValidTgts$ Opponent | TgtPrompt$ Select target opponent to mill
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jace_telepath_unbound.jpg
-Oracle:[+1] Up to one target creature gets -2/-0 until your next turn.\n[-3] You may cast target instant or sorcery card from your graveyard this turn. If that card would be put into your graveyard this turn, exile it instead.\n[-9] You get an emblem with "Whenever you cast a spell, target opponent puts the top five cards of his or her library into his or her graveyard".
+Oracle:[+1]: Up to one target creature gets -2/-0 until your next turn.\n[-3]: You may cast target instant or sorcery card from your graveyard this turn. If that card would be put into your graveyard this turn, exile it instead.\n[-9]: You get an emblem with "Whenever you cast a spell, target opponent puts the top five cards of his or her library into his or her graveyard".
diff --git a/forge-gui/res/cardsfolder/k/kiora_master_of_the_depths.txt b/forge-gui/res/cardsfolder/k/kiora_master_of_the_depths.txt
index e615d0ac064..cf3f5133f69 100644
--- a/forge-gui/res/cardsfolder/k/kiora_master_of_the_depths.txt
+++ b/forge-gui/res/cardsfolder/k/kiora_master_of_the_depths.txt
@@ -5,9 +5,9 @@ Loyalty:4
 A:AB$ Untap | Cost$ AddCounter<1/LOYALTY> | ValidTgts$ Creature | TgtPrompt$ Choose target creature | TargetMin$ 0 | TargetMax$ 1 | Planeswalker$ True | SubAbility$ DBUntap | SpellDescription$ Untap up to one target creature and up to one target land.
 SVar:DBUntap:DB$ Untap | ValidTgts$ Land | TgtPrompt$ Choose target land | TargetMin$ 0 | TargetMax$ 1
 A:AB$ Dig | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | DigNum$ 4 | Reveal$ True | ChangeNum$ 2 | ChangeValid$ Creature | AndOrValid$ Land | DestinationZone2$ Graveyard | Optional$ True | SpellDescription$ Reveal the top four cards of your library. You may put a creature card and/or a land card from among them into your hand. Put the rest into your graveyard.
-A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Kiora, Master of the Depths emblem | Image$ kiora_master_of_the_depths_emblem | Triggers$ TrigFight | SVars$ DBFight | Duration$ Permanent | AILogic$ Always | SubAbility$ DBToken | SpellDescription$ You get an emblem with "Whenever a creature enters the battlefield under your control, you may have it fight target creature." Then create three 8/8 blue Octopus creature tokens.
+A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem Kiora, Master of the Depths | Image$ emblem_kiora_master_of_the_depths | Triggers$ TrigFight | SVars$ DBFight | Duration$ Permanent | AILogic$ Always | SubAbility$ DBToken | SpellDescription$ You get an emblem with "Whenever a creature enters the battlefield under your control, you may have it fight target creature." Then create three 8/8 blue Octopus creature tokens.
 SVar:TrigFight:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.YouCtrl | Execute$ DBFight | OptionalDecider$ You | TriggerZones$ Command | TriggerDescription$ Whenever a creature enters the battlefield under your control, you may have it fight target creature.
 SVar:DBFight:AB$ Fight | Cost$ 0 | Defined$ TriggeredCard | ValidTgts$ Creature | TgtPrompt$ Choose target creature
 SVar:DBToken:DB$ Token | TokenAmount$ 3 | TokenName$ Octopus | TokenTypes$ Creature,Octopus | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 8 | TokenToughness$ 8
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kiora_master_of_the_depths.jpg
-Oracle:[+1] Untap up to one target creature and up to one target land.\n[-2] Reveal the top four cards of your library. You may put a creature card and/or a land card from among them into your hand. Put the rest into your graveyard.\n[-8] You get an emblem with "Whenever a creature enters the battlefield under your control, you may have it fight target creature." Then create three 8/8 blue Octopus creature tokens.
\ No newline at end of file
+Oracle:[+1]: Untap up to one target creature and up to one target land.\n[-2]: Reveal the top four cards of your library. You may put a creature card and/or a land card from among them into your hand. Put the rest into your graveyard.\n[-8]: You get an emblem with "Whenever a creature enters the battlefield under your control, you may have it fight target creature." Then create three 8/8 blue Octopus creature tokens.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/k/kiora_the_crashing_wave.txt b/forge-gui/res/cardsfolder/k/kiora_the_crashing_wave.txt
index bfe0bdb360c..e271340e3ab 100644
--- a/forge-gui/res/cardsfolder/k/kiora_the_crashing_wave.txt
+++ b/forge-gui/res/cardsfolder/k/kiora_the_crashing_wave.txt
@@ -6,8 +6,8 @@ A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | ValidTgts$ Permanent.OppCtrl | TgtPro
 A:AB$ Draw | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | SubAbility$ DBEffect | SpellDescription$ Draw a card. You may play an additional land this turn.
 SVar:DBEffect:DB$ Effect | StaticAbilities$ Exploration
 SVar:Exploration:Mode$ Continuous | Affected$ You | AddKeyword$ AdjustLandPlays:1 | EffectZone$ Command | Description$ You may play an additional land this turn.
-A:AB$ Effect | Cost$ SubCounter<5/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Kiora, the Crashing Wave emblem | Triggers$ EOTTrig | SVars$ KioraToken | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "At the beginning of your end step, create a 9/9 blue Kraken creature token."
+A:AB$ Effect | Cost$ SubCounter<5/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem Kiora, the Crashing Wave | Triggers$ EOTTrig | SVars$ KioraToken | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "At the beginning of your end step, create a 9/9 blue Kraken creature token."
 SVar:EOTTrig:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Command | Execute$ KioraToken | TriggerDescription$ At the beginning of your end step, create a 9/9 blue Kraken creature token.
 SVar:KioraToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Kraken | TokenTypes$ Creature,Kraken | TokenOwner$ You | TokenColors$ Blue | TokenPower$ 9 | TokenToughness$ 9
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kiora_the_crashing_wave.jpg
-Oracle:[+1] Until your next turn, prevent all damage that would be dealt to and dealt by target permanent an opponent controls.\n[-1] Draw a card. You may play an additional land this turn.\n[-5] You get an emblem with "At the beginning of your end step, create a 9/9 blue Kraken creature token."
+Oracle:[+1]: Until your next turn, prevent all damage that would be dealt to and dealt by target permanent an opponent controls.\n[-1]: Draw a card. You may play an additional land this turn.\n[-5]: You get an emblem with "At the beginning of your end step, create a 9/9 blue Kraken creature token."
diff --git a/forge-gui/res/cardsfolder/k/koth_of_the_hammer.txt b/forge-gui/res/cardsfolder/k/koth_of_the_hammer.txt
index 1eb5b7887bc..d49be04364b 100644
--- a/forge-gui/res/cardsfolder/k/koth_of_the_hammer.txt
+++ b/forge-gui/res/cardsfolder/k/koth_of_the_hammer.txt
@@ -5,11 +5,11 @@ Loyalty:3
 A:AB$ Untap | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Mountain | TgtPrompt$ Select target Mountain | SubAbility$ DBAnimate | SpellDescription$ Untap target Mountain. It becomes a 4/4 red Elemental creature until end of turn. It's still a land.
 SVar:DBAnimate:DB$ Animate | Defined$ Targeted | Power$ 4 | Toughness$ 4 | Types$ Creature,Elemental | Colors$ Red
 A:AB$ Mana | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | Produced$ R | Amount$ X | References$ X | SpellDescription$ Add {R} to your mana pool for each Mountain you control.
-A:AB$ Effect | Cost$ SubCounter<5/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Koth of the Hammer emblem | Image$ koth_of_the_hammer_emblem | StaticAbilities$ STDamage | SVars$ ABDealDamage | Stackable$ False | Keywords$ Damage | Duration$ Permanent | SpellDescription$ You get an emblem with "Mountains you control have '{T}: This land deals 1 damage to target creature or player."
+A:AB$ Effect | Cost$ SubCounter<5/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem Koth of the Hammer | Image$ emblem_koth_of_the_hammer | StaticAbilities$ STDamage | SVars$ ABDealDamage | Stackable$ False | Keywords$ Damage | Duration$ Permanent | SpellDescription$ You get an emblem with "Mountains you control have '{T}: This land deals 1 damage to target creature or player."
 SVar:STDamage:Mode$ Continuous | EffectZone$ Command | Affected$ Mountain.YouCtrl | AddAbility$ ABDealDamage | AffectedZone$ Battlefield
 SVar:ABDealDamage:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1 | SpellDescription$ Deal 1 damage to target creature or player
 SVar:Damage:Mountains you control have '{T}: This land deals 1 damage to target creature or player.
 SVar:X:Count$Valid Mountain.YouCtrl
 SVar:PlayMain1:ALWAYS
 SVar:Picture:http://www.wizards.com/global/images/magic/general/koth_of_the_hammer.jpg
-Oracle:[+1] Untap target Mountain. It becomes a 4/4 red Elemental creature until end of turn. It's still a land.\n[-2] Add {R} to your mana pool for each Mountain you control.\n[-5] You get an emblem with "Mountains you control have '{T}: This land deals 1 damage to target creature or player.'"
+Oracle:[+1]: Untap target Mountain. It becomes a 4/4 red Elemental creature until end of turn. It's still a land.\n[-2]: Add {R} to your mana pool for each Mountain you control.\n[-5]: You get an emblem with "Mountains you control have '{T}: This land deals 1 damage to target creature or player.'"
diff --git a/forge-gui/res/cardsfolder/l/liliana_heretical_healer.txt b/forge-gui/res/cardsfolder/l/liliana_heretical_healer.txt
index baf32849e4b..b2d2fe3433c 100644
--- a/forge-gui/res/cardsfolder/l/liliana_heretical_healer.txt
+++ b/forge-gui/res/cardsfolder/l/liliana_heretical_healer.txt
@@ -21,11 +21,11 @@ Types:Legendary Planeswalker Liliana
 Loyalty:3
 A:AB$ Discard | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | Defined$ Player | NumCards$ 1 | Mode$ TgtChoose | SpellDescription$ Each player discards a card.
 A:AB$ ChangeZone | Cost$ SubCounter<X/LOYALTY> | Planeswalker$ True | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature in your graveyard | ValidTgts$ Creature.YouCtrl+nonLegendary | SpellDescription$ Return target nonlegendary creature card with converted mana cost X from your graveyard to the battlefield.
-A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Liliana, Defiant Necromancer emblem | Image$ liliana_defiant_necromancer_emblem | Stackable$ False | Triggers$ TrigChangesZone | SVars$ DelTrigReturn,DBReturn | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever a creature dies, return it to the battlefield under your control at the beginning of the next end step."
+A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem Liliana, Defiant Necromancer | Image$ emblem_liliana_defiant_necromancer | Stackable$ False | Triggers$ TrigChangesZone | SVars$ DelTrigReturn,DBReturn | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever a creature dies, return it to the battlefield under your control at the beginning of the next end step."
 SVar:TrigChangesZone:Mode$ ChangesZone | ValidCard$ Creature | Origin$ Battlefield | Destination$ Graveyard | Execute$ DelTrigReturn | TriggerZones$ Command | TriggerDescription$ Whenever a creature dies, return it to the battlefield under your control at the beginning of the next end step.
 SVar:DelTrigReturn:DB$ DelayedTrigger | Mode$ Phase | Phase$ End Of Turn | Execute$ DBReturn | RememberObjects$ TriggeredCard | TriggerDescription$ Return that card to the battlefield at the beginning of the next end step.
 SVar:DBReturn:DB$ ChangeZone | Defined$ DelayTriggerRemembered | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True
 SVar:X:Targeted$CardManaCost
 SVar:Picture:http://www.wizards.com/global/images/magic/general/liliana_defiant_necromancer.jpg
-Oracle:[+2] Each player discards a card.\n[-X] Return target nonlegendary creature card with converted mana cost X from your graveyard to the battlefield.\n[-8] You get an emblem with "Whenever a creature dies, return it to the battlefield under your control at the beginning of the next end step."
+Oracle:[+2]: Each player discards a card.\n[-X]: Return target nonlegendary creature card with converted mana cost X from your graveyard to the battlefield.\n[-8]: You get an emblem with "Whenever a creature dies, return it to the battlefield under your control at the beginning of the next end step."
 
diff --git a/forge-gui/res/cardsfolder/l/liliana_of_the_dark_realms.txt b/forge-gui/res/cardsfolder/l/liliana_of_the_dark_realms.txt
index be886a6dca2..88a696cab3d 100644
--- a/forge-gui/res/cardsfolder/l/liliana_of_the_dark_realms.txt
+++ b/forge-gui/res/cardsfolder/l/liliana_of_the_dark_realms.txt
@@ -4,7 +4,7 @@ Types:Legendary Planeswalker Liliana
 Loyalty:3
 A:AB$ ChangeZone | Cost$ AddCounter<1/LOYALTY> | Origin$ Library | Destination$ Hand | Planeswalker$ True | NumCards$ 1 | ChangeType$ Swamp | Mandatory$ True | SpellDescription$ Search your library for a swamp card, reveal it, and put it into your hand. Then shuffle your library.
 A:AB$ Pump | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | SubAbility$ ABChoice |  SpellDescription$ Target creature gets +X/+X or -X/-X until end of turn, where X is the number of swamps you control. | StackDescription$ Target creature gets +X/+X or -X/-X until end of turn, where X is the number of swamps you control.
-A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Liliana Of The Dark Realms Emblem | Image$ liliana_of_the_dark_realms_emblem | StaticAbilities$ SwampBoost | SVars$ BlackTap | Stackable$ False | Duration$ Permanent | SpellDescription$ You get an emblem with "Swamps you control have '{T}: Add {B}{B}{B}{B} to your mana pool.'".
+A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem Liliana Of The Dark Realms | Image$ emblem_liliana_of_the_dark_realms | StaticAbilities$ SwampBoost | SVars$ BlackTap | Stackable$ False | Duration$ Permanent | SpellDescription$ You get an emblem with "Swamps you control have '{T}: Add {B}{B}{B}{B} to your mana pool.'".
 SVar:X:Count$Valid Swamp.YouCtrl
 SVar:ABChoice:DB$ GenericChoice | Defined$ You | Cost$ 0 | Choices$ ABPump1,ABPump2
 SVar:ABPump1:DB$ Pump | Cost$ 0 | Defined$ Targeted | NumAtt$ +X | NumDef$ +X | References$ X | SpellDescription$ +X/+X
@@ -12,4 +12,4 @@ SVar:ABPump2:DB$ Pump | Cost$ 0 | Defined$ Targeted | NumAtt$ -X | NumDef$ -X |
 SVar:SwampBoost:Mode$ Continuous | EffectZone$ Command | Affected$ Swamp.YouCtrl | AffectedZone$ Battlefield | AddAbility$ BlackTap | Description$ Swamps you control have '{T}: Add {B}{B}{B}{B} to your mana pool.'
 SVar:BlackTap:AB$ Mana | Cost$ T | Produced$ B | Amount$ 4 | SpellDescription$ Add {B}{B}{B}{B} to your mana pool.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/liliana_of_the_dark_realms.jpg
-Oracle:[+1] Search your library for a Swamp card, reveal it, and put it into your hand. Then shuffle your library.\n[-3] Target creature gets +X/+X or -X/-X until end of turn, where X is the number of Swamps you control.\n[-6] You get an emblem with "Swamps you control have '{T}: Add {B}{B}{B}{B} to your mana pool.'"
+Oracle:[+1]: Search your library for a Swamp card, reveal it, and put it into your hand. Then shuffle your library.\n[-3]: Target creature gets +X/+X or -X/-X until end of turn, where X is the number of Swamps you control.\n[-6]: You get an emblem with "Swamps you control have '{T}: Add {B}{B}{B}{B} to your mana pool.'"
diff --git a/forge-gui/res/cardsfolder/l/liliana_the_last_hope.txt b/forge-gui/res/cardsfolder/l/liliana_the_last_hope.txt
index fa708f551dc..a3a69a0d4c9 100644
--- a/forge-gui/res/cardsfolder/l/liliana_the_last_hope.txt
+++ b/forge-gui/res/cardsfolder/l/liliana_the_last_hope.txt
@@ -7,7 +7,7 @@ A:AB$ Mill | Cost$ SubCounter<2/LOYALTY> | NumCards$ 2 | AILogic$ LilianaMill |
 SVar:DBChooseCard:DB$ ChooseCard | Choices$ Creature.YouOwn | Optional$ Yes | ChoiceZone$ Graveyard | Amount$ 1 | SubAbility$ DBChangeZone
 SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Defined$ ChosenCard | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
-A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Name$ Liliana, the Last Hope emblem | Image$ liliana_the_last_hope_emblem | Triggers$ TrigToken | SVars$ DBToken,X | Planeswalker$ True | Ultimate$ True | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "At the beginning of your end step, create X 2/2 black Zombie creature tokens, where X is two plus the number of Zombies you control."
+A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Name$ Emblem Liliana, the Last Hope | Image$ emblem_liliana_the_last_hope | Triggers$ TrigToken | SVars$ DBToken,X | Planeswalker$ True | Ultimate$ True | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "At the beginning of your end step, create X 2/2 black Zombie creature tokens, where X is two plus the number of Zombies you control."
 SVar:TrigToken:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Command | Execute$ DBToken | TriggerDescription$ At the beginning of your end step, create X 2/2 black Zombie creature tokens, where X is two plus the number of Zombies you control.
 SVar:DBToken:AB$ Token | Cost$ 0 | TokenAmount$ X | References$ X | TokenName$ Zombie | TokenTypes$ Creature,Zombie | TokenOwner$ You | TokenColors$ Black | TokenPower$ 2 | TokenToughness$ 2 | TokenImage$ b 2 2 zombie EMN | TokenAltImages$ b_2_2_zombie2_EMN,b_2_2_zombie3_EMN
 SVar:X:Count$Valid Card.Zombie+YouCtrl/Plus.2
diff --git a/forge-gui/res/cardsfolder/n/narset_transcendent.txt b/forge-gui/res/cardsfolder/n/narset_transcendent.txt
index 29f3c2088ae..4a5620f9b84 100644
--- a/forge-gui/res/cardsfolder/n/narset_transcendent.txt
+++ b/forge-gui/res/cardsfolder/n/narset_transcendent.txt
@@ -9,7 +9,7 @@ A:AB$Effect | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | AILogic$ Narset
 SVar:AddRebound:Mode$ SpellCast | ValidCard$ Instant.wasCastFromHand,Sorcery.wasCastFromHand | ValidActivatingPlayer$ You | OneOff$ True | Execute$ AddReboundMain | TriggerZones$ Command | TriggerDescription$ When you cast your next instant or sorcery spell from your hand this turn, it gains rebound.
 SVar:AddReboundMain:AB$ Pump | Cost$ 0 | Defined$ TriggeredCard| KW$ Rebound | PumpZone$ Stack | SubAbility$ DBCleanupTwo
 SVar:DBCleanupTwo:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
-A:AB$ Effect | Cost$ SubCounter<9/LOYALTY> | Name$ Narset Transcendent emblem | StaticAbilities$ STNarset | Planeswalker$ True | Ultimate$ True | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Your opponents can't cast noncreature spells."
+A:AB$ Effect | Cost$ SubCounter<9/LOYALTY> | Name$ Emblem Narset Transcendent | StaticAbilities$ STNarset | Planeswalker$ True | Ultimate$ True | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Your opponents can't cast noncreature spells."
 SVar:STNarset:Mode$ CantBeCast | ValidCard$ Card.nonCreature | Caster$ Opponent | EffectZone$ Command | Description$ Your opponents can't cast noncreature spells.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/narset_transcendent.jpg
-Oracle:[+1] Look at the top card of your library. If it's a noncreature, nonland card, you may reveal it and put it into your hand.\n[-2] When you cast your next instant or sorcery spell from your hand this turn, it gains rebound.\n[-9] You get an emblem with "Your opponents can't cast noncreature spells."
+Oracle:[+1]: Look at the top card of your library. If it's a noncreature, nonland card, you may reveal it and put it into your hand.\n[-2]: When you cast your next instant or sorcery spell from your hand this turn, it gains rebound.\n[-9]: You get an emblem with "Your opponents can't cast noncreature spells."
diff --git a/forge-gui/res/cardsfolder/n/nissa_vital_force.txt b/forge-gui/res/cardsfolder/n/nissa_vital_force.txt
index 28e6f12b1eb..3ba94792231 100644
--- a/forge-gui/res/cardsfolder/n/nissa_vital_force.txt
+++ b/forge-gui/res/cardsfolder/n/nissa_vital_force.txt
@@ -5,8 +5,8 @@ Loyalty:5
 A:AB$ Untap | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Land.YouCtrl | TgtPrompt$ Select target land you control | SubAbility$ DBAnimate | SpellDescription$ Untap target land you control. Until your next turn, it becomes a 5/5 Elemental creature with haste. It's still a land.
 SVar:DBAnimate:DB$ Animate | Defined$ Targeted | Power$ 5 | Toughness$ 5 | Types$ Creature,Elemental | UntilYourNextTurn$ True | Keywords$ Haste
 A:AB$ ChangeZone | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | Origin$ Graveyard | Destination$ Hand | TgtPrompt$ Choose target permanent card in your graveyard | ValidTgts$ Permanent.YouCtrl | SpellDescription$ Return target permanent card from your graveyard to your hand.
-A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Nissa, Vital Force emblem | Image$ nissa_vital_force_emblem | Triggers$ TrigDraw | SVars$ DBDraw | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever a land enters the battlefield under your control, you may draw a card."
+A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem Nissa, Vital Force | Image$ emblem_nissa_vital_force | Triggers$ TrigDraw | SVars$ DBDraw | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever a land enters the battlefield under your control, you may draw a card."
 SVar:TrigDraw:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | Execute$ DBDraw | OptionalDecider$ You | TriggerZones$ Command | TriggerDescription$ Whenever a land enters the battlefield under your control, you may draw a card.
 SVar:DBDraw:AB$ Draw | Cost$ 0 | Defined$ You | NumCards$ 1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nissa_vital_force.jpg
-Oracle:[+1] Untap target land you control. Until your next turn, it becomes a 5/5 Elemental creature with haste. It's still a land.\n[-3] Return target permanent card from your graveyard to your hand.\n[-6] You get an emblem with "Whenever a land enters the battlefield under your control, you may draw a card."
+Oracle:[+1]: Untap target land you control. Until your next turn, it becomes a 5/5 Elemental creature with haste. It's still a land.\n[-3]: Return target permanent card from your graveyard to your hand.\n[-6]: You get an emblem with "Whenever a land enters the battlefield under your control, you may draw a card."
diff --git a/forge-gui/res/cardsfolder/o/ob_nixilis_of_the_black_oath.txt b/forge-gui/res/cardsfolder/o/ob_nixilis_of_the_black_oath.txt
index 220773539ff..6a345c14c6c 100644
--- a/forge-gui/res/cardsfolder/o/ob_nixilis_of_the_black_oath.txt
+++ b/forge-gui/res/cardsfolder/o/ob_nixilis_of_the_black_oath.txt
@@ -8,10 +8,10 @@ SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ AFLifeLost
 SVar:AFLifeLost:Number$0
 A:AB$ Token | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | TokenImage$ b 5 5 demon C14 | TokenAmount$ 1 | TokenName$ Demon | TokenTypes$ Creature,Demon | TokenOwner$ You | TokenColors$ Black | TokenPower$ 5 | TokenToughness$ 5 | TokenKeywords$ Flying | SubAbility$ DBLoselife | SpellDescription$ Create a 5/5 black Demon creature token with flying. You lose 2 life.
 SVar:DBLoselife:DB$ LoseLife | LifeAmount$ 2
-A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Ob Nixilis of the Black Oath emblem | Image$ ob_nixilis_of_the_black_oath_emblem | Stackable$ False | Abilities$ ObGainLife | SVars$ DBDraw,X | Duration$ Permanent | SpellDescription$ You get an emblem with "{1}{B}, Sacrifice a creature: You gain X life and draw X cards, where X is the sacrificed creature's power."
+A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem Ob Nixilis of the Black Oath | Image$ emblem_ob_nixilis_of_the_black_oath | Stackable$ False | Abilities$ ObGainLife | SVars$ DBDraw,X | Duration$ Permanent | SpellDescription$ You get an emblem with "{1}{B}, Sacrifice a creature: You gain X life and draw X cards, where X is the sacrificed creature's power."
 SVar:ObGainLife:AB$ GainLife | Cost$ 1 B Sac<1/Creature> | ActivationZone$ Command | LifeAmount$ X | References$ X | SubAbility$ DBDraw | SpellDescription$ You gain X life and draw X cards, where X is the sacrificed creature's power.
 SVar:DBDraw:DB$ Draw | NumCards$ X | References$ X
 SVar:X:Sacrificed$CardPower
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ob_nixilis_of_the_black_oath.jpg
-Oracle:[+2] Each opponent loses 1 life. You gain life equal to the life lost this way.\n[-2] Create a 5/5 black Demon creature token with flying. You lose 2 life.\n[-8] You get an emblem with "{1}{B}, Sacrifice a creature: You gain X life and draw X cards, where X is the sacrificed creature's power."\nOb Nixilis of the Black Oath can be your commander.
+Oracle:[+2]: Each opponent loses 1 life. You gain life equal to the life lost this way.\n[-2]: Create a 5/5 black Demon creature token with flying. You lose 2 life.\n[-8]: You get an emblem with "{1}{B}, Sacrifice a creature: You gain X life and draw X cards, where X is the sacrificed creature's power."\nOb Nixilis of the Black Oath can be your commander.
diff --git a/forge-gui/res/cardsfolder/o/ob_nixilis_reignited.txt b/forge-gui/res/cardsfolder/o/ob_nixilis_reignited.txt
index 11562658d4e..996fac330d1 100644
--- a/forge-gui/res/cardsfolder/o/ob_nixilis_reignited.txt
+++ b/forge-gui/res/cardsfolder/o/ob_nixilis_reignited.txt
@@ -5,8 +5,8 @@ Loyalty:5
 A:AB$ Draw | Cost$ AddCounter<1/LOYALTY> | NumCards$ 1 | SubAbility$ DBLoseLife1 | Planeswalker$ True | SpellDescription$ You draw a card and you lose 1 life.
 SVar:DBLoseLife1:DB$ LoseLife | LifeAmount$ 1
 A:AB$ Destroy | Cost$ SubCounter<3/LOYALTY> | ValidTgts$ Creature | TgtPrompt$ Choose target creature | Planeswalker$ True | SpellDescription$ Destroy target creature.
-A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | ValidTgts$ Opponent | EffectOwner$ Targeted | Planeswalker$ True | Ultimate$ True | Name$ Ob Nixilis Reignited emblem | Image$ ob_nixilis_reignited_emblem | Triggers$ TrigDraw | SVars$ DBLoseLife | Duration$ Permanent | AILogic$ Always | SpellDescription$ Target opponent gets an emblem with "Whenever a player draws a card, you lose 2 life."
+A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | ValidTgts$ Opponent | EffectOwner$ Targeted | Planeswalker$ True | Ultimate$ True | Name$ Emblem Ob Nixilis Reignited | Image$ emblem_ob_nixilis_reignited | Triggers$ TrigDraw | SVars$ DBLoseLife | Duration$ Permanent | AILogic$ Always | SpellDescription$ Target opponent gets an emblem with "Whenever a player draws a card, you lose 2 life."
 SVar:TrigDraw:Mode$ Drawn | ValidCard$ Card | TriggerZones$ Command | Execute$ DBLoseLife | TriggerDescription$ Whenever a player draws a card, you lose 2 life.
 SVar:DBLoseLife:AB$ LoseLife | Cost$ 0 | LifeAmount$ 2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ob_nixilis_reignited.jpg
-Oracle:[+1] You draw a card and you lose 1 life.\n[-3] Destroy target creature.\n[-8] Target opponent gets an emblem with "Whenever a player draws a card, you lose 2 life."
\ No newline at end of file
+Oracle:[+1]: You draw a card and you lose 1 life.\n[-3]: Destroy target creature.\n[-8]: Target opponent gets an emblem with "Whenever a player draws a card, you lose 2 life."
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/sarkhan_the_dragonspeaker.txt b/forge-gui/res/cardsfolder/s/sarkhan_the_dragonspeaker.txt
index 6a44f498656..29853953d46 100644
--- a/forge-gui/res/cardsfolder/s/sarkhan_the_dragonspeaker.txt
+++ b/forge-gui/res/cardsfolder/s/sarkhan_the_dragonspeaker.txt
@@ -4,11 +4,11 @@ Types:Legendary Planeswalker Sarkhan
 Loyalty:4
 A:AB$ Animate | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Power$ 4 | Toughness$ 4 | Types$ Creature,Legendary,Dragon | Colors$ Red | OverwriteColors$ True | OverwriteTypes$ True | KeepSupertypes$ True | Keywords$ Flying & Indestructible & Haste | SpellDescription$ Until end of turn, CARDNAME becomes a legendary 4/4 red Dragon creature with flying, indestructible, and haste. (He doesn't lose loyalty while he's not a planeswalker.)
 A:AB$ DealDamage | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature.
-A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Sarkhan, the Dragonspeaker emblem | Triggers$ BODTrig,EOTTrig | SVars$ SarkhanDraw,SarkhanDiscard | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "At the beginning of your draw step, draw two additional cards" and "At the beginning of your end step, discard your hand."
+A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem Sarkhan, the Dragonspeaker  | Triggers$ BODTrig,EOTTrig | SVars$ SarkhanDraw,SarkhanDiscard | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "At the beginning of your draw step, draw two additional cards" and "At the beginning of your end step, discard your hand."
 SVar:BODTrig:Mode$ Phase | Phase$ Draw | ValidPlayer$ You | TriggerZones$ Command | Execute$ SarkhanDraw | TriggerDescription$ At the beginning of your draw step, draw two additional cards.
 SVar:SarkhanDraw:AB$ Draw | Cost$ 0 | NumCards$ 2 | Defined$ You
 SVar:EOTTrig:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Command | Execute$ SarkhanDiscard | TriggerDescription$ At the beginning of your end step, discard your hand.
 SVar:SarkhanDiscard:AB$ Discard | Cost$ 0 | Mode$ Hand
 SVar:PlayMain1:ALWAYS
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sarkhan_the_dragonspeaker.jpg
-Oracle:[+1] Until end of turn, Sarkhan, the Dragonspeaker becomes a legendary 4/4 red Dragon creature with flying, indestructible, and haste. (He doesn't lose loyalty while he's not a planeswalker.)\n[-3] Sarkhan, the Dragonspeaker deals 4 damage to target creature.\n[-6] You get an emblem with "At the beginning of your draw step, draw two additional cards" and "At the beginning of your end step, discard your hand."
+Oracle:[+1]: Until end of turn, Sarkhan, the Dragonspeaker becomes a legendary 4/4 red Dragon creature with flying, indestructible, and haste. (He doesn't lose loyalty while he's not a planeswalker.)\n[-3]: Sarkhan, the Dragonspeaker deals 4 damage to target creature.\n[-6]: You get an emblem with "At the beginning of your draw step, draw two additional cards" and "At the beginning of your end step, discard your hand."
diff --git a/forge-gui/res/cardsfolder/s/sorin_lord_of_innistrad.txt b/forge-gui/res/cardsfolder/s/sorin_lord_of_innistrad.txt
index 9d58e2cde0c..ea0ca35cb09 100644
--- a/forge-gui/res/cardsfolder/s/sorin_lord_of_innistrad.txt
+++ b/forge-gui/res/cardsfolder/s/sorin_lord_of_innistrad.txt
@@ -3,10 +3,10 @@ ManaCost:2 W B
 Types:Legendary Planeswalker Sorin
 Loyalty:3
 A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | TokenAmount$ 1 | TokenName$ Vampire | TokenColors$ Black | TokenTypes$ Creature,Vampire | TokenOwner$ You | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Lifelink | Planeswalker$ True | SpellDescription$ Create a 1/1 black Vampire creature token with lifelink.
-A:AB$ Effect | Cost$ SubCounter<2/LOYALTY> | Name$ Sorin, Lord of Innistrad emblem | Image$ sorin_lord_of_innistrad_emblem | StaticAbilities$ STPump | Planeswalker$ True | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Creatures you control get +1/+0."
+A:AB$ Effect | Cost$ SubCounter<2/LOYALTY> | Name$ Emblem Sorin, Lord of Innistrad  | Image$ emblem_sorin_lord_of_innistrad | StaticAbilities$ STPump | Planeswalker$ True | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Creatures you control get +1/+0."
 SVar:STPump:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.YouCtrl | AddPower$ 1
 A:AB$ Destroy | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidTgts$ Creature,Planeswalker.Other | TargetMin$ 0 | TargetMax$ 3 | TgtPrompt$ Select target creatures or other planeswalkers | RememberTargets$ True | ForgetOtherTargets$ True | SubAbility$ DBChangeZoneAll | SpellDescription$ Destroy up to 3 target creatures and/or other planeswalkers. Return each card put into a graveyard this way to the battlefield under your control.
 SVar:DBChangeZoneAll:DB$ ChangeZoneAll | Cost$ 0 | ChangeType$ Card.IsRemembered | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sorin_lord_of_innistrad.jpg
-Oracle:[+1] Create a 1/1 black Vampire creature token with lifelink.\n[-2] You get an emblem with "Creatures you control get +1/+0."\n[-6] Destroy up to three target creatures and/or other planeswalkers. Return each card put into a graveyard this way to the battlefield under your control.
+Oracle:[+1]: Create a 1/1 black Vampire creature token with lifelink.\n[-2]: You get an emblem with "Creatures you control get +1/+0."\n[-6]: Destroy up to three target creatures and/or other planeswalkers. Return each card put into a graveyard this way to the battlefield under your control.
diff --git a/forge-gui/res/cardsfolder/s/sorin_solemn_visitor.txt b/forge-gui/res/cardsfolder/s/sorin_solemn_visitor.txt
index da57b449df6..06f926eac64 100644
--- a/forge-gui/res/cardsfolder/s/sorin_solemn_visitor.txt
+++ b/forge-gui/res/cardsfolder/s/sorin_solemn_visitor.txt
@@ -4,9 +4,9 @@ Types:Legendary Planeswalker Sorin
 Loyalty:4
 A:AB$ PumpAll | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | KW$ Lifelink | UntilYourNextTurn$ True | SpellDescription$ Until your next turn, creatures you control get +1/+0 and gain lifelink.
 A:AB$ Token | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenImage$ b 2 2 vampire KTK | TokenOwner$ You | TokenName$ Vampire | TokenColors$ Black | TokenTypes$ Creature,Vampire | TokenPower$ 2 | TokenToughness$ 2 | TokenKeywords$ Flying | SpellDescription$ Create a 2/2 black Vampire creature token with flying.
-A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Sorin, Solemn Visitor emblem | Triggers$ BOTTrig | SVars$ SorinSac | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "At the beginning of each opponent's upkeep, that player sacrifices a creature."
+A:AB$ Effect | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem Sorin, Solemn Visitor | Triggers$ BOTTrig | SVars$ SorinSac | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "At the beginning of each opponent's upkeep, that player sacrifices a creature."
 SVar:BOTTrig:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player.Opponent | TriggerZones$ Command | Execute$ SorinSac | TriggerDescription$ At the beginning of each opponent's upkeep, that player sacrifices a creature.
 SVar:SorinSac:AB$ Sacrifice | Cost$ 0 | SacValid$ Creature | Defined$ TriggeredPlayer
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sorin_solemn_visitor.jpg
-Oracle:[+1] Until your next turn, creatures you control get +1/+0 and gain lifelink.\n[-2] Create a 2/2 black Vampire creature token with flying.\n[-6] You get an emblem with "At the beginning of each opponent's upkeep, that player sacrifices a creature."
+Oracle:[+1]: Until your next turn, creatures you control get +1/+0 and gain lifelink.\n[-2]: Create a 2/2 black Vampire creature token with flying.\n[-6]: You get an emblem with "At the beginning of each opponent's upkeep, that player sacrifices a creature."
diff --git a/forge-gui/res/cardsfolder/t/tamiyo_field_researcher.txt b/forge-gui/res/cardsfolder/t/tamiyo_field_researcher.txt
index b68108c54dd..27a9cd1e5a5 100644
--- a/forge-gui/res/cardsfolder/t/tamiyo_field_researcher.txt
+++ b/forge-gui/res/cardsfolder/t/tamiyo_field_researcher.txt
@@ -9,8 +9,8 @@ SVar:TrigChange:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Sta
 SVar:TrigForget:AB$ Pump | Cost$ 0 | ForgetObjects$ TriggeredCard
 A:AB$ Tap | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ValidTgts$ Permanent.nonLand | TargetMin$ 0 | TargetMax$ 2 | TgtPrompt$ Select target nonland permanent | SubAbility$ DBPump | SpellDescription$ Tap up to two target nonland permanents. They don’t untap during their controller's next untap step.
 SVar:DBPump:DB$ Pump | Defined$ Targeted | Permanent$ True | KW$ HIDDEN This card doesn't untap during your next untap step.
-A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Tamiyo, Field Researcher emblem | Image$ tamiyo_field_researcher_emblem | StaticAbilities$ Omniscience | Stackable$ False | Duration$ Permanent | AILogic$ Always | SubAbility$ DBDraw | SpellDescription$ Draw three cards. You get an emblem with "You may cast spells from your hand without paying their mana costs."
+A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem Tamiyo, Field Researcher  | Image$ emblem_tamiyo_field_researcher | StaticAbilities$ Omniscience | Stackable$ False | Duration$ Permanent | AILogic$ Always | SubAbility$ DBDraw | SpellDescription$ Draw three cards. You get an emblem with "You may cast spells from your hand without paying their mana costs."
 SVar:Omniscience:Mode$ Continuous | EffectZone$ Command | Affected$ Card.nonLand+YouOwn | MayPlay$ True | MayPlayWithoutManaCost$ True | AffectedZone$ Hand | Description$ You may cast spells from your hand without paying their mana costs.
 SVar:DBDraw:DB$Draw | NumCards$ 3
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tamiyo_field_researcher.jpg
-Oracle:[+1] Choose up to two target creatures. Until your next turn, whenever either of those creatures deals combat damage, you draw a card.\n[-2] Tap up to two target nonland permanents. They don't untap during their controller's next untap step.\n[-7] Draw three cards. You get an emblem with "You may cast spells from your hand without paying their mana costs."
+Oracle:[+1]: Choose up to two target creatures. Until your next turn, whenever either of those creatures deals combat damage, you draw a card.\n[-2]: Tap up to two target nonland permanents. They don't untap during their controller's next untap step.\n[-7]: Draw three cards. You get an emblem with "You may cast spells from your hand without paying their mana costs."
diff --git a/forge-gui/res/cardsfolder/t/teferi_temporal_archmage.txt b/forge-gui/res/cardsfolder/t/teferi_temporal_archmage.txt
index c68fd355d48..a113c18b6d4 100644
--- a/forge-gui/res/cardsfolder/t/teferi_temporal_archmage.txt
+++ b/forge-gui/res/cardsfolder/t/teferi_temporal_archmage.txt
@@ -5,7 +5,7 @@ Loyalty:5
 Text:CARDNAME can be your commander.
 A:AB$ Dig | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | DigNum$ 2 | SpellDescription$ Look at the top two cards of your library. Put one of them into your hand and the other on the bottom of your library.
 A:AB$ Untap | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Permanent | TargetMin$ 0 | TargetMax$ 4 | SpellDescription$ Untap up to four target permanents.
-A:AB$ Effect | Cost$ SubCounter<10/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Teferi, Temporal Archmage emblem | Image$ teferi_temporal_archmage_emblem | StaticAbilities$ InstantPlaneswalkers | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "You may activate loyalty abilities of planeswalkers you control on any player's turn any time you could cast an instant."
+A:AB$ Effect | Cost$ SubCounter<10/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem Teferi, Temporal Archmage | Image$ emblem_teferi_temporal_archmage | StaticAbilities$ InstantPlaneswalkers | Stackable$ False | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "You may activate loyalty abilities of planeswalkers you control on any player's turn any time you could cast an instant."
 SVar:InstantPlaneswalkers:Mode$ Continuous | EffectZone$ Command | Affected$ Planeswalker.YouCtrl | AddHiddenKeyword$ CARDNAME's loyalty abilities can be activated at instant speed. | Description$ You may activate loyalty abilities of planeswalkers you control on any player's turn any time you could cast an instant.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/teferi_temporal_archmage.jpg
-Oracle:[+1] Look at the top two cards of your library. Put one of them into your hand and the other on the bottom of your library.\n[-1] Untap up to four target permanents.\n[-10] You get an emblem with "You may activate loyalty abilities of planeswalkers you control on any player's turn any time you could cast an instant."\nTeferi, Temporal Archmage can be your commander.
+Oracle:[+1]: Look at the top two cards of your library. Put one of them into your hand and the other on the bottom of your library.\n[-1]: Untap up to four target permanents.\n[-10]: You get an emblem with "You may activate loyalty abilities of planeswalkers you control on any player's turn any time you could cast an instant."\nTeferi, Temporal Archmage can be your commander.
diff --git a/forge-gui/res/cardsfolder/t/tezzeret_the_schemer.txt b/forge-gui/res/cardsfolder/t/tezzeret_the_schemer.txt
index 0ff9fb6239b..bec42560aaf 100644
--- a/forge-gui/res/cardsfolder/t/tezzeret_the_schemer.txt
+++ b/forge-gui/res/cardsfolder/t/tezzeret_the_schemer.txt
@@ -6,7 +6,7 @@ A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | TokenAmount$ 1
 SVar:ABMana:AB$ Mana | Cost$ T Sac<1/CARDNAME> | Produced$ Any | SpellDescription$ Add one mana of any color to your mana pool.
 A:AB$ Pump | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +X | NumDef$ -X | References$ X | SpellDescription$ Target creature gets +X/-X until end of turn, where X is the number of artifacts you control.
 SVar:X:Count$Valid Artifact.YouCtrl
-A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Tezzeret the Schemer emblem | Triggers$ CombatTrig | SVars$ TezzeretAnimate | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "At the beginning of combat on your turn, target artifact you control becomes an artifact creature with base power and toughness 5/5."
+A:AB$ Effect | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem Tezzeret the Schemer  | Triggers$ CombatTrig | SVars$ TezzeretAnimate | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "At the beginning of combat on your turn, target artifact you control becomes an artifact creature with base power and toughness 5/5."
 
 SVar:CombatTrig:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Command | Execute$ TezzeretAnimate | TriggerDescription$ At the beginning of combat on your turn, target artifact you control becomes an artifact creature with base power and toughness 5/5.
 
diff --git a/forge-gui/res/cardsfolder/v/venser_the_sojourner.txt b/forge-gui/res/cardsfolder/v/venser_the_sojourner.txt
index aef5cbed74b..c9478cc5efd 100644
--- a/forge-gui/res/cardsfolder/v/venser_the_sojourner.txt
+++ b/forge-gui/res/cardsfolder/v/venser_the_sojourner.txt
@@ -8,9 +8,9 @@ SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defi
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 A:AB$ Effect | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | Name$ Venser, the Sojourner Effect | StaticAbilities$ KWPump | SpellDescription$ Creatures can't be blocked this turn.
 SVar:KWPump:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature | AddHiddenKeyword$ Unblockable | Description$ creatures can't be blocked this turn.
-A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Venser, the Sojourner emblem | Image$ venser_the_sojourner_emblem | Triggers$ TrigSpellCast | SVars$ EffSpellCast | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever you cast a spell, exile target permanent."
+A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem Venser, the Sojourner | Image$ emblem_venser_the_sojourner | Triggers$ TrigSpellCast | SVars$ EffSpellCast | Duration$ Permanent | AILogic$ Always | SpellDescription$ You get an emblem with "Whenever you cast a spell, exile target permanent."
 SVar:TrigSpellCast:Mode$ SpellCast | ValidActivatingPlayer$ You | Execute$ EffSpellCast | TriggerDescription$ Whenever you cast a spell, exile target permanent.
 SVar:EffSpellCast:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/venser_the_sojourner.jpg
-Oracle:[+2] Exile target permanent you own. Return it to the battlefield under your control at the beginning of the next end step.\n[-1] Creatures can't be blocked this turn.\n[-8] You get an emblem with "Whenever you cast a spell, exile target permanent."
+Oracle:[+2]: Exile target permanent you own. Return it to the battlefield under your control at the beginning of the next end step.\n[-1]: Creatures can't be blocked this turn.\n[-8]: You get an emblem with "Whenever you cast a spell, exile target permanent."
diff --git a/forge-gui/res/lists/token-images.txt b/forge-gui/res/lists/token-images.txt
index ffc969f66b9..cd66b6b6f5d 100644
--- a/forge-gui/res/lists/token-images.txt
+++ b/forge-gui/res/lists/token-images.txt
@@ -357,19 +357,19 @@ wu_1_1_bird.jpg                        https://downloads.cardforge.org/images/to
 
 # Emblems
 chandra_the_firebrand_effect.jpg       https://downloads.cardforge.org/images/tokens/chandra_the_firebrand_effect.jpg
-domri_rade_emblem.jpg                  https://downloads.cardforge.org/images/tokens/domri_rade_emblem.jpg
-elspeth_knight_errant_emblem.jpg       https://downloads.cardforge.org/images/tokens/elspeth_knight_errant_emblem.jpg
-elspeth_suns_champion_emblem.jpg       https://downloads.cardforge.org/images/tokens/elspeth_suns_champion_emblem.jpg
-garruk_caller_of_beasts_emblem.jpg     https://downloads.cardforge.org/images/tokens/garruk_caller_of_beasts_emblem.jpg
-gideon_ally_of_zendikar_emblem.jpg     https://downloads.cardforge.org/images/tokens/gideon_ally_of_zendikar_emblem.jpg
-kiora_master_of_the_depths_emblem.jpg  https://downloads.cardforge.org/images/tokens/kiora_master_of_the_depths_emblem.jpg
-kiora_the_crashing_wave_emblem.jpg     https://downloads.cardforge.org/images/tokens/kiora_the_crashing_wave_emblem.jpg
-koth_of_the_hammer_emblem.jpg          https://downloads.cardforge.org/images/tokens/koth_of_the_hammer_emblem.jpg
-liliana_of_the_dark_realms_emblem.jpg  https://downloads.cardforge.org/images/tokens/liliana_of_the_dark_realms_emblem.jpg
-ob_nixilis_reignited_emblem.jpg        https://downloads.cardforge.org/images/tokens/ob_nixilis_reignited_emblem.jpg
-sorin_lord_of_innistrad_emblem.jpg     https://downloads.cardforge.org/images/tokens/sorin_lord_of_innistrad_emblem.jpg
-tamiyo_the_moon_sage_emblem.jpg        https://downloads.cardforge.org/images/tokens/tamiyo_the_moon_sage_emblem.jpg
-venser_the_sojourner_emblem.jpg        https://downloads.cardforge.org/images/tokens/venser_the_sojourner_emblem.jpg
+emblem_domri_rade.jpg                  https://downloads.cardforge.org/images/tokens/domri_rade_emblem.jpg
+emblem_elspeth_knight_errant.jpg       https://downloads.cardforge.org/images/tokens/elspeth_knight_errant_emblem.jpg
+emblem_elspeth_suns_champion.jpg       https://downloads.cardforge.org/images/tokens/elspeth_suns_champion_emblem.jpg
+emblem_garruk_caller_of.jpg     https://downloads.cardforge.org/images/tokens/garruk_caller_of_beasts_emblem.jpg
+emblem_gideon_ally_of_zendikar.jpg     https://downloads.cardforge.org/images/tokens/gideon_ally_of_zendikar_emblem.jpg
+emblem_kiora_master_of_the_depths.jpg  https://downloads.cardforge.org/images/tokens/kiora_master_of_the_depths_emblem.jpg
+emblem_kiora_the_crashing_wave.jpg     https://downloads.cardforge.org/images/tokens/kiora_the_crashing_wave_emblem.jpg
+emblem_koth_of_the_hammer.jpg          https://downloads.cardforge.org/images/tokens/koth_of_the_hammer_emblem.jpg
+emblem_liliana_of_the_dark_realms.jpg  https://downloads.cardforge.org/images/tokens/liliana_of_the_dark_realms_emblem.jpg
+emblem_ob_nixilis_reignited.jpg        https://downloads.cardforge.org/images/tokens/ob_nixilis_reignited_emblem.jpg
+emblem_sorin_lord_of_innistrad.jpg     https://downloads.cardforge.org/images/tokens/sorin_lord_of_innistrad_emblem.jpg
+emblem_tamiyo_the_moon_sage.jpg        https://downloads.cardforge.org/images/tokens/tamiyo_the_moon_sage_emblem.jpg
+emblem_venser_the_sojourner.jpg        https://downloads.cardforge.org/images/tokens/venser_the_sojourner_emblem.jpg
 
 # Other
 hidden.jpg                             https://downloads.cardforge.org/images/tokens/morph.jpg