diff --git a/projects/mtg/bin/Res/missing_cards_by_sets/BOK.txt b/projects/mtg/bin/Res/missing_cards_by_sets/BOK.txt
new file mode 100644
index 000000000..938b89351
--- /dev/null
+++ b/projects/mtg/bin/Res/missing_cards_by_sets/BOK.txt
@@ -0,0 +1,213 @@
+[card]
+name=Chisei, Heart of Oceans
+text=Flying -- At the beginning of your upkeep, sacrifice Chisei, Heart of Oceans unless you remove a counter from a permanent you control.
+mana={2}{U}{U}
+type=Legendary Creature
+subtype=Spirit
+power=4
+toughness=4
+[/card]
+[card]
+name=Disrupting Shoal
+text=You may exile a blue card with converted mana cost X from your hand rather than pay Disrupting Shoal's mana cost. -- Counter target spell if its converted mana cost is X.
+mana={X}{U}{U}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Flames of the Blood Hand
+text=Flames of the Blood Hand deals 4 damage to target player. The damage can't be prevented. If that player would gain life this turn, that player gains no life instead.
+mana={2}{R}
+type=Instant
+[/card]
+[card]
+name=Goryo's Vengeance
+text=Return target legendary creature card from your graveyard to the battlefield. That creature gains haste. Exile it at the beginning of the next end step. -- Splice onto Arcane {2}{B} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={1}{B}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Horobi's Whisper
+text=If you control a Swamp, destroy target nonblack creature. -- Splice onto Arcane—Exile four cards from your graveyard. (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={1}{B}{B}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Hundred-Talon Strike
+text=Target creature gets +1/+0 and gains first strike until end of turn. -- Splice onto Arcane—Tap an untapped white creature you control. (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={W}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Jetting Glasskite
+text=Flying -- Whenever Jetting Glasskite becomes the target of a spell or ability for the first time in a turn, counter that spell or ability.
+mana={4}{U}{U}
+type=Creature
+subtype=Spirit
+power=4
+toughness=4
+[/card]
+[card]
+name=Kentaro, the Smiling Cat
+text=Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.) -- You may pay {X} rather than pay the mana cost for Samurai spells you cast, where X is that spell's converted mana cost.
+mana={1}{W}
+type=Legendary Creature
+subtype=Human Samurai
+power=2
+toughness=1
+[/card]
+[card]
+name=Kira, Great Glass-Spinner
+text=Flying -- Creatures you control have "Whenever this creature becomes the target of a spell or ability for the first time in a turn, counter that spell or ability."
+mana={1}{U}{U}
+type=Legendary Creature
+subtype=Spirit
+power=2
+toughness=2
+[/card]
+[card]
+name=Kodama of the Center Tree
+text=Kodama of the Center Tree's power and toughness are each equal to the number of Spirits you control. -- Kodama of the Center Tree has soulshift X, where X is the number of Spirits you control. (When this creature dies, you may return target Spirit card with converted mana cost X or less from your graveyard to your hand.)
+mana={4}{G}
+type=Legendary Creature
+subtype=Spirit
+power=*
+toughness=*
+[/card]
+[card]
+name=Kumano's Blessing
+text=Flash -- Enchant creature -- If a creature dealt damage by enchanted creature this turn would die, exile it instead.
+mana={2}{R}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
+name=Minamo's Meddling
+text=Counter target spell. That spell's controller reveals his or her hand, then discards each card with the same name as a card spliced onto that spell.
+mana={2}{U}{U}
+type=Instant
+[/card]
+[card]
+name=Neko-Te
+text=Whenever equipped creature deals damage to a creature, tap that creature. That creature doesn't untap during its controller's untap step for as long as Neko-Te remains on the battlefield. -- Whenever equipped creature deals damage to a player, that player loses 1 life. -- Equip {2}
+mana={3}
+type=Artifact
+subtype=Equipment
+[/card]
+[card]
+name=Ogre Marauder
+text=Whenever Ogre Marauder attacks, it gains "Ogre Marauder is unblockable" until end of turn unless defending player sacrifices a creature.
+mana={1}{B}{B}
+type=Creature
+subtype=Ogre Warrior
+power=3
+toughness=1
+[/card]
+[card]
+name=Opal-Eye, Konda's Yojimbo
+text=Defender (This creature can't attack.) -- Bushido 1 (When this blocks or becomes blocked, it gets +1/+1 until end of turn.) -- {T}: The next time a source of your choice would deal damage this turn, that damage is dealt to Opal-Eye, Konda's Yojimbo instead. -- {1}{W}: Prevent the next 1 damage that would be dealt to Opal-Eye this turn.
+mana={1}{W}{W}
+type=Legendary Creature
+subtype=Fox Samurai
+power=1
+toughness=4
+[/card]
+[card]
+name=Ornate Kanzashi
+text={2}, {T}: Target opponent exiles the top card of his or her library. You may play that card this turn.
+mana={5}
+type=Artifact
+[/card]
+[card]
+name=Overblaze
+text=Each time target permanent would deal damage to a creature or player this turn, it deals double that damage to that creature or player instead. -- Splice onto Arcane {2}{R}{R} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={3}{R}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Petalmane Baku
+text=Whenever you cast a Spirit or Arcane spell, you may put a ki counter on Petalmane Baku. -- {1}, Remove X ki counters from Petalmane Baku: Add X mana of any one color to your mana pool.
+mana={1}{G}
+type=Creature
+subtype=Spirit
+power=1
+toughness=2
+[/card]
+[card]
+name=Roar of Jukai
+text=If you control a Forest, each blocked creature gets +2/+2 until end of turn. -- Splice onto Arcane—An opponent gains 5 life. (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={2}{G}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Shimmering Glasskite
+text=Flying -- Whenever Shimmering Glasskite becomes the target of a spell or ability for the first time in a turn, counter that spell or ability.
+mana={3}{U}
+type=Creature
+subtype=Spirit
+power=2
+toughness=3
+[/card]
+[card]
+name=Shining Shoal
+text=You may exile a white card with converted mana cost X from your hand rather than pay Shining Shoal's mana cost. -- The next X damage that a source of your choice would deal to you and/or creatures you control this turn is dealt to target creature or player instead.
+mana={X}{W}{W}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Shirei, Shizo's Caretaker
+text=Whenever a creature with power 1 or less is put into your graveyard from the battlefield, you may return that card to the battlefield under your control at the beginning of the next end step if Shirei, Shizo's Caretaker is still on the battlefield.
+mana={4}{B}
+type=Legendary Creature
+subtype=Spirit
+power=2
+toughness=2
+[/card]
+[card]
+name=Shuriken
+text=Equipped creature has "{T}, Unattach Shuriken: Shuriken deals 2 damage to target creature. That creature's controller gains control of Shuriken unless it was unattached from a Ninja." -- Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
+mana={1}
+type=Artifact
+subtype=Equipment
+[/card]
+[card]
+name=Toils of Night and Day
+text=You may tap or untap target permanent, then you may tap or untap another target permanent.
+mana={2}{U}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Torrent of Stone
+text=Torrent of Stone deals 4 damage to target creature. -- Splice onto Arcane—Sacrifice two Mountains. (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={3}{R}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Veil of Secrecy
+text=Target creature gains shroud until end of turn and is unblockable this turn. -- Splice onto Arcane—Return a blue creature you control to its owner's hand. (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={1}{U}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Vital Surge
+text=You gain 3 life. -- Splice onto Arcane {1}{G} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={1}{G}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Ward of Piety
+text=Enchant creature -- {1}{W}: The next 1 damage that would be dealt to enchanted creature this turn is dealt to target creature or player instead.
+mana={1}{W}
+type=Enchantment
+subtype=Aura
+[/card]
diff --git a/projects/mtg/bin/Res/missing_cards_by_sets/CHK.txt b/projects/mtg/bin/Res/missing_cards_by_sets/CHK.txt
new file mode 100644
index 000000000..f50ccb00f
--- /dev/null
+++ b/projects/mtg/bin/Res/missing_cards_by_sets/CHK.txt
@@ -0,0 +1,301 @@
+[card]
+name=Akki Lavarunner
+text=Haste -- Whenever Akki Lavarunner deals damage to an opponent, flip it. --  -- ——— --  -- Tok-Tok, Volcano Born -- Legendary Creature — Goblin Shaman --  -- Protection from red -- If a red source would deal damage to a player, it deals that much damage plus 1 to that player instead. -- 2/2
+mana={3}{R}
+type=Creature
+subtype=Goblin Warrior
+power=1
+toughness=1
+[/card]
+[card]
+name=Blessed Breath
+text=Target creature you control gains protection from the color of your choice until end of turn. -- Splice onto Arcane {W} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={W}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Boseiju, Who Shelters All
+text=Boseiju, Who Shelters All enters the battlefield tapped. -- {T}, Pay 2 life: Add {1} to your mana pool. If that mana is spent on an instant or sorcery spell, that spell can't be countered by spells or abilities.
+type=Legendary Land
+[/card]
+[card]
+name=Candles' Glow
+text=Prevent the next 3 damage that would be dealt to target creature or player this turn. You gain life equal to the damage prevented this way. -- Splice onto Arcane {1}{W} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={1}{W}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Consuming Vortex
+text=Return target creature to its owner's hand. -- Splice onto Arcane {3}{U} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={1}{U}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Cranial Extraction
+text=Name a nonland card. Search target player's graveyard, hand, and library for all cards with that name and exile them. Then that player shuffles his or her library.
+mana={3}{B}
+type=Sorcery
+subtype=Arcane
+[/card]
+[card]
+name=Dampen Thought
+text=Target player puts the top four cards of his or her library into his or her graveyard. -- Splice onto Arcane {1}{U} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={1}{U}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Desperate Ritual
+text=Add {R}{R}{R} to your mana pool. -- Splice onto Arcane {1}{R} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={1}{R}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Devouring Rage
+text=As an additional cost to cast Devouring Rage, you may sacrifice any number of Spirits. -- Target creature gets +3/+0 until end of turn. For each Spirit sacrificed this way, that creature gets an additional +3/+0 until end of turn.
+mana={4}{R}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Gifts Ungiven
+text=Search your library for four cards with different names and reveal them. Target opponent chooses two of those cards. Put the chosen cards into your graveyard and the rest into your hand. Then shuffle your library.
+mana={3}{U}
+type=Instant
+[/card]
+[card]
+name=Glacial Ray
+text=Glacial Ray deals 2 damage to target creature or player. -- Splice onto Arcane {1}{R} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={1}{R}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Hall of the Bandit Lord
+text=Hall of the Bandit Lord enters the battlefield tapped. -- {T}, Pay 3 life: Add {1} to your mana pool. If that mana is spent on a creature spell, it gains haste.
+type=Legendary Land
+[/card]
+[card]
+name=Hankyu
+text=Equipped creature has "{T}: Put an aim counter on Hankyu" and "{T}, Remove all aim counters from Hankyu: This creature deals damage to target creature or player equal to the number of aim counters removed this way." -- Equip {4} ({4}: Attach to target creature you control. Equip only as a sorcery.)
+mana={1}
+type=Artifact
+subtype=Equipment
+[/card]
+[card]
+name=Hideous Laughter
+text=All creatures get -2/-2 until end of turn. -- Splice onto Arcane {3}{B}{B} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={2}{B}{B}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Hinder
+text=Counter target spell. If that spell is countered this way, put that card on the top or bottom of its owner's library instead of into that player's graveyard.
+mana={1}{U}{U}
+type=Instant
+[/card]
+[card]
+name=Imi Statue
+text=Players can't untap more than one artifact during their untap steps.
+mana={3}
+type=Artifact
+[/card]
+[card]
+name=Initiate of Blood
+text={T}: Initiate of Blood deals 1 damage to target creature that was dealt damage this turn. When that creature dies this turn, flip Initiate of Blood. --  -- ——— --  -- Goka the Unjust -- Legendary Creature — Ogre Shaman --  -- {T}: Goka the Unjust deals 4 damage to target creature that was dealt damage this turn. -- 4/4
+mana={3}{R}
+type=Creature
+subtype=Ogre Shaman
+power=2
+toughness=2
+[/card]
+[card]
+name=Kitsune Mystic
+text=At the beginning of the end step, if Kitsune Mystic is enchanted by two or more Auras, flip it. --  -- ——— --  -- Autumn-Tail, Kitsune Sage -- Legendary Creature — Fox Wizard --  -- {1}: Attach target Aura attached to a creature to another creature. -- 4/5
+mana={3}{W}
+type=Creature
+subtype=Fox Wizard
+power=2
+toughness=3
+[/card]
+[card]
+name=Kodama's Might
+text=Target creature gets +2/+2 until end of turn. -- Splice onto Arcane {G} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={G}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Lifted by Clouds
+text=Target creature gains flying until end of turn. -- Splice onto Arcane {1}{U} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={2}{U}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Matsu-Tribe Decoy
+text={2}{G}: Target creature blocks Matsu-Tribe Decoy this turn if able. -- Whenever Matsu-Tribe Decoy deals combat damage to a creature, tap that creature and it doesn't untap during its controller's next untap step.
+mana={2}{G}
+type=Creature
+subtype=Snake Warrior
+power=1
+toughness=3
+[/card]
+[card]
+name=Mindblaze
+text=Name a nonland card and choose a number greater than 0. Target player reveals his or her library. If that library contains exactly the chosen number of the named card, Mindblaze deals 8 damage to that player. Then that player shuffles his or her library.
+mana={5}{R}
+type=Sorcery
+[/card]
+[card]
+name=Moonring Mirror
+text=Whenever you draw a card, exile the top card of your library face down. -- At the beginning of your upkeep, you may exile all cards from your hand face down. If you do, put all other cards you own exiled with Moonring Mirror into your hand.
+mana={5}
+type=Artifact
+[/card]
+[card]
+name=Oathkeeper, Takeno's Daisho
+text=Equipped creature gets +3/+1. -- Whenever equipped creature dies, return that card to the battlefield under your control if it's a Samurai card. -- When Oathkeeper, Takeno's Daisho is put into a graveyard from the battlefield, exile equipped creature. -- Equip {2}
+mana={3}
+type=Legendary Artifact
+subtype=Equipment
+[/card]
+[card]
+name=Psychic Puppetry
+text=You may tap or untap target permanent. -- Splice onto Arcane {U} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={1}{U}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Reverse the Sands
+text=Redistribute any number of players' life totals. (Each of those players gets one life total back.)
+mana={6}{W}{W}
+type=Sorcery
+[/card]
+[card]
+name=Reweave
+text=Target permanent's controller sacrifices it. If he or she does, that player reveals cards from the top of his or her library until he or she reveals a permanent card that shares a card type with the sacrificed permanent, puts that card onto the battlefield, then shuffles his or her library. -- Splice onto Arcane {2}{U}{U} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={5}{U}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Shell of the Last Kappa
+text={3}, {T}: Exile target instant or sorcery spell that targets you. (The spell has no effect.) -- {3}, {T}, Sacrifice Shell of the Last Kappa: You may cast a card exiled with Shell of the Last Kappa without paying its mana cost.
+mana={3}
+type=Legendary Artifact
+[/card]
+[card]
+name=Sideswipe
+text=You may change any targets of target Arcane spell.
+mana={1}{R}
+type=Instant
+[/card]
+[card]
+name=Soulless Revival
+text=Return target creature card from your graveyard to your hand. -- Splice onto Arcane {1}{B} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={1}{B}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Squelch
+text=Counter target activated ability. (Mana abilities can't be targeted.) -- Draw a card.
+mana={1}{U}
+type=Instant
+[/card]
+[card]
+name=Strange Inversion
+text=Switch target creature's power and toughness until end of turn. -- Splice onto Arcane {1}{R} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={2}{R}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Struggle for Sanity
+text=Target opponent reveals his or her hand. That player exiles a card from it, then you exile a card from it. Repeat this process until all cards in that hand have been exiled. That player returns the cards he or she exiled this way to his or her hand and puts the rest into his or her graveyard.
+mana={2}{B}{B}
+type=Sorcery
+[/card]
+[card]
+name=Swirl the Mists
+text=As Swirl the Mists enters the battlefield, choose a color word. -- All instances of color words in the text of spells and permanents are changed to the chosen color word.
+mana={2}{U}{U}
+type=Enchantment
+[/card]
+[card]
+name=Takeno, Samurai General
+text=Bushido 2 (When this blocks or becomes blocked, it gets +2/+2 until end of turn.) -- Each other Samurai creature you control gets +1/+1 for each point of bushido it has.
+mana={5}{W}
+type=Legendary Creature
+subtype=Human Samurai
+power=3
+toughness=3
+[/card]
+[card]
+name=Through the Breach
+text=You may put a creature card from your hand onto the battlefield. That creature gains haste. Sacrifice that creature at the beginning of the next end step. -- Splice onto Arcane {2}{R}{R} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={4}{R}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Tide of War
+text=Whenever one or more creatures block, flip a coin. If you win the flip, each blocking creature is sacrificed by its controller. If you lose the flip, each blocked creature is sacrificed by its controller.
+mana={4}{R}{R}
+type=Enchantment
+[/card]
+[card]
+name=Time Stop
+text=End the turn. (Exile all spells and abilities on the stack, including this card. The player whose turn it is discards down to his or her maximum hand size. Damage wears off, and "this turn" and "until end of turn" effects end.)
+mana={4}{U}{U}
+type=Instant
+[/card]
+[card]
+name=Uba Mask
+text=If a player would draw a card, that player exiles that card face up instead. -- Each player may play cards he or she exiled with Uba Mask this turn.
+mana={4}
+type=Artifact
+[/card]
+[card]
+name=Untaidake, the Cloud Keeper
+text=Untaidake, the Cloud Keeper enters the battlefield tapped. -- {T}, Pay 2 life: Add {2} to your mana pool. Spend this mana only to cast legendary spells.
+type=Legendary Land
+[/card]
+[card]
+name=Vassal's Duty
+text={1}: The next 1 damage that would be dealt to target legendary creature you control this turn is dealt to you instead.
+mana={3}{W}
+type=Enchantment
+[/card]
+[card]
+name=Wear Away
+text=Destroy target artifact or enchantment. -- Splice onto Arcane {3}{G} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={G}{G}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Wicked Akuba
+text={B}: Target player dealt damage by Wicked Akuba this turn loses 1 life.
+mana={B}{B}
+type=Creature
+subtype=Spirit
+power=2
+toughness=2
+[/card]
+[card]
+name=Yosei, the Morning Star
+text=Flying -- When Yosei, the Morning Star dies, target player skips his or her next untap step. Tap up to five target permanents that player controls.
+mana={4}{W}{W}
+type=Legendary Creature
+subtype=Dragon Spirit
+power=5
+toughness=5
+[/card]
diff --git a/projects/mtg/bin/Res/missing_cards_by_sets/SOK.txt b/projects/mtg/bin/Res/missing_cards_by_sets/SOK.txt
new file mode 100644
index 000000000..f69854fb5
--- /dev/null
+++ b/projects/mtg/bin/Res/missing_cards_by_sets/SOK.txt
@@ -0,0 +1,193 @@
+[card]
+name=Barrel Down Sokenzan
+text=Sweep — Return any number of Mountains you control to their owner's hand. Barrel Down Sokenzan deals damage to target creature equal to twice the number of Mountains returned this way.
+mana={2}{R}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Burning-Eye Zubera
+text=When Burning-Eye Zubera dies, if 4 or more damage was dealt to it this turn, Burning-Eye Zubera deals 3 damage to target creature or player.
+mana={2}{R}{R}
+type=Creature
+subtype=Zubera Spirit
+power=3
+toughness=3
+[/card]
+[card]
+name=Choice of Damnations
+text=Target opponent chooses a number. You may have that player lose that much life. If you don't, that player sacrifices all but that many permanents.
+mana={5}{B}
+type=Sorcery
+subtype=Arcane
+[/card]
+[card]
+name=Cowed by Wisdom
+text=Enchant creature -- Enchanted creature can't attack or block unless its controller pays {1} for each card in your hand.
+mana={W}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
+name=Curtain of Light
+text=Cast Curtain of Light only during combat after blockers are declared. -- Target unblocked attacking creature becomes blocked. (This spell works on unblockable creatures.) -- Draw a card.
+mana={1}{W}
+type=Instant
+[/card]
+[card]
+name=Evermind
+text=(Nonexistent mana costs can't be paid.) -- Draw a card. -- Splice onto Arcane {1}{U} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Godo's Irregulars
+text={R}: Godo's Irregulars deals 1 damage to target creature blocking it.
+mana={R}
+type=Creature
+subtype=Human Warrior
+power=1
+toughness=1
+[/card]
+[card]
+name=Hail of Arrows
+text=Hail of Arrows deals X damage divided as you choose among any number of target attacking creatures.
+mana={X}{W}
+type=Instant
+[/card]
+[card]
+name=Infernal Kirin
+text=Flying -- Whenever you cast a Spirit or Arcane spell, target player reveals his or her hand and discards all cards with that spell's converted mana cost.
+mana={2}{B}{B}
+type=Legendary Creature
+subtype=Kirin Spirit
+power=3
+toughness=3
+[/card]
+[card]
+name=Into the Fray
+text=Target creature attacks this turn if able. -- Splice onto Arcane {R} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={R}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Kaho, Minamo Historian
+text=When Kaho, Minamo Historian enters the battlefield, search your library for up to three instant cards and exile them. Then shuffle your library. -- {X}, {T}: You may cast a card with converted mana cost X exiled with Kaho without paying its mana cost.
+mana={2}{U}{U}
+type=Legendary Creature
+subtype=Human Wizard
+power=2
+toughness=2
+[/card]
+[card]
+name=Murmurs from Beyond
+text=Reveal the top three cards of your library. An opponent chooses one of them. Put that card into your graveyard and the rest into your hand.
+mana={2}{U}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Oppressive Will
+text=Counter target spell unless its controller pays {1} for each card in your hand.
+mana={2}{U}
+type=Instant
+[/card]
+[card]
+name=Pain's Reward
+text=Each player may bid life. You start the bidding with a bid of any number. In turn order, each player may top the high bid. The bidding ends if the high bid stands. The high bidder loses life equal to the high bid and draws four cards.
+mana={2}{B}
+type=Sorcery
+[/card]
+[card]
+name=Pithing Needle
+text=As Pithing Needle enters the battlefield, name a card. -- Activated abilities of sources with the chosen name can't be activated unless they're mana abilities.
+mana={1}
+type=Artifact
+[/card]
+[card]
+name=Plow Through Reito
+text=Sweep — Return any number of Plains you control to their owner's hand. Target creature gets +1/+1 until end of turn for each Plains returned this way.
+mana={1}{W}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Pure Intentions
+text=Whenever a spell or ability an opponent controls causes you to discard cards this turn, return those cards from your graveyard to your hand. -- When a spell or ability an opponent controls causes you to discard Pure Intentions, return Pure Intentions from your graveyard to your hand at the beginning of the next end step.
+mana={W}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Rally the Horde
+text=Exile the top card of your library. Exile the top card of your library. Exile the top card of your library. If the last card exiled isn't a land, repeat this process. Put a 1/1 red Warrior creature token onto the battlefield for each nonland card exiled this way.
+mana={5}{R}
+type=Sorcery
+[/card]
+[card]
+name=Rushing-Tide Zubera
+text=When Rushing-Tide Zubera dies, if 4 or more damage was dealt to it this turn, draw three cards.
+mana={2}{U}{U}
+type=Creature
+subtype=Zubera Spirit
+power=3
+toughness=3
+[/card]
+[card]
+name=Sakashima the Impostor
+text=You may have Sakashima the Impostor enter the battlefield as a copy of any creature on the battlefield, except its name is still Sakashima the Impostor, it's legendary in addition to its other types, and it gains "{2}{U}{U}: Return Sakashima the Impostor to its owner's hand at the beginning of the next end step."
+mana={2}{U}{U}
+type=Legendary Creature
+subtype=Human Rogue
+power=3
+toughness=1
+[/card]
+[card]
+name=Sasaya, Orochi Ascendant
+text=Reveal your hand: If you have seven or more land cards in your hand, flip Sasaya, Orochi Ascendant. --  -- ——— --  -- Sasaya's Essence -- Legendary Enchantment --  -- Whenever a land you control is tapped for mana, for each other land you control with the same name, add one mana to your mana pool of any type that land produced. -- 2/3
+mana={1}{G}{G}
+type=Legendary Creature
+subtype=Snake Monk
+power=2
+toughness=3
+[/card]
+[card]
+name=Sekki, Seasons' Guide
+text=Sekki, Seasons' Guide enters the battlefield with eight +1/+1 counters on it. -- If damage would be dealt to Sekki, prevent that damage, remove that many +1/+1 counters from Sekki, and put that many 1/1 colorless Spirit creature tokens onto the battlefield. -- Sacrifice eight Spirits: Return Sekki from your graveyard to the battlefield.
+mana={5}{G}{G}{G}
+type=Legendary Creature
+subtype=Spirit
+power=0
+toughness=0
+[/card]
+[card]
+name=Shape Stealer
+text=Whenever Shape Stealer blocks or becomes blocked by a creature, change Shape Stealer's power and toughness to that creature's power and toughness until end of turn.
+mana={U}{U}
+type=Creature
+subtype=Shapeshifter Spirit
+power=1
+toughness=1
+[/card]
+[card]
+name=Shifting Borders
+text=Exchange control of two target lands. -- Splice onto Arcane {3}{U} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={3}{U}
+type=Instant
+subtype=Arcane
+[/card]
+[card]
+name=Sink into Takenuma
+text=Sweep — Return any number of Swamps you control to their owner's hand. Target player discards a card for each Swamp returned this way.
+mana={3}{B}
+type=Sorcery
+subtype=Arcane
+[/card]
+[card]
+name=Spiritual Visit
+text=Put a 1/1 colorless Spirit creature token onto the battlefield. -- Splice onto Arcane {W} (As you cast an Arcane spell, you may reveal this card from your hand and pay its splice cost. If you do, add this card's effects to that spell.)
+mana={W}
+type=Instant
+subtype=Arcane
+[/card]
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 154b37d35..c012e5554 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -12446,7 +12446,7 @@ toughness=0
 [card]
 name=Body of Jukai
 abilities=trample
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=8]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=8]|mygraveyard)
 text=Trample -- Soulshift 8 (When this dies, you may return target Spirit card with converted mana cost 8 or less from your graveyard to your hand.)
 mana={7}{G}{G}
 type=Creature
@@ -15205,7 +15205,7 @@ type=Instant
 [/card]
 [card]
 name=Burr Grafter
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=3]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=3]|mygraveyard)
 auto={S}:2/2 target(creature)
 text=Sacrifice Burr Grafter: Target creature gets +2/+2 until end of turn. -- Soulshift 3 (When this dies, you may return target Spirit card with converted mana cost 3 or less from your graveyard to your hand.)
 mana={3}{G}
@@ -22451,7 +22451,7 @@ toughness=4
 [card]
 name=Crawling Filth
 abilities=fear
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=5]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=5]|mygraveyard)
 text=Fear (This creature can't be blocked except by artifact creatures and/or black creatures.) -- Soulshift 5 (When this dies, you may return target Spirit card with converted mana cost 5 or less from your graveyard to your hand.)
 mana={5}{B}
 type=Creature
@@ -26036,7 +26036,7 @@ toughness=2
 name=Deathknell Kami
 abilities=flying
 auto={2}:1/1 && treason
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=1]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=1]|mygraveyard)
 text=Flying -- {2}: Deathknell Kami gets +1/+1 until end of turn. Sacrifice it at the beginning of the next end step. -- Soulshift 1 (When this dies, you may return target Spirit card with converted mana cost 1 or less from your graveyard to your hand.)
 mana={1}{B}
 type=Creature
