diff --git a/projects/mtg/bin/Res/sets/DST/_cards.dat b/projects/mtg/bin/Res/sets/DST/_cards.dat
index ce044ea1f..84e549a5c 100644
--- a/projects/mtg/bin/Res/sets/DST/_cards.dat
+++ b/projects/mtg/bin/Res/sets/DST/_cards.dat
@@ -456,6 +456,20 @@ auto=destroy all(*[-artifact])
 rarity=R
 [/card]
 [card]
+id=47453
+name=Sword of Light and Shadow
+mana={3}
+type=Artifact
+subtype=Equipment
+text=Equipped creature gets +2/+2 and has protection from white and from black. Whenever equipped creature deals combat damage to a player, you gain 3 life and you may return up to one target creature card from your graveyard to your hand. Equip {2}
+auto={2}:equip
+auto=protection from white
+auto=protection from black
+auto=2/2
+auto=@damaged(player) from(mytgt):may moveTo(myhand) target(creature|mygraveyard) && life:3
+rarity=R
+[/card]
+[card]
 text=Flash (You may cast this spell any time you could cast an instant.) Reach (This creature can block creatures with flying.)
 id=46548
 name=Tangle Spider
@@ -541,6 +555,17 @@ toughness=2
 rarity=U
 [/card]
 [card]
+id=49758
+name=Vulshok Morningstar
+mana={2}
+type=Artifact
+subtype=Equipment
+text=Equipped creature gets +2/+2. Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
+auto={2}:equip
+auto=2/2
+rarity=U
+[/card]
+[card]
 text={T}, Sacrifice an Island: Put a 2/2 blue Elemental creature token with flying onto the battlefield. {T}, Sacrifice a Mountain: Put a 3/3 red Elemental creature token onto the battlefield.
 id=49775
 name=Wand of the Elements
@@ -551,6 +576,18 @@ auto={T}{S(mountain|myBattlefield)}:token(Elemental,Creature Elemental,3/3,red)
 rarity=R
 [/card]
 [card]
+id=46030
+name=Whispersilk Cloak
+mana={3}
+type=Artifact
+subtype=Equipment
+text=Equipped creature is unblockable. Equipped creature has shroud. (It can't be the target of spells or abilities.) Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
+auto={2}:equip
+auto=unblockable
+auto=shroud
+rarity=U
+[/card]
+[card]
 text=Whenever a player casts a green spell, you may gain 1 life.
 id=72684
 name=Wurm's Tooth
@@ -558,4 +595,4 @@ mana={2}
 type=Artifact
 auto=@movedto(*[green]|stack):may life:1 controller
 rarity=U
-[/card]
+[/card]
\ No newline at end of file
diff --git a/projects/mtg/bin/Res/sets/DST/todo.dat b/projects/mtg/bin/Res/sets/DST/todo.dat
index 8822c721f..3a0d81a51 100644
--- a/projects/mtg/bin/Res/sets/DST/todo.dat
+++ b/projects/mtg/bin/Res/sets/DST/todo.dat
@@ -909,15 +909,7 @@ subtype=Equipment
 text=Equipped creature gets +2/+2 and has protection from red and from blue. Whenever equipped creature deals combat damage to a player, Sword of Fire and Ice deals 2 damage to target creature or player and you draw a card. Equip {2}
 rarity=R
 [/card]
-[card]
-id=47453
-name=Sword of Light and Shadow
-mana={3}
-type=Artifact
-subtype=Equipment
-text=Equipped creature gets +2/+2 and has protection from white and from black. Whenever equipped creature deals combat damage to a player, you gain 3 life and you may return up to one target creature card from your graveyard to your hand. Equip {2}
-rarity=R
-[/card]
+
 [card]
 id=49021
 name=Synod Artificer
@@ -1034,15 +1026,7 @@ type=Instant
 text=Counter target spell. That spell's controller may draw a card.
 rarity=C
 [/card]
-[card]
-id=49758
-name=Vulshok Morningstar
-mana={2}
-type=Artifact
-subtype=Equipment
-text=Equipped creature gets +2/+2. Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
-rarity=U
-[/card]
+
 [card]
 id=45455
 name=Vulshok War Boar
@@ -1062,15 +1046,7 @@ type=Artifact
 text=Whenever you gain life, you may pay {X}, where X is less than or equal to the amount of life you gained. If you do, draw X cards.
 rarity=R
 [/card]
-[card]
-id=46030
-name=Whispersilk Cloak
-mana={3}
-type=Artifact
-subtype=Equipment
-text=Equipped creature is unblockable. Equipped creature has shroud. (It can't be the target of spells or abilities.) Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)
-rarity=U
-[/card]
+
 [card]
 id=49026
 name=Wirefly Hive
diff --git a/projects/mtg/bin/Res/sets/GPT/todo.dat b/projects/mtg/bin/Res/sets/GPT/todo.dat
index 7dcd6968f..a81a109c2 100644
--- a/projects/mtg/bin/Res/sets/GPT/todo.dat
+++ b/projects/mtg/bin/Res/sets/GPT/todo.dat
@@ -1000,6 +1000,11 @@ mana={4}
 type=Artifact
 subtype=Equipment
 text=As long as equipped creature is tapped, tapped creatures you control get +2/+0. As long as equipped creature is untapped, untapped creatures you control get +0/+2. {3}: You may tap or untap equipped creature. Equip {3}
+auto={3}:equip
+auto=aslongas(mytgt[tapped]) lord(creature[tapped]|myinplay) 2/0
+auto=aslongas(mytgt[-tapped]) lord(creature[-tapped]|myinplay) 0/2
+auto={3}:tap(mytgt)
+auto={3}:untap(mytgt)
 rarity=R
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/MRD/_cards.dat b/projects/mtg/bin/Res/sets/MRD/_cards.dat
index c569f1557..75970b1c4 100644
--- a/projects/mtg/bin/Res/sets/MRD/_cards.dat
+++ b/projects/mtg/bin/Res/sets/MRD/_cards.dat
@@ -91,15 +91,15 @@ rarity=U
 type=Land
 [/card]
 [card]
+text=Equipped creature gets +2/+0.     Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery. This card comes into play unattached and stays in play if the creature leaves play.)
 id=47442
 name=Bonesplitter
-mana={1}
+rarity=C
 type=Artifact
+mana={1}
 subtype=Equipment
-text=Equipped creature gets +2/+0. Equip {1}
 auto={1}:equip
 auto=2/0
-rarity=C
 [/card]
 [card]
 text=Sacrifice Bottle Gnomes: You gain 3 life.
@@ -288,15 +288,15 @@ power=2
 toughness=2
 [/card]
 [card]
+text=Equipped creature gets +1/+1 for each card in your hand.     Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery. This card comes into play unattached and stays in play if the creature leaves play.)
 id=49430
