diff --git a/tokens.xml b/tokens.xml
index 44d84ca..c9b6254 100644
--- a/tokens.xml
+++ b/tokens.xml
@@ -516,7 +516,7 @@
         </card>
         <card>
             <name>Carnivore</name>
-            <set picURL="http://cdn.staticneo.com/w/mtg/8/8f/Carnivore.jpg">TMP</set>
+            <set picURL="http://media.wizards.com/2016/adhfianalodifdj2_EMA/en_PHBsdfmt0I.png">EMA</set>
             <color>R</color>
             <manacost></manacost>
             <type>Token Creature — Beast</type>
@@ -901,6 +901,7 @@ Cloud Sprite can block only creatures with flying.</text>
         </card>
         <card>
             <name>Dragon    </name>
+            <set picURL="http://media.wizards.com/2016/adhfianalodifdj2_EMA/en_K2g14Mh1K4.png">EMA</set>
             <set picURL="http://media.wizards.com/images/magic/daily/arcana/0007_MTGM15_TOK_EN%20copy.png">M15</set>
             <set picURL="http://magiccards.info/extras/token/magic-2014/dragon.jpg">M14</set>
             <color>R</color>
@@ -1110,6 +1111,7 @@ Cloud Sprite can block only creatures with flying.</text>
         </card>
         <card>
             <name>Elemental</name>
+            <set picURL="http://media.wizards.com/2016/adhfianalodifdj2_EMA/en_43rUaKSbgs.png">EMA</set>
             <set picURL="http://magiccards.info/extras/token/magic-2014/elemental-1.jpg">M14</set>
             <color>R</color>
             <manacost></manacost>
@@ -1194,7 +1196,6 @@ Cloud Sprite can block only creatures with flying.</text>
         <card>
             <name>Elemental        </name>
             <set picURL="http://media.wizards.com/2015/ogw_239nCi30ks3/en_P1vyxE48Sl.png">OGW</set>
-            <set picURL="http://cdn.staticneo.com/w/mtg/3/38/Elemental4.jpg">CHK</set>
             <color>G</color>
             <manacost></manacost>
             <type>Token Creature — Elemental</type>
@@ -1257,6 +1258,7 @@ Cloud Sprite can block only creatures with flying.</text>
         </card>
         <card>
             <name>Elemental             </name>
+            <set picURL="http://media.wizards.com/2016/adhfianalodifdj2_EMA/en_QkXPO6OqIO.png">EMA</set>
             <set picURL="http://media.wizards.com/2015/c15_9dsm28ccakCDSk2/en_l280zeUKr7.png">C15</set>
             <set picURL="http://magiccards.info/extras/token/eventide/elemental.jpg">EVE</set>
             <color>U</color>
@@ -1410,6 +1412,7 @@ Cloud Sprite can block only creatures with flying.</text>
         </card>
         <card>
             <name>Elephant</name>
+            <set picURL="http://media.wizards.com/2016/adhfianalodifdj2_EMA/en_cQ9QQhPytK.png">EMA</set>
             <set picURL="http://media.wizards.com/2015/c15_9dsm28ccakCDSk2/en_F7cegsyXsw.png">C15</set>
             <set picURL="http://media.wizards.com/2015/mm2_9vgauji43t9a/en_tf0WqzqwuA.png">MM2</set>
             <set picURL="http://magiccards.info/extras/token/commander-2014/elephant.jpg">C14</set>
@@ -1449,6 +1452,7 @@ Cloud Sprite can block only creatures with flying.</text>
         </card>
         <card>
             <name>Elf Warrior</name>
+            <set picURL="http://media.wizards.com/2016/adhfianalodifdj2_EMA/en_5V69YTP0YA.png">EMA</set>
             <set picURL="http://media.wizards.com/2015/images/daily/en_1pdn4qr9ho.png">ORI</set>
             <set picURL="http://magiccards.info/extras/token/commander-2014/elf-warrior.jpg">C14</set>
             <set picURL="http://magiccards.info/extras/token/shadowmoor/elf-warrior-1.jpg">SHM</set>
@@ -1671,6 +1675,7 @@ Cloud Sprite can block only creatures with flying.</text>
         </card>
         <card>
             <name>Goblin</name>
+            <set picURL="http://media.wizards.com/2016/adhfianalodifdj2_EMA/en_aYWcAETlLv.png">EMA</set>
             <set picURL="http://media.wizards.com/2015/images/daily/en_vr1ovlnd3s.png">ORI</set>
             <set picURL="http://magiccards.info/extras/token/dragons-of-tarkir/goblin.jpg">DTK</set>
             <set picURL="http://magiccards.info/extras/token/commander-2014/goblin.jpg">C14</set>
@@ -1764,6 +1769,7 @@ Cloud Sprite can block only creatures with flying.</text>
         </card>
         <card>
             <name>Goblin Soldier</name>
+            <set picURL="http://media.wizards.com/2016/adhfianalodifdj2_EMA/en_fhdI96oKsU.png">EMA</set>
             <set picURL="http://magiccards.info/extras/token/eventide/goblin-soldier.jpg">EVE</set>
             <set picURL="http://magiccards.info/extras/token/player-rewards-2001/goblin-soldier.jpg">APC</set>
             <color>R</color>
@@ -2729,7 +2735,6 @@ A card with morph can be turned face up any time for its morph cost.)</text>
         <card>
             <name>Pegasus</name>
             <set picURL="http://magiccards.info/extras/token/commander-2014/pegasus.jpg">C14</set>
-            <set picURL="http://cdn.staticneo.com/w/mtg/d/dc/Pegasus2.jpg">GPT</set>
             <color>W</color>
             <manacost></manacost>
             <type>Token Creature — Pegasus</type>