@@ -27327,6 +27327,17 @@ mana={4}{W}{W}
 type=Sorcery
 [/card]
 [card]
+name=Descendant of Kiyomaro
+auto=while(restriction{morecardsthanopponent}) 1/2
+auto=while(restriction{morecardsthanopponent}) transforms((,newability[@combatdamaged(*[creature;player]) from(this):life:3 controller]))
+text=As long as you have more cards in hand than each opponent, Descendant of Kiyomaro gets +1/+2 and has "Whenever this creature deals combat damage, you gain 3 life."
+mana={1}{W}{W}
+type=Creature
+subtype=Human Soldier
+power=2
+toughness=3
+[/card]
+[card]
 name=Descendant of Masumaro
 auto=@each my upkeep:foreach(*|myHand) counter(1/1,1) && foreach(*|opponentHand) counter(1/1,-1)
 text=At the beginning of your upkeep, put a +1/+1 counter on Descendant of Masumaro for each card in your hand, then remove a +1/+1 counter from Descendant of Masumaro for each card in target opponent's hand.
@@ -32660,7 +32671,7 @@ toughness=3
 [card]
 name=Elder Pine of Jukai
 auto=@movedTo(arcane,spirit|mystack):reveal:4 optionone name(Get Lands) target(<4>land|reveal) moveto(myhand) optiononeend optiontwo name(put on bottom) target(<4>*|reveal) bottomoflibrary optiontwoend revealend
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=2]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=2]|mygraveyard)
 text=Whenever you cast a Spirit or Arcane spell, reveal the top three cards of your library. Put all land cards revealed this way into your hand and the rest on the bottom of your library in any order. -- Soulshift 2 (When this is put into a graveyard from the battlefield, you may return target Spirit card with converted mana cost 2 or less from your graveyard to your hand.)
 mana={2}{G}
 type=Creature