-name=Empyrial Armor
-mana={2}
+name=Empyrial Plate
+rarity=R
 type=Artifact
-subtype=Equipment
-text=Equipped creature gets +1/+1 for each card in your hand. Equip {2}
+mana={2}
 auto={2}:equip
 auto=foreach(*|myhand) 1/1
-rarity=R
+subtype=Equipment
 [/card]
 [card]
 text=Search your library for an artifact card, reveal it, and put it into your hand. Then shuffle your library.
@@ -1528,6 +1528,17 @@ power=1
 toughness=1
 [/card]
 [card]
+text=Equipped creature gets +3/+3.     Equip {3} ({3}: Attach to target creature you control. Equip only as a sorcery. This card comes into play unattached and stays in play if the creature leaves play.)
+id=48121
+name=Vulshok Battlegear
+rarity=U
+type=Artifact
+mana={3}
+auto={3}:equip
+auto=3/3
+subtype=Equipment
+[/card]
+[card]
 text=Haste
 id=5585
 name=Vulshok Berserker
@@ -1540,6 +1551,17 @@ toughness=2
 abilities=haste
 [/card]
 [card]
+text=Equipped creature gets +4/+2 and doesn't untap during its controller's untap step.     Equip {3} ({3}: Attach to target creature you control. Equip only as a sorcery. This card comes into play unattached and stays in play if the creature leaves play.)
+id=48397
+name=Vulshok Gauntlets
+rarity=C
+type=Artifact
+mana={2}
+auto={3}
+auto=doesnotuntap
+subtype=Equipment
+[/card]
+[card]
 text=Sacrifice Welding Jar: Regenerate target artifact.
 auto={S}:regenerate target(artifact)
 id=48328
diff --git a/projects/mtg/bin/Res/sets/MRD/todo.dat b/projects/mtg/bin/Res/sets/MRD/todo.dat
index 4a1dc7815..e7400db67 100644
--- a/projects/mtg/bin/Res/sets/MRD/todo.dat
+++ b/projects/mtg/bin/Res/sets/MRD/todo.dat
@@ -114,15 +114,7 @@ rarity=U
 type=Instant
 mana={3}{G}
 [/card]
-[card]
-text=Equipped creature gets +2/+0.     Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery. This card comes into play unattached and stays in play if the creature leaves play.)
-id=47442
-name=Bonesplitter
-rarity=C
-type=Artifact
-mana={1}
-subtype=Equipment
-[/card]
+
 [card]
 text=Trample     {3}{R}, Sacrifice an artifact: Bosh, Iron Golem deals damage equal to the sacrificed artifact's converted mana cost to target creature or player.
 id=48581
@@ -341,15 +333,7 @@ rarity=C
 type=Instant
 mana={R}
 [/card]
-[card]
-text=Equipped creature gets +1/+1 for each card in your hand.     Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery. This card comes into play unattached and stays in play if the creature leaves play.)
-id=49430
-name=Empyrial Plate
-rarity=R
-type=Artifact
-mana={2}
-subtype=Equipment
-[/card]
+
 [card]
 text=Imprint - When Extraplanar Lens comes into play, you may remove target land you control from the game. (The removed card is imprinted on this artifact.)  Whenever a land with the same name as the imprinted card is tapped for mana, its controller adds one mana to his or her mana pool of any type that land produced.
 id=49440
@@ -389,15 +373,7 @@ rarity=R
 type=Sorcery
 mana={2}{R}
 [/card]
-[card]
-text=Equipped creature has double strike. (It deals both first-strike and regular combat damage.)  Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery. This card comes into play unattached and stays in play if the creature leaves play.)
-id=48203
-name=Fireshrieker
-rarity=U
-type=Artifact
-mana={3}
-subtype=Equipment
-[/card]
+
 [card]
 text=Whenever Flayed Nim deals combat damage to a creature, that creature's controller loses that much life. {2}{B}: Regenerate Flayed Nim.
 id=46094
@@ -617,16 +593,6 @@ subtype=Cat Soldier
 toughness=3
 [/card]
 
-[card]
-text=Equipped creature gets +1/+1.     Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery.)
-id=46029
-name=Leonin Scimitar
-rarity=C
-type=Artifact
-mana={1}
-subtype=Equipment
-[/card]
-
 [card]
 text={2}, {T}: Name a card. Target opponent guesses whether a card with that name is in your hand. You may reveal your hand. If you do and your opponent guessed wrong, draw a card.
 id=46733
@@ -651,15 +617,7 @@ rarity=R
 type=Artifact
 mana={3}
 [/card]
-[card]
-text=Equipped creature has haste and shroud. (It can't be the target of spells or abilities.)  Equip {0} ({0}: Attach to target creature you control. Equip only as a sorcery. This card comes into play unattached and stays in play if the creature leaves play.)
-id=46021
-name=Lightning Greaves
-rarity=U
-type=Artifact
-mana={2}
-subtype=Equipment
-[/card]
+
 [card]
 text=Trample     Whenever Living Hive deals combat damage to a player, put that many 1/1 green Insect creature tokens into play.
 id=46694
@@ -719,15 +677,7 @@ power=2
 subtype=Elephant Soldier
 toughness=2
 [/card]
-[card]
-text=Equipped creature gets +3/+0 and has lifelink and trample. (When it deals damage, you gain that much life. If it would deal enough combat damage to its blockers to destroy them, you may have it deal the rest of its damage to defending player.)  Equip {3} ({3}: Attach to target creature you control. Equip only as a sorcery.)
-id=49759
-name=Loxodon Warhammer
-rarity=U
-type=Artifact
-mana={3}
-subtype=Equipment
-[/card]
+
 [card]
 text={1}, {T}: Target player draws a card, then discards a card. If that player discards an artifact card this way, untap Lumengrid Augur.
 id=47791
@@ -927,15 +877,7 @@ power=1
 subtype=Bird
 toughness=1
 [/card]
-[card]
-text=Equipped creature has flying.     Equip {2} ({2}: Attach to target creature you control. Equip only as a sorcery. This card comes into play unattached and stays in play if the creature leaves play.)
-id=46037
-name=Neurok Hoversail
-rarity=C
-type=Artifact
-mana={1}
-subtype=Equipment
-[/card]
+
 
 [card]
 text=Equipped creature gets +1/+1 for each Swamp you control.     Equip-Pay 3 life. (Pay 3 life: Attach to target creature you control. Equip only as a sorcery. This card comes into play unattached and stays in play if the creature leaves play.)
@@ -1219,16 +1161,6 @@ subtype=Cat Knight
 toughness=2
 [/card]
 
-[card]
-text=Equipped creature gets +0/+6.     Equip {3} ({3}: Attach to target creature you control. Equip only as a sorcery. This card comes into play unattached and stays in play if the creature leaves play.)
-id=46028
-name=Slagwurm Armor
-rarity=C
-type=Artifact
-mana={1}
-subtype=Equipment
-[/card]
-
 [card]
 text=Whenever Slith Strider becomes blocked, draw a card.     Whenever Slith Strider deals combat damage to a player, put a +1/+1 counter on it.
 id=46080
@@ -1513,15 +1445,7 @@ type=Artifact
 mana={2}
 subtype=Equipment
 [/card]
-[card]
-text=Equipped creature gets +3/+3.     Equip {3} ({3}: Attach to target creature you control. Equip only as a sorcery. This card comes into play unattached and stays in play if the creature leaves play.)
-id=48121
-name=Vulshok Battlegear
-rarity=U
-type=Artifact
-mana={3}
-subtype=Equipment
-[/card]
+
 [card]
 text=Haste     When Vulshok Battlemaster comes into play, attach all Equipment in play to it. (Control of the Equipment doesn't change.)
 id=48125
@@ -1534,15 +1458,6 @@ subtype=Human Warrior
 toughness=2
 [/card]
 
-[card]
-text=Equipped creature gets +4/+2 and doesn't untap during its controller's untap step.     Equip {3} ({3}: Attach to target creature you control. Equip only as a sorcery. This card comes into play unattached and stays in play if the creature leaves play.)
-id=48397
-name=Vulshok Gauntlets
-rarity=C
-type=Artifact
-mana={2}
-subtype=Equipment
-[/card]
 [card]
 text=Choose one - Regenerate each creature you control; or Wail of the Nim deals 1 damage to each creature and each player.     Entwine {B} (Choose both if you pay the entwine cost.)
 id=48105
diff --git a/projects/mtg/bin/Res/sets/RAV/_cards.dat b/projects/mtg/bin/Res/sets/RAV/_cards.dat
index 832e955e7..33a9c075c 100644
--- a/projects/mtg/bin/Res/sets/RAV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/RAV/_cards.dat
@@ -676,6 +676,19 @@ type=Land
 subtype=Swamp Forest
 [/card]
 [card]
+text=Equipped creature has defender, flying, and first strike.     Equip {2}
+id=89090
+name=Peregrine Mask
+rarity=U
+type=Artifact
+mana={1}
+auto={2}:equip
+auto=defender
+auto=first strike
+auto=flying
+subtype=Equipment
+[/card]
+[card]
 text={1}, Sacrifice a creature: Search your library for a land card with a basic land type and put it onto the battlefield tapped. Then shuffle your library.
 auto={1}{S(creature|mybattlefield)}:moveTo(myBattlefield) target(basic|mylibrary) && tap
 id=83744
diff --git a/projects/mtg/bin/Res/sets/RAV/todo.dat b/projects/mtg/bin/Res/sets/RAV/todo.dat
index 34557e319..8695d562e 100644
--- a/projects/mtg/bin/Res/sets/RAV/todo.dat
+++ b/projects/mtg/bin/Res/sets/RAV/todo.dat
@@ -1264,15 +1264,7 @@ rarity=C
 type=Instant
 mana={1}{U}
 [/card]
-[card]
-text=Equipped creature has defender, flying, and first strike.     Equip {2}
-id=89090
-name=Peregrine Mask
-rarity=U
-type=Artifact
-mana={1}
-subtype=Equipment
-[/card]
+
 
 [card]
 text=Counter target spell unless its controller discards his or her hand.     Transmute {1}{U}{B} ({1}{U}{B}, Discard this card: Search your library for a card with the same converted mana cost as this card, reveal it, and put it into your hand. Then shuffle your library. Play only as a sorcery.)
diff --git a/projects/mtg/bin/Res/test/_tests.txt b/projects/mtg/bin/Res/test/_tests.txt
index a2036cc3e..73a6a31e7 100644
--- a/projects/mtg/bin/Res/test/_tests.txt
+++ b/projects/mtg/bin/Res/test/_tests.txt
@@ -104,6 +104,7 @@ belligerent_hatchling.txt
 benalish_knight.txt
 black_vise.txt
 blessed_wine.txt
+blight_sickle.txt
 blinking_spirit.txt
 bloodfire_colossus.txt
 bloodhall_ooze.txt
@@ -347,6 +348,8 @@ walking_wall.txt
 wall_of_diffusion.txt
 wall_of_diffusion2.txt
 welkin_hawk.txt
+whispersilk_cloak.txt
+whispersilk_cloak2.txt
 white_knight1.txt
 windswept_heath.txt
 wrath_of_god.txt
diff --git a/projects/mtg/bin/Res/test/generic/equip_wither.txt b/projects/mtg/bin/Res/test/blight_sickle.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/generic/equip_wither.txt
rename to projects/mtg/bin/Res/test/blight_sickle.txt
diff --git a/projects/mtg/bin/Res/test/generic/equip_shroud.txt b/projects/mtg/bin/Res/test/whispersilk_cloak.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/generic/equip_shroud.txt
rename to projects/mtg/bin/Res/test/whispersilk_cloak.txt
diff --git a/projects/mtg/bin/Res/test/generic/equip_shroud2.txt b/projects/mtg/bin/Res/test/whispersilk_cloak2.txt
similarity index 100%
rename from projects/mtg/bin/Res/test/generic/equip_shroud2.txt
rename to projects/mtg/bin/Res/test/whispersilk_cloak2.txt