@@ -3009,7 +3014,7 @@ A card with morph can be turned face up any time for its morph cost.)</text>
         </card>
         <card>
             <name>Serf</name>
-            <set picURL="http://cdn.staticneo.com/w/mtg/7/75/Serf.jpg">TSB</set>
+            <set picURL="http://media.wizards.com/2016/adhfianalodifdj2_EMA/en_UwZdI8LJ0u.png">EMA</set>
             <color>B</color>
             <manacost></manacost>
             <type>Token Creature — Serf</type>
@@ -3112,7 +3117,6 @@ A card with morph can be turned face up any time for its morph cost.)</text>
         <card>
             <name>Snake  </name>
             <set picURL="http://media.wizards.com/2015/c15_9dsm28ccakCDSk2/en_JIyE6GkvUc.png">C15</set>
-            <set picURL="http://i1013.photobucket.com/albums/af260/lovesoldier99/Snake2.png">DIS</set>
             <color>G</color>
             <color>U</color>
             <manacost></manacost>
@@ -3150,6 +3154,7 @@ A card with morph can be turned face up any time for its morph cost.)</text>
         </card>
         <card>
             <name>Soldier</name>
+            <set picURL="http://media.wizards.com/2016/adhfianalodifdj2_EMA/en_xvaBbBCiuf.png">EMA</set>
             <set picURL="http://media.wizards.com/2015/images/daily/en_5n24neg1wf.png">ORI</set>
             <set picURL="http://media.wizards.com/2015/mm2_9vgauji43t9a/en_vIxQpTbO6b.png">MM2</set>
             <set picURL="http://magiccards.info/extras/token/commander-2014/soldier.jpg">C14</set>
@@ -3347,6 +3352,7 @@ At the beginning of the end step, sacrifice Spark Elemental.</text>
         </card>
         <card>
             <name>Spirit</name>
+            <set picURL="http://media.wizards.com/2016/adhfianalodifdj2_EMA/en_cxaUJXygwx.png">EMA</set>
             <set picURL="http://media.wizards.com/2016/aksdjciawolkcc0_soi/en_2dPK4cEymD.png">SOI</set>
             <set picURL="http://media.wizards.com/2015/mm2_9vgauji43t9a/en_E3hF5KOp1J.png">MM2</set>
             <set picURL="http://magiccards.info/extras/token/fate-reforged/spirit.jpg">FRF</set>
@@ -3436,6 +3442,7 @@ At the beginning of the end step, sacrifice Spark Elemental.</text>
         </card>
         <card>
             <name>Spirit   </name>
+            <set picURL="http://media.wizards.com/2016/adhfianalodifdj2_EMA/en_qQaHPqyjyC.png">EMA</set>
             <set picURL="http://magiccards.info/extras/token/player-rewards-2004/spirit.jpg">CHK</set>
             <manacost></manacost>
             <type>Token Creature — Spirit</type>
@@ -3665,7 +3672,6 @@ This creature can't be enchanted.</text>
         <card>
             <name>Thrull </name>
             <set picURL="http://media.wizards.com/2015/mm2_9vgauji43t9a/en_lDMIi3XONu.png">MM2</set>
-            <set picURL="http://cdn.staticneo.com/w/mtg/e/e3/Thrull.jpg">TSP</set>
             <color>B</color>
             <manacost></manacost>
             <type>Token Creature — Thrull</type>
@@ -3849,7 +3855,7 @@ Sacrifice this creature: This creature deals 1 damage to target creature or play
         </card>
         <card>
             <name>Wall </name>
-            <set picURL="http://cdn.staticneo.com/w/mtg/6/67/Wall.jpg">MIR</set>
+            <set picURL="http://media.wizards.com/2016/adhfianalodifdj2_EMA/en_biVLwMvOWF.png">EMA</set>
             <color>U</color>
             <manacost></manacost>
             <type>Token Creature — Wall</type>
@@ -4060,6 +4066,7 @@ Sacrifice this creature: This creature deals 1 damage to target creature or play
         </card>
         <card>
             <name>Wurm</name>
+            <set picURL="http://media.wizards.com/2016/adhfianalodifdj2_EMA/en_gVChXwjDd1.png">EMA</set>
             <set picURL="http://magiccards.info/extras/token/magic-2013/wurm.jpg">M13</set>
             <set picURL="http://magiccards.info/extras/token/magic-2012/wurm.jpg">M12</set>
             <set picURL="http://magiccards.info/extras/token/player-rewards-2002/wurm.jpg">ODY</set>
@@ -4140,6 +4147,7 @@ Sacrifice this creature: This creature deals 1 damage to target creature or play
         </card>
         <card>
             <name>Zombie</name>
+            <set picURL="http://media.wizards.com/2016/adhfianalodifdj2_EMA/en_bsHDG8OapS.png">EMA</set>
             <set picURL="http://media.wizards.com/2016/aksdjciawolkcc0_soi/en_Hys6V2Lnum.png">SOI</set>
             <set picURL="http://media.wizards.com/2015/ogw_239nCi30ks3/en_uoBpnCUEg1.png">OGW</set>
             <set picURL="http://media.wizards.com/2015/c15_9dsm28ccakCDSk2/en_jVoQGXYWRq.png">C15</set>
@@ -4326,6 +4334,7 @@ Sacrifice this creature: This creature deals 1 damage to target creature or play
         </card>
         <card>
             <name>Dack Fayden (emblem)</name>
+            <set picURL="http://media.wizards.com/2016/adhfianalodifdj2_EMA/en_KZQONbOfjg.png">EMA</set>
             <set picURL="http://magiccards.info/extras/token/conspiracy/emblem-dack-fayden.jpg">CNS</set>
             <manacost></manacost>
             <type>Emblem — Dack</type>