@@ -44121,7 +44132,7 @@ toughness=2
 [card]
 name=Gibbering Kami
 abilities=flying
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=3]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=3]|mygraveyard)
 text=Flying -- Soulshift 3 (When this dies, you may return target Spirit card with converted mana cost 3 or less from your graveyard to your hand.)
 mana={3}{B}
 type=Creature
@@ -49816,7 +49827,7 @@ toughness=3
 [card]
 name=Harbinger of Spring
 auto=protection from(creature[-spirit])
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=4]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=4]|mygraveyard)
 text=Protection from non-Spirit creatures -- Soulshift 4 (When this dies, you may return target Spirit card with converted mana cost 4 or less from your graveyard to your hand.)
 mana={4}{G}
 type=Creature
@@ -50401,7 +50412,7 @@ toughness=1
 name=He Who Hungers
 abilities=flying
 auto={1}{S(creature[spirit]|mybattlefield)}:target(opponent) reveal:type:*:targetedpersonshand revealzone(targetedpersonshand) optionone name(choose discards) target(*|reveal) moveto(ownerhand) and!( reject )! optiononeend optiontwo name(put back) target(<1>*|reveal) moveto(ownerhand) and!( all(*|reveal) moveto(ownerhand) )!  optiontwoend revealend asSorcery
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=4]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=4]|mygraveyard)
 text=Flying -- {1}, Sacrifice a Spirit: Target opponent reveals his or her hand. You choose a card from it. That player discards that card. Activate this ability only any time you could cast a sorcery. -- Soulshift 4 (When this dies, you may return target Spirit card with converted mana cost 4 or less from your graveyard to your hand.)
 mana={4}{B}
 type=Legendary Creature
@@ -53389,7 +53400,7 @@ toughness=4
 [card]
 name=Hundred-Talon Kami
 abilities=flying
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=4]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=4]|mygraveyard)
 text=Flying -- Soulshift 4 (When this dies, you may return target Spirit card with converted mana cost 4 or less from your graveyard to your hand.)
 mana={4}{W}
 type=Creature
@@ -58377,7 +58388,7 @@ toughness=2
 [/card]
 [card]
 name=Kami of Empty Graves
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=3]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=3]|mygraveyard)
 text=Soulshift 3 (When this dies, you may return target Spirit card with converted mana cost 3 or less from your graveyard to your hand.)
 mana={3}{B}
 type=Creature
@@ -58408,7 +58419,7 @@ toughness=3
 [card]
 name=Kami of Lunacy
 abilities=flying
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=5]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=5]|mygraveyard)
 text=Flying -- Soulshift 5 (When this dies, you may return target Spirit card with converted mana cost 5 or less from your graveyard to your hand.)
 mana={4}{B}{B}
 type=Creature
@@ -58449,7 +58460,7 @@ toughness=3
 name=Kami of the Honored Dead
 abilities=flying
 auto=@damaged(this):life:thatmuch controller
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=6]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=6]|mygraveyard)
 text=Flying -- Whenever Kami of the Honored Dead is dealt damage, you gain that much life. -- Soulshift 6 (When this dies, you may return target Spirit card with converted mana cost 6 or less from your graveyard to your hand.)
 mana={5}{W}{W}
 type=Creature
