diff --git a/projects/mtg/bin/Res/sets/mtg_todo.dat b/projects/mtg/bin/Res/sets/mtg_todo.dat
index 63e123154..921ab69f3 100644
--- a/projects/mtg/bin/Res/sets/mtg_todo.dat
+++ b/projects/mtg/bin/Res/sets/mtg_todo.dat
@@ -5902,15 +5902,6 @@ type=Instant
 subtype=Arcane
 [/card]
 [card]
-name=Charging Rhino
-text=Charging Rhino can't be blocked by more than one creature.
-mana={3}{G}{G}
-type=Creature
-subtype=Rhino
-power=4
-toughness=4
-[/card]
-[card]
 name=Charging Slateback
 text=Charging Slateback can't block. -- Morph {4}{R} (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)
 mana={4}{R}
@@ -12338,12 +12329,6 @@ mana={W}
 type=Sorcery
 [/card]
 [card]
-name=Familiar Ground
-text=Each creature you control can't be blocked by more than one creature.
-mana={2}{G}
-type=Enchantment
-[/card]
-[card]
 name=Familiar's Ruse
 text=As an additional cost to cast Familiar's Ruse, return a creature you control to its owner's hand. -- Counter target spell.
 mana={U}{U}
@@ -17921,15 +17906,6 @@ text=Hideaway (This land enters the battlefield tapped. When it does, look at th
 type=Land
 [/card]
 [card]
-name=Huang Zhong, Shu General
-text=Huang Zhong, Shu General can't be blocked by more than one creature.
-mana={2}{W}{W}
-type=Legendary Creature
-subtype=Human Soldier
-power=2
-toughness=3
-[/card]
-[card]
 name=Hull Breach
 text=Choose one - Destroy target artifact; or destroy target enchantment; or destroy target artifact and target enchantment.
 mana={R}{G}
@@ -19220,15 +19196,6 @@ power=2
 toughness=4
 [/card]
 [card]
-name=Ironhoof Ox
-text=Ironhoof Ox can't be blocked by more than one creature.
-mana={3}{G}{G}
-type=Creature
-subtype=Ox
-power=4
-toughness=4
-[/card]
-[card]
 name=Island of Wak-Wak
 text={T}: The power of target creature with flying becomes 0 until end of turn.
 type=Land
@@ -26614,15 +26581,6 @@ mana={4}
 type=Artifact
 [/card]
 [card]
-name=Norwood Riders
-text=Norwood Riders can't be blocked by more than one creature.
-mana={3}{G}
-type=Creature
-subtype=Elf
-power=3
-toughness=3
-[/card]
-[card]
 name=Nostalgic Dreams
 text=As an additional cost to cast Nostalgic Dreams, discard X cards. -- Return X target cards from your graveyard to your hand. Exile Nostalgic Dreams.
 mana={G}{G}
@@ -43521,13 +43479,6 @@ power=4
 toughness=4
 [/card]
 [card]
-name=Vorrac Battlehorns
-text=Equipped creature has trample and can't be blocked by more than one creature. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
-mana={2}
-type=Artifact
-subtype=Equipment
-[/card]
-[card]
 name=Voyager Drake
 text=Multikicker {U} (You may pay an additional {U} any number of times as you cast this spell.) -- Flying -- When Voyager Drake enters the battlefield, up to X target creatures gain flying until end of turn, where X is the number of times Voyager Drake was kicked.
 mana={3}{U}
@@ -45543,15 +45494,6 @@ power=5
 toughness=5
 [/card]
 [card]
-name=Yuan Shao, the Indecisive
-text=Horsemanship (This creature can't be blocked except by creatures with horsemanship.) -- Each creature you control can't be blocked by more than one creature.
-mana={4}{R}
-type=Legendary Creature
-subtype=Human Soldier
-power=2
-toughness=3
-[/card]
-[card]
 name=Zanam Djinn
 text=Flying -- Zanam Djinn gets -2/-2 as long as blue is the most common color among all permanents or is tied for most common.
 mana={5}{U}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 045abc70e..f8d4e6610 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -6278,6 +6278,16 @@ power=3
 toughness=3
 [/card]
 [card]
+name=Charging Rhino
+text=Charging Rhino can't be blocked by more than one creature.
+mana={3}{G}{G}
+type=Creature
+abilities=oneblocker
+subtype=Rhino
+power=4
+toughness=4
+[/card]
+[card]
 name=Charging Paladin
 auto=lord(charging paladin[attacking]|myBattlefield) 0/3
 auto=lord(other charging paladin[attacking]|myBattlefield) 0/-3
@@ -12531,6 +12541,13 @@ mana={1}{R}
 type=Instant
 [/card]
 [card]
+name=Familiar Ground
+text=Each creature you control can't be blocked by more than one creature.
+mana={2}{G}
+type=Enchantment
+auto=lord(creature|myBattlefield) oneblocker
+[/card]
+[card]
 name=Famine
 auto=damage:3 all(creature,player)
 text=Famine deals 3 damage to each creature and each player.
@@ -18115,6 +18132,16 @@ power=5
 toughness=5
 [/card]
 [card]
+name=Huang Zhong, Shu General
+text=Huang Zhong, Shu General can't be blocked by more than one creature.
+mana={2}{W}{W}
+type=Legendary Creature
+subtype=Human Soldier
+abilities=oneblocker
+power=2
+toughness=3
+[/card]
+[card]
 name=Hulking Goblin
 abilities=cantblock
 text=Hulking Goblin can't block.
@@ -19039,6 +19066,16 @@ power=2
 toughness=2
 [/card]
 [card]
+name=Ironhoof Ox
+text=Ironhoof Ox can't be blocked by more than one creature.
+mana={3}{G}{G}
+type=Creature
+subtype=Ox
+power=4
+toughness=4
+abilities=oneblocker
+[/card]
+[card]
 name=Ironroot Treefolk
 mana={4}{G}
 type=Creature
@@ -26211,6 +26248,16 @@ power=1
 toughness=2
 [/card]
 [card]
+name=Norwood Riders
+text=Norwood Riders can't be blocked by more than one creature.
+mana={3}{G}
+type=Creature
+subtype=Elf
+abilities=oneblocker
+power=3
+toughness=3
+[/card]
+[card]
 name=Norwood Warrior
 auto=rampage(1/1,0)
 auto=rampage(-1/-1,1)
@@ -42574,6 +42621,15 @@ power=6
 toughness=6
 [/card]
 [card]
+name=Vorrac Battlehorns
+auto={1}:equip
+auto=oneblocker
+text=Equipped creature has trample and can't be blocked by more than one creature. -- Equip {1} ({1}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.)
+mana={2}
+type=Artifact
+subtype=Equipment
+[/card]
+[card]
 name=Vorosh the Hunter
 #The comma needed to be stripped from the name to make the card work.
 #Reintroducing it requires an update to PLC/_cards.dat as well.
@@ -44905,6 +44961,16 @@ power=2
 toughness=1
 [/card]
 [card]
+name=Yuan Shao, the Indecisive
+text=Horsemanship (This creature can't be blocked except by creatures with horsemanship.) -- Each creature you control can't be blocked by more than one creature.
+mana={4}{R}
+type=Legendary Creature
+subtype=Human Soldier
+auto=lord(creature|myBattlefield) oneblocker
+power=2
+toughness=3
+[/card]
+[card]
 name=Yuan Shao's Infantry
 abilities=unblockable
 auto=aslongas(other creature[attacking]|myBattlefield) -unblockable