diff --git a/projects/mtg/bin/Res/sets/mtg_todo.dat b/projects/mtg/bin/Res/sets/mtg_todo.dat
index a11c7c7ce..3d39eae3b 100644
--- a/projects/mtg/bin/Res/sets/mtg_todo.dat
+++ b/projects/mtg/bin/Res/sets/mtg_todo.dat
@@ -3847,13 +3847,6 @@ power=1
 toughness=1
 [/card]
 [card]
-name=Cloak and Dagger
-text=Equipped creature gets +2/+0 and has shroud. (It can't be the target of spells or abilities.) -- Whenever a Rogue creature enters the battlefield, you may attach Cloak and Dagger to it. -- Equip {3}
-mana={2}
-type=Tribal Artifact
-subtype=Rogue Equipment
-[/card]
-[card]
 name=Clock of Omens
 text=Tap two untapped artifacts you control: Untap target artifact.
 mana={4}
@@ -6176,13 +6169,6 @@ mana={3}{B}{R}{G}
 type=Enchantment
 [/card]
 [card]
-name=Dragon Breath
-text=Enchant creature -- Enchanted creature has haste. -- {R}: Enchanted creature gets +1/+0 until end of turn. -- When a creature with converted mana cost 6 or more enters the battlefield, you may return Dragon Breath from your graveyard to the battlefield attached to that creature.
-mana={1}{R}
-type=Enchantment
-subtype=Aura
-[/card]
-[card]
 name=Dragon Broodmother
 text=Flying -- At the beginning of each upkeep, put a 1/1 red and green Dragon creature token with flying and devour 2 onto the battlefield. (As the token enters the battlefield, you may sacrifice any number of creatures. It enters the battlefield with twice that many +1/+1 counters on it.)
 mana={2}{R}{R}{R}{G}
@@ -6192,40 +6178,12 @@ power=4
 toughness=4
 [/card]
 [card]
-name=Dragon Fangs
-text=Enchant creature -- Enchanted creature gets +1/+1 and has trample. -- When a creature with converted mana cost 6 or more enters the battlefield, you may return Dragon Fangs from your graveyard to the battlefield attached to that creature.
-mana={1}{G}
-type=Enchantment
-subtype=Aura
-[/card]
-[card]
 name=Dragon Mask
 text={3}, {T}: Target creature you control gets +2/+2 until end of turn. Return it to its owner's hand at the beginning of the next end step. (Return it only if it's on the battlefield.)
 mana={3}
 type=Artifact
 [/card]
 [card]