@@ -58484,7 +58495,7 @@ toughness=3
 [card]
 name=Kami of the Palace Fields
 abilities=flying,first strike
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=5]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=5]|mygraveyard)
 text=Flying, first strike -- Soulshift 5 (When this dies, you may return target Spirit card with converted mana cost 5 or less from your graveyard to your hand.)
 mana={5}{W}
 type=Creature
@@ -58495,7 +58506,7 @@ toughness=2
 [card]
 name=Kami of the Tended Garden
 auto=upcost[{G}] sacrifice)
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=3]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=3]|mygraveyard)
 text=At the beginning of your upkeep, sacrifice Kami of the Tended Garden unless you pay {G}. -- Soulshift 3 (When this dies, you may return target Spirit card with converted mana cost 3 or less from your graveyard to your hand.)
 mana={3}{G}
 type=Creature
@@ -65415,7 +65426,7 @@ toughness=2
 [card]
 name=Loyal Gyrfalcon
 abilities=defender,flying
-auto=@movedTo(*[white]|mystack):name(loses defender) -defender ueot
+auto=@movedTo(*[white]|mystack):name(loses defender) -defender all(this)
 text=Defender, flying -- Whenever you cast a white spell, Loyal Gyrfalcon loses defender until end of turn.
 mana={3}{W}
 type=Creature
@@ -68130,6 +68141,17 @@ mana={2}{W}{B}
 type=Enchantment
 [/card]
 [card]
+name=Masako the Humorless
+abilities=flash
+auto=lord(creature[tapped]|mybattlefield) canblocktapped
+text=Flash -- Tapped creatures you control can block as though they were untapped.
+mana={2}{W}
+type=Legendary Creature
+subtype=Human Advisor
+power=2
+toughness=1
+[/card]
+[card]
 name=Mask of Avacyn
 auto={3}:equip
 auto=opponentshroud
@@ -72346,7 +72368,7 @@ auto={S}:name(Blue) protection from blue target(creature|myBattlefield)
 auto={S}:name(Black) protection from black target(creature|myBattlefield)
 auto={S}:name(Red) protection from red target(creature|myBattlefield)
 auto={S}:name(Green) protection from green target(creature|myBattlefield)
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=3]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=3]|mygraveyard)
 text=Sacrifice Moonlit Strider: Target creature you control gains protection from the color of your choice until end of turn. -- Soulshift 3 (When this dies, you may return target Spirit card with converted mana cost 3 or less from your graveyard to your hand.)
 mana={3}{W}
 type=Creature
@@ -75886,7 +75908,7 @@ type=Sorcery
 [/card]
 [card]
 name=Nightsoil Kami
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=5]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=5]|mygraveyard)
 text=Soulshift 5 (When this dies, you may return target Spirit card with converted mana cost 5 or less from your graveyard to your hand.)
 mana={4}{G}{G}
 type=Creature
@@ -77890,6 +77912,16 @@ power=3
 toughness=2
 [/card]
 [card]
+name=Okina Nightwatch
+auto=while(restriction{morecardsthanopponent}) 3/3
+text=As long as you have more cards in hand than each opponent, Okina Nightwatch gets +3/+3.
+mana={4}{G}
+type=Creature
+subtype=Human Monk
+power=4
+toughness=3
+[/card]
+[card]
 name=Okina, Temple to the Grandfathers
 auto={T}:Add{G}
 auto={G}{T}:1/1 target(creature[legendary])
@@ -84503,7 +84535,7 @@ type=Sorcery
 [/card]
 [card]
 name=Promised Kannushi
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=7]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=7]|mygraveyard)
 text=Soulshift 7 (When this dies, you may return target Spirit card with converted mana cost 7 or less from your graveyard to your hand.)
 mana={G}
 type=Creature
@@ -85274,7 +85306,7 @@ type=Enchantment
 [card]
 name=Pus Kami
 auto={B}{S}:destroy target(creature[-black])
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=6]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=6]|mygraveyard)
 text={B}, Sacrifice Pus Kami: Destroy target nonblack creature. -- Soulshift 6 (When this dies, you may return target Spirit card with converted mana cost 6 or less from your graveyard to your hand.)
 mana={5}{B}{B}
 type=Creature
@@ -91594,7 +91626,7 @@ toughness=3
 [card]
 name=Rootrunner
 auto={G}{G}{S}:moveTo(ownerlibrary) target(land)
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=3]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=3]|mygraveyard)
 text={G}{G}, Sacrifice Rootrunner: Put target land on top of its owner's library. -- Soulshift 3 (When this dies, you may return target Spirit card with converted mana cost 3 or less from your graveyard to your hand.)
 mana={2}{G}{G}
 type=Creature
@@ -95617,7 +95649,7 @@ toughness=2
 [card]
 name=Scuttling Death
 auto={S}:-1/-1 target(creature)
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=4]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=4]|mygraveyard)
 text=Sacrifice Scuttling Death: Target creature gets -1/-1 until end of turn. -- Soulshift 4 (When this dies, you may return target Spirit card with converted mana cost 4 or less from your graveyard to your hand.)
 mana={4}{B}
 type=Creature
@@ -96183,6 +96215,17 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+name=Secretkeeper
+auto=while(restriction{morecardsthanopponent}) 2/2
+auto=while(restriction{morecardsthanopponent}) flying
+text=As long as you have more cards in hand than each opponent, Secretkeeper gets +2/+2 and has flying.
+mana={3}{U}
+type=Creature
+subtype=Spirit
+power=2
+toughness=2
+[/card]
+[card]
 name=Secrets of the Dead
 auto=@movedTo(*|stack) from(mygraveyard):draw:1 controller
 text=Whenever you cast a spell from your graveyard, draw a card.
@@ -98880,7 +98923,7 @@ toughness=3
 [card]
 name=Shoal Serpent
 abilities=defender
-auto=@movedTo(land|myBattlefield):name(loses defender) -defender ueot
+auto=@movedTo(land|myBattlefield):name(loses defender) -defender all(this)
 text=Defender -- Landfall - Whenever a land enters the battlefield under your control, Shoal Serpent loses defender until end of turn.
 mana={5}{U}
 type=Creature
@@ -113893,7 +113936,7 @@ toughness=4
 [card]
 name=Thief of Hope
 auto=@movedTo(arcane,spirit|mystack):ability$!choice life:-1 target(opponent) && life:1 controller!$ controller
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=2]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=2]|mygraveyard)
 text=Whenever you cast a Spirit or Arcane spell, target opponent loses 1 life and you gain 1 life. -- Soulshift 2 (When this dies, you may return target Spirit card with converted mana cost 2 or less from your graveyard to your hand.)
 mana={2}{B}
 type=Creature
@@ -114475,7 +114518,7 @@ toughness=6
 [/card]
 [card]
 name=Thousand-legged Kami
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=7]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=7]|mygraveyard)
 text=Soulshift 7 (When this dies, you may return target Spirit card with converted mana cost 7 or less from your graveyard to your hand.)
 mana={6}{G}{G}
 type=Creature
@@ -116262,7 +116305,7 @@ type=Enchantment
 [card]
 name=Torii Watchward
 abilities=vigilance
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=4]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=4]|mygraveyard)
 text=Vigilance (Attacking doesn't cause this creature to tap.) -- Soulshift 4 (When this dies, you may return target Spirit card with converted mana cost 4 or less from your graveyard to your hand.)
 mana={4}{W}
 type=Creature
@@ -119527,6 +119570,14 @@ mana={B}
 type=Instant
 [/card]
 [card]
+name=Undying Flames
+auto=Reveal:1 revealzone(mylibrary) revealuntil(*[-land]|mylibrary) optionone donothing optiononeend optiontwo choice name(exile cards) all(*|reveal) moveto(ownerexile) optiontwoend afterrevealed choice name(Deal Damage) target(creature,player) damage:revealedmana afterrevealedend revealend
+auto=if compare(epicactivated)~lessthan~1 then emblem transforms((,newability[epic controller],newability[@each my upkeep:castcard(copied named!:Undying Flames:!)])) forever dontremove
+text=Exile cards from the top of your library until you exile a nonland card. Undying Flames deals damage to target creature or player equal to that card's converted mana cost. -- Epic (For the rest of the game, you can't cast spells. At the beginning of each of your upkeeps, copy this spell except for its epic ability. You may choose a new target for the copy.)
+mana={4}{R}{R}
+type=Sorcery
+[/card]
+[card]
 name=Undying Rage
 target=creature
 autograveyard=@movedTo(this|graveyard) from(battlefield):moveTo(ownerhand)
@@ -121413,7 +121464,7 @@ toughness=1
 [card]
 name=Venerable Kumo
 abilities=reach
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=4]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=4]|mygraveyard)
 text=Reach (This creature can block creatures with flying.) -- Soulshift 4 (When this dies, you may return target Spirit card with converted mana cost 4 or less from your graveyard to your hand.)
 mana={4}{G}
 type=Creature
@@ -122654,7 +122705,7 @@ toughness=3
 [card]
 name=Vine Kami
 abilities=menace
-auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(other spirit[manacost<=6]|mygraveyard)
+auto=@movedTo(this|mygraveyard) from(myBattlefield):may moveTo(myhand) target(spirit[manacost<=6]|mygraveyard)
 text=Vine Kami can't be blocked except by two or more creatures. -- Soulshift 6 (When this is put into a graveyard from the battlefield, you may return target Spirit card with converted mana cost 6 or less from your graveyard to your hand.)
 mana={6}{G}
 type=Creature
diff --git a/projects/mtg/include/MTGDefinitions.h b/projects/mtg/include/MTGDefinitions.h
index 2302e2345..db25862ab 100644
--- a/projects/mtg/include/MTGDefinitions.h
+++ b/projects/mtg/include/MTGDefinitions.h
@@ -260,7 +260,8 @@ class Constants
       CANTTRANSFORM =138,
       ASFLASH =139,
       CONDUITED = 140,
-      NB_BASIC_ABILITIES = 141,
+      CANBLOCKTAPPED = 141,
+      NB_BASIC_ABILITIES = 142,
 
     RARITY_S = 'S',   //Special Rarity
     RARITY_M = 'M',   //Mythics
diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp
index eccdc4fe6..9cc146c83 100644
--- a/projects/mtg/src/MTGAbility.cpp
+++ b/projects/mtg/src/MTGAbility.cpp
@@ -352,6 +352,15 @@ int AbilityFactory::parseCastRestrictions(MTGCardInstance * card, Player * playe
             if(!isMorbid)
                 return 0;
         }
+        
+
+        check = restriction[i].find("morecardsthanopponent");
+        if (check != string::npos)
+        {
+            Player * checkCurrent = card->controller();
+            if(checkCurrent->game->hand->nb_cards <= checkCurrent->opponent()->game->hand->nb_cards)
+                return 0;
+        }
 
         check = restriction[i].find("delirium");
         if (check != string::npos)
diff --git a/projects/mtg/src/MTGCardInstance.cpp b/projects/mtg/src/MTGCardInstance.cpp
index 0134ea33c..77aa6ee9b 100644
--- a/projects/mtg/src/MTGCardInstance.cpp
+++ b/projects/mtg/src/MTGCardInstance.cpp
@@ -890,7 +890,7 @@ bool MTGCardInstance::isTargetter()
 
 int MTGCardInstance::canBlock()
 {
-    if (tapped)
+    if (tapped && !has(Constants::CANBLOCKTAPPED))
         return 0;
     if (basicAbilities[(int)Constants::CANTBLOCK])
         return 0;
diff --git a/projects/mtg/src/MTGDefinitions.cpp b/projects/mtg/src/MTGDefinitions.cpp
index abcfdedce..f84bde09e 100644
--- a/projects/mtg/src/MTGDefinitions.cpp
+++ b/projects/mtg/src/MTGDefinitions.cpp
@@ -171,7 +171,8 @@ const char* Constants::MTGBasicAbilities[] = {
     "legendruleremove",
     "canttransform",
     "asflash",
-    "conduited"
+    "conduited",
+    "canblocktapped"
 };
 
 map<string,int> Constants::MTGBasicAbilitiesMap;