-name=Dragon Scales
-text=Enchant creature -- Enchanted creature gets +1/+2 and has vigilance. -- When a creature with converted mana cost 6 or more enters the battlefield, you may return Dragon Scales from your graveyard to the battlefield attached to that creature.
-mana={1}{W}
-type=Enchantment
-subtype=Aura
-[/card]
-[card]
-name=Dragon Shadow
-text=Enchant creature -- Enchanted creature gets +1/+0 and has fear. (It can't be blocked except by artifact creatures and/or black creatures.) -- When a creature with converted mana cost 6 or more enters the battlefield, you may return Dragon Shadow from your graveyard to the battlefield attached to that creature.
-mana={1}{B}
-type=Enchantment
-subtype=Aura
-[/card]
-[card]
-name=Dragon Wings
-text=Enchant creature -- Enchanted creature has flying. -- Cycling {1}{U} ({1}{U}, Discard this card: Draw a card.) -- When a creature with converted mana cost 6 or more enters the battlefield, you may return Dragon Wings from your graveyard to the battlefield attached to that creature.
-mana={1}{U}
-type=Enchantment
-subtype=Aura
-[/card]
-[card]
 name=Drain Power
 text=Target player activates a mana ability of each land he or she controls, then empties his or her mana pool. Add mana to your mana pool equal to the type and amount emptied from that player's mana pool this way.
 mana={U}{U}
@@ -10141,13 +10099,6 @@ power=8
 toughness=8
 [/card]
 [card]
-name=Grifter's Blade
-text=Flash -- As Grifter's Blade enters the battlefield, choose a creature you control it could be attached to. If you do, it enters the battlefield attached to that creature. -- Equipped creature gets +1/+1. -- Equip {1}
-mana={3}
-type=Artifact
-subtype=Equipment
-[/card]
-[card]
 name=Grim Discovery
 text=Choose one or both - Return target creature card from your graveyard to your hand; and/or return target land card from your graveyard to your hand.
 mana={1}{B}
@@ -17108,13 +17059,6 @@ mana={U}
 type=Instant
 [/card]
 [card]
-name=Obsidian Battle-Axe
-text=Equipped creature gets +2/+1 and has haste. -- Whenever a Warrior creature enters the battlefield, you may attach Obsidian Battle-Axe to it. -- Equip {3}
-mana={3}
-type=Tribal Artifact
-subtype=Warrior Equipment
-[/card]
-[card]
 name=Obsidian Fireheart
 text={1}{R}{R}: Put a blaze counter on target land without a blaze counter on it. For as long as that land has a blaze counter on it, it has "At the beginning of your upkeep, this land deals 1 damage to you." (The land continues to burn after Obsidian Fireheart has left the battlefield.)
 mana={1}{R}{R}{R}
@@ -25077,15 +25021,6 @@ mana={6}
 type=Artifact
 [/card]
 [card]
-name=Sword the Meek
-auto={2}:equip
-auto=1/2
-text=Equipped creature gets +1/+2. -- Equip {2} -- Whenever a 1/1 creature enters the battlefield under your control, you may return Sword of the Meek from your graveyard to the battlefield, then attach it to that creature.
-mana={2}
-type=Artifact
-subtype=Equipment
-[/card]
-[card]
 name=Sworn Defender
 text={1}: Sworn Defender's power becomes the toughness of target creature blocking or being blocked by Sworn Defender minus 1 until end of turn, and Sworn Defender's toughness becomes 1 plus the power of that creature until end of turn.
 mana={2}{W}{W}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 05809fe85..856f8426f 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -11099,6 +11099,17 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
+name=Cloak and Dagger
+auto={3}:equip
+auto=2/0
+auto=shroud
+auto=@movedto(creature[rogue]|battlefield):may all(trigger[to]) retarget
+text=Equipped creature gets +2/+0 and has shroud. (It can't be the target of spells or abilities.) -- Whenever a Rogue creature enters the battlefield, you may attach Cloak and Dagger to it. -- Equip {3}
+mana={2}
+type=Tribal Artifact
+subtype=Rogue Equipment
+[/card]
+[card]
 name=Cloak of Confusion
 target=creature|myBattlefield
 auto=@notblocked(mytgt):may name(no combat damage this turn and discard at random) && preventallcombatdamage from(mytgt) && discard:1 opponent
@@ -16421,6 +16432,17 @@ mana={3}
 type=Artifact
 [/card]
 [card]
+name=Dragon Breath
+target=creature
+auto=haste
+auto={R}:1/0
+autograveyard=@movedto(creature[power >=6]|mybattlefield):may all(trigger[to]) retarget
+text=Enchant creature -- Enchanted creature has haste. -- {R}: Enchanted creature gets +1/+0 until end of turn. -- When a creature with converted mana cost 6 or more enters the battlefield, you may return Dragon Breath from your graveyard to the battlefield attached to that creature.
+mana={1}{R}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 name=Dragon Broodmother
 auto=@each upkeep: token(22222220)
 mana={2}{R}{R}{R}{G}
@@ -16455,6 +16477,17 @@ power=1
 toughness=3
 [/card]
 [card]
+name=Dragon Fangs
+target=creature
+auto=trample
+auto=1/1
+autograveyard=@movedto(creature[power >=6]|mybattlefield):may all(trigger[to]) retarget
+text=Enchant creature -- Enchanted creature gets +1/+1 and has trample. -- When a creature with converted mana cost 6 or more enters the battlefield, you may return Dragon Fangs from your graveyard to the battlefield attached to that creature.
+mana={1}{G}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 name=Dragon Fodder
 auto=token(Goblin,creature goblin, 1/1,red)*2
 text=Put two 1/1 red Goblin creature tokens onto the battlefield.
@@ -16480,6 +16513,28 @@ mana={4}{R}{R}
 type=Enchantment
 [/card]
 [card]
+name=Dragon Scales
+target=creature
+auto=vigilance
+auto=1/2
+autograveyard=@movedto(creature[power >=6]|mybattlefield):may all(trigger[to]) retarget
+text=Enchant creature -- Enchanted creature gets +1/+2 and has vigilance. -- When a creature with converted mana cost 6 or more enters the battlefield, you may return Dragon Scales from your graveyard to the battlefield attached to that creature.
+mana={1}{W}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
+name=Dragon Shadow
+target=creature
+auto=fear
+auto=1/0
+autograveyard=@movedto(creature[power >=6]|mybattlefield):may all(trigger[to]) retarget
+text=Enchant creature -- Enchanted creature gets +1/+0 and has fear. (It can't be blocked except by artifact creatures and/or black creatures.) -- When a creature with converted mana cost 6 or more enters the battlefield, you may return Dragon Shadow from your graveyard to the battlefield attached to that creature.
+mana={1}{B}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 name=Dragon Tyrant
 abilities=flying,trample,double strike
 auto=upcost[{R}{R}{R}{R}] moveTo(mygraveyard)
@@ -16503,6 +16558,18 @@ power=2
 toughness=3
 [/card]
 [card]
+name=Dragon Wings
+target=creature
+auto=flying
+auto=1/0
+autohand={1}{U}:cycling
+autograveyard=@movedto(creature[power >=6]|mybattlefield):may all(trigger[to]) retarget
+text=Enchant creature -- Enchanted creature has flying. -- Cycling {1}{U} ({1}{U}, Discard this card: Draw a card.) -- When a creature with converted mana cost 6 or more enters the battlefield, you may return Dragon Wings from your graveyard to the battlefield attached to that creature.
+mana={1}{U}
+type=Enchantment
+subtype=Aura
+[/card]
+[card]
 name=Dragon's Claw
 auto=@movedTo(*[red]|stack):may life:1 controller
 text=Whenever a player casts a red spell, you may gain 1 life.
@@ -26760,6 +26827,17 @@ power=1
 toughness=3
 [/card]
 [card]
+name=Grifter's Blade
+abilities=flash
+auto={1}:equip
+auto=1/1
+auto=attach target(creature|mybattlefield)
+text=Flash -- As Grifter's Blade enters the battlefield, choose a creature you control it could be attached to. If you do, it enters the battlefield attached to that creature. -- Equipped creature gets +1/+1. -- Equip {1}
+mana={3}
+type=Artifact
+subtype=Equipment
+[/card]
+[card]
 name=Grim Feast
 auto=@each my upkeep:damage:1 controller
 auto=@movedTo(creature|opponentgraveyard) from(battlefield):all(trigger[to]) dynamicability<!mytgt toughnesslifegain srccontroller!>
@@ -43287,6 +43365,17 @@ power=1
 toughness=1
 [/card]
 [card]
+name=Obsidian Battle-Axe
+auto={3}:equip
+auto=2/1
+auto=haste
+auto=@movedto(creature[warrior]|battlefield):may all(trigger[to]) retarget
+text=Equipped creature gets +2/+1 and has haste. -- Whenever a Warrior creature enters the battlefield, you may attach Obsidian Battle-Axe to it. -- Equip {3}
+mana={3}
+type=Tribal Artifact
+subtype=Warrior Equipment
+[/card]
+[card]
 name=Obsidian Giant
 mana={4}{R}
 type=Creature
@@ -62364,6 +62453,16 @@ type=Artifact
 subtype=Equipment
 [/card]
 [card]
+name=Sword the Meek
+auto={2}:equip
+auto=1/2
+autograveyard=@movedto(creature[power=1;toughness=1]|mybattlefield):may all(trigger[to]) retarget
+text=Equipped creature gets +1/+2. -- Equip {2} -- Whenever a 1/1 creature enters the battlefield under your control, you may return Sword of the Meek from your graveyard to the battlefield, then attach it to that creature.
+mana={2}
+type=Artifact
+subtype=Equipment
+[/card]
+[card]
 name=Sword of Vengeance
 auto={3}:equip
 auto=2/0
@@ -68763,6 +68862,17 @@ text=You may have Vesuva enter the battlefield tapped as a copy of any land on t
 type=Land
 [/card]
 [card]
+name=Veteran's Armaments
+auto={2}:equip
+auto=@attacking(mytgt):all(trigger[to]) foreach(creature[attacking]|battlefield) 1/1 ueot
+auto=@blocking(mytgt):all(trigger[to]) foreach(creature[attacking]|battlefield) 1/1 ueot
+auto=@movedto(creature[soldier]|battlefield):may all(trigger[to]) retarget
+text=Equipped creature has "Whenever this creature attacks or blocks, it gets +1/+1 until end of turn for each attacking creature." -- Whenever a Soldier creature enters the battlefield, you may attach Veteran's Armaments to it. -- Equip {2}
+mana={2}
+type=Tribal Artifact
+subtype=Soldier Equipment
+[/card]
+[card]
 name=Veteran Armorer
 auto=lord(creature|myBattlefield) 0/1 other
 text=Other creatures you control get +0/+1.