diff --git a/forge-gui/res/cardsfolder/b/blazing_blade_askari.txt b/forge-gui/res/cardsfolder/b/blazing_blade_askari.txt
index 66939dbd972..f666f4f7ec2 100644
--- a/forge-gui/res/cardsfolder/b/blazing_blade_askari.txt
+++ b/forge-gui/res/cardsfolder/b/blazing_blade_askari.txt
@@ -3,6 +3,6 @@ ManaCost:2 R
 Types:Creature Human Knight
 PT:2/2
 K:Flanking
-A:AB$ Animate | Cost$ 2 | Defined$ Card.Self | Colors$ Colorless | SpellDescription$ CARDNAME becomes colorless until end of turn.
+A:AB$ Animate | Cost$ 2 | Defined$ Card.Self | Colors$ Colorless | OverwriteColors$ True | SpellDescription$ CARDNAME becomes colorless until end of turn.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blazing_blade_askari.jpg
 Oracle:Flanking (Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn.)\n{2}: Blazing Blade Askari becomes colorless until end of turn.
diff --git a/forge-gui/res/draft/rankings.txt b/forge-gui/res/draft/rankings.txt
index 93390110cd0..573704b6d22 100644
--- a/forge-gui/res/draft/rankings.txt
+++ b/forge-gui/res/draft/rankings.txt
@@ -1,3 +1,252 @@
+#1|Jace, the Mind Sculptor|M|A25
+#2|Niv-Mizzet, the Firemind|R|A25
+#3|Gisela, Blade of Goldnight|M|A25
+#4|Akroma, Angel of Fury|R|A25
+#5|Laquatus's Champion|R|A25
+#6|Master of the Wild Hunt|M|A25
+#7|Prossh, Skyraider of Kher|M|A25
+#8|Vindicate|R|A25
+#9|Swords to Plowshares|U|A25
+#10|Courser of Kruphix|R|A25
+#11|Ruric Thar, the Unbowed|R|A25
+#12|Vendilion Clique|M|A25
+#13|Brion Stoutarm|R|A25
+#14|Grenzo, Dungeon Warden|R|A25
+#15|Lightning Bolt|U|A25
+#16|Rancor|U|A25
+#17|Pernicious Deed|R|A25
+#18|Armageddon|M|A25
+#19|Darien, King of Kjeldor|R|A25
+#20|Vesuvan Shapeshifter|R|A25
+#21|Ravenous Chupacabra|U|A25
+#22|Protean Hulk|R|A25
+#23|Akroma, Angel of Wrath|M|A25
+#24|Luminarch Ascension|R|A25
+#25|Magus of the Wheel|R|A25
+#26|Tree of Redemption|M|A25
+#27|Coalition Relic|R|A25
+#28|Akroma's Vengeance|R|A25
+#29|Murder|C|A25
+#30|Mystic Snake|R|A25
+#31|Pillory of the Sleepless|U|A25
+#32|Pacifism|C|A25
+#33|Fortune Thief|R|A25
+#34|Baloth Null|U|A25
+#35|Cloudblazer|U|A25
+#36|Decree of Justice|R|A25
+#37|Bident of Thassa|R|A25
+#38|Fiend Hunter|U|A25
+#39|Merfolk Looter|U|A25
+#40|Living Death|R|A25
+#41|Doomsday|M|A25
+#42|Quicksilver Dagger|U|A25
+#43|Sundering Titan|R|A25
+#44|Pact of Negation|R|A25
+#45|Eidolon of the Great Revel|R|A25
+#46|Kindle|C|A25
+#47|Eladamri's Call|R|A25
+#48|Shadowmage Infiltrator|U|A25
+#49|Thalia, Guardian of Thraben|R|A25
+#50|Blue Sun's Zenith|R|A25
+#51|Man-o'-War|C|A25
+#52|Zombify|U|A25
+#53|Chandra's Outrage|C|A25
+#54|Ire Shaman|U|A25
+#55|Zada, Hedron Grinder|U|A25
+#56|Epic Confrontation|C|A25
+#57|Boros Charm|U|A25
+#58|Murder of Crows|U|A25
+#59|Hordeling Outburst|C|A25
+#60|Krosan Tusker|U|A25
+#61|Summoner's Pact|R|A25
+#62|Urbis Protector|U|A25
+#63|Counterspell|C|A25
+#64|Fallen Angel|U|A25
+#65|Phyrexian Obliterator|M|A25
+#66|Ruthless Ripper|C|A25
+#67|Undead Gladiator|U|A25
+#68|Pyroclasm|U|A25
+#69|Skeletonize|C|A25
+#70|Regrowth|U|A25
+#71|Nicol Bolas|R|A25
+#72|Treasure Keeper|U|A25
+#73|Kongming, Sleeping Dragon|U|A25
+#74|Court Hussar|C|A25
+#75|Exclude|U|A25
+#76|Disfigure|C|A25
+#77|Ratcatcher|R|A25
+#78|Izzet Chemister|R|A25
+#79|Arbor Elf|C|A25
+#80|Azusa, Lost but Seeking|R|A25
+#81|Utopia Sprawl|U|A25
+#82|Blightning|U|A25
+#83|Hanna, Ship's Navigator|R|A25
+#84|Watchwolf|U|A25
+#85|Rishadan Port|R|A25
+#86|Mishra's Factory|U|A25
+#87|Nyx-Fleece Ram|U|A25
+#88|Path of Peace|C|A25
+#89|Brine Elemental|U|A25
+#90|Genju of the Falls|U|A25
+#91|Reef Worm|R|A25
+#92|Caustic Tar|U|A25
+#93|Deadly Designs|U|A25
+#94|Phyrexian Ghoul|C|A25
+#95|Triskaidekaphobia|R|A25
+#96|Twisted Abomination|C|A25
+#97|Genju of the Spires|U|A25
+#98|Ainok Survivalist|C|A25
+#99|Ember Weaver|C|A25
+#100|Iwamori of the Open Fist|U|A25
+#101|Lorescale Coatl|U|A25
+#102|Stangg|U|A25
+#103|Dauntless Cathar|C|A25
+#104|Geist of the Moors|C|A25
+#105|Karona's Zealot|U|A25
+#106|Kor Firewalker|U|A25
+#107|Noble Templar|C|A25
+#108|Arcane Denial|C|A25
+#109|Freed from the Real|U|A25
+#110|Horseshoe Crab|C|A25
+#111|Jalira, Master Polymorphist|U|A25
+#112|Shoreline Ranger|C|A25
+#113|Bloodhunter Bat|C|A25
+#114|Diabolic Edict|C|A25
+#115|Dusk Legion Zealot|C|A25
+#116|Hell's Caretaker|R|A25
+#117|Ihsan's Shade|U|A25
+#118|Mesmeric Fiend|U|A25
+#119|Zulaport Cutthroat|U|A25
+#120|Chartooth Cougar|C|A25
+#121|Enthralling Victor|U|A25
+#122|Goblin War Drums|U|A25
+#123|Ambassador Oak|C|A25
+#124|Elvish Aberration|C|A25
+#125|Elvish Piper|R|A25
+#126|Kavu Climber|C|A25
+#127|Presence of Gond|C|A25
+#128|Animar, Soul of Elements|M|A25
+#129|Ensnaring Bridge|M|A25
+#130|Fetid Heath|R|A25
+#131|Twilight Mire|R|A25
+#132|Cascade Bluffs|R|A25
+#133|Rugged Prairie|R|A25
+#134|Flooded Grove|R|A25
+#135|Pendelhaven|R|A25
+#136|Angelic Page|U|A25
+#137|Fencing Ace|C|A25
+#138|Valor in Akros|U|A25
+#139|Accumulated Knowledge|C|A25
+#140|Brainstorm|U|A25
+#141|Curiosity|U|A25
+#142|Ghost Ship|C|A25
+#143|Mystic of the Hidden Way|C|A25
+#144|Sift|C|A25
+#145|Willbender|U|A25
+#146|Plague Wind|R|A25
+#147|Frenzied Goblin|C|A25
+#148|Imperial Recruiter|M|A25
+#149|Pyre Hound|C|A25
+#150|Spikeshot Goblin|U|A25
+#151|Broodhatch Nantuko|U|A25
+#152|Fierce Empath|U|A25
+#153|Invigorate|U|A25
+#154|Wildheart Invoker|C|A25
+#155|Woolly Loxodon|C|A25
+#156|Gods Willing|C|A25
+#157|Griffin Protector|C|A25
+#158|Squadron Hawk|C|A25
+#159|Retraction Helix|C|A25
+#160|Returned Phalanx|C|A25
+#161|Balduvian Horde|C|A25
+#162|Mogg Flunkies|C|A25
+#163|Skirk Commando|C|A25
+#164|Uncaged fury|C|A25
+#165|Ancient Stirrings|U|A25
+#166|Giant Growth|C|A25
+#167|Sai of the Shinobi|U|A25
+#168|Cloudshift|C|A25
+#169|Knight of the Skyward Eye|C|A25
+#170|Lunarch Mantle|C|A25
+#171|Promise of Bunrei|U|A25
+#172|Whitemane Lion|C|A25
+#173|Fathom Seer|C|A25
+#174|Dark Ritual|C|A25
+#175|Death's-Head Buzzard|C|A25
+#176|Dirge of Dread|C|A25
+#177|Horror of the Broken Lands|C|A25
+#178|Nezumi Cutthroat|C|A25
+#179|Street Wraith|U|A25
+#180|Unearth|C|A25
+#181|Will-o'-the-Wisp|U|A25
+#182|Act of Treason|C|A25
+#183|Cinder Storm|C|A25
+#184|Pillage|C|A25
+#185|Trumpet Blast|C|A25
+#186|Colossal Dreadmaw|C|A25
+#187|Echoing Courage|C|A25
+#188|Timberpack Wolf|C|A25
+#189|Notion Thief|R|A25
+#190|Prophetic Prism|C|A25
+#191|Swiftfoot Boots|U|A25
+#192|Ash Barrens|U|A25
+#193|Auramancer|C|A25
+#194|Loyal Sentry|C|A25
+#195|Ordeal of Heliod|U|A25
+#196|Savannah Lions|C|A25
+#197|Blue Elemental Blast|U|A25
+#198|Dragon's Eye Savants|C|A25
+#199|Phantasmal Bear|C|A25
+#200|Totally Lost|C|A25
+#201|Twisted Image|U|A25
+#202|Ancient Craving|U|A25
+#203|Erg Raiders|C|A25
+#204|Supernatural Stamina|C|A25
+#205|Vampire Lacerator|C|A25
+#206|Ball Lightning|R|A25
+#207|Humble Defector|U|A25
+#208|Jackal Pup|C|A25
+#209|Red Elemental Blast|U|A25
+#210|Soulbright Flamekin|C|A25
+#211|Thresher Lizard|C|A25
+#212|Cultivate|C|A25
+#213|Kavu Predator|U|A25
+#214|Living Wish|R|A25
+#215|Stampede Driver|U|A25
+#216|Perilous Myr|U|A25
+#217|Act of Heroism|C|A25
+#218|Renewed Faith|C|A25
+#219|Choking Tethers|C|A25
+#220|Cursecatcher|U|A25
+#221|Flash|R|A25
+#222|Blood Moon|R|A25
+#223|Crimson Mage|C|A25
+#224|Krosan Colossus|U|A25
+#225|Nettle Sentinel|C|A25
+#226|Vessel of Nascency|C|A25
+#227|Chalice of the Void|M|A25
+#228|Heavy Arbalest|U|A25
+#229|Self-Assembler|C|A25
+#230|Strionic Resonator|R|A25
+#231|Quicksand|U|A25
+#232|Congregate|C|A25
+#233|Disenchant|C|A25
+#234|Coralhelm Guide|C|A25
+#235|Lull|C|A25
+#236|Plummet|C|A25
+#237|Assembly-Worker|C|A25
+#238|Nihil Spellbomb|C|A25
+#239|Haunted Fengraf|C|A25
+#240|Zoetic Cavern|U|A25
+#241|Borrowing 100,000 Arrows|C|A25
+#242|Browbeat|U|A25
+#243|Primal Clay|C|A25
+#244|Myriad Landscape|U|A25
+#245|Rest in Peace|R|A25
+#246|Relentless Rats|C|A25
+#247|Simian Spirit Guide|U|A25
+#248|Mikokoro, Center of the Sea|R|A25
+#249|Conflux|M|A25
 //Rank|Name|Rarity|Set
 #1|Tetzimoc, Primal Death|R|RIX
 #2|Azor, the Lawbringer|M|RIX
diff --git a/forge-gui/res/editions/Masters 25.txt b/forge-gui/res/editions/Masters 25.txt
index b2a903e13bf..b6e4bef4002 100644
--- a/forge-gui/res/editions/Masters 25.txt	
+++ b/forge-gui/res/editions/Masters 25.txt	
@@ -4,12 +4,257 @@ Code=A25
 Date=2018-03-16
 MciCode=a25
 Type=Reprint
-#BoosterCovers=3
-#Booster=11 Common, 3 Uncommon, 1 RareMythic
-#FoilChanceInBooster=100
+BoosterCovers=3
+Booster=11 Common, 3 Uncommon, 1 RareMythic
+FoilChanceInBooster=100
 
 [cards]
-
+1 C Act of Heroism
+2 M Akroma, Angel of Wrath
+3 R Akroma's Vengeance
+4 U Angelic Page
+5 M Armageddon
+6 C Auramancer
+7 C Cloudshift
+8 C Congregate
+9 R Darien, King of Kjeldor
+10 C Dauntless Cathar
+11 R Decree of Justice
+12 C Disenchant
+13 C Fencing Ace
+14 U Fiend Hunter
+15 C Geist of the Moors
+16 C Gods Willing
+17 C Griffin Protector
+18 U Karona's Zealot
+19 C Knight of the Skyward Eye
+20 U Kongming, Sleeping Dragon
+21 U Kor Firewalker
+22 C Loyal Sentry
+23 R Luminarch Ascension
+24 C Lunarch Mantle
+25 C Noble Templar
+26 U Nyx-Fleece Ram
+27 U Ordeal of Heliod
+28 C Pacifism
+29 C Path of Peace
+30 U Promise of Bunrei
+31 C Renewed Faith
+32 R Rest in Peace
+33 C Savannah Lions
+34 C Squadron Hawk
+35 U Swords to Plowshares
+36 R Thalia, Guardian of Thraben
+37 U Urbis Protector
+38 U Valor in Akros
+39 C Whitemane Lion
+40 C Accumulated Knowledge
+41 C Arcane Denial
+42 R Bident of Thassa
+43 U Blue Elemental Blast
+44 R Blue Sun's Zenith
+45 C Borrowing 100,000 Arrows
+46 U Brainstorm
+47 U Brine Elemental
+48 C Choking Tethers
+49 C Coralhelm Guide
+50 C Counterspell
+51 C Court Hussar
+52 U Curiosity
+53 U Cursecatcher
+54 C Dragon's Eye Savants
+55 U Exclude
+56 C Fathom Seer
+57 R Flash
+58 U Freed from the Real
+59 U Genju of the Falls
+60 C Ghost Ship
+61 C Horseshoe Crab
 62 M Jace, the Mind Sculptor
-
-161 R Azusa, Lost but Seeking
\ No newline at end of file
+63 U Jalira, Master Polymorphist
+64 C Man-o'-War
+65 U Merfolk Looter
+66 U Murder of Crows
+67 C Mystic of the Hidden Way
+68 R Pact of Negation
+69 C Phantasmal Bear
+70 R Reef Worm
+71 C Retraction Helix
+72 C Shoreline Ranger
+73 C Sift
+74 C Totally Lost
+75 U Twisted Image
+76 M Vendilion Clique
+77 R Vesuvan Shapeshifter
+78 U Willbender
+79 U Ancient Craving
+80 C Bloodhunter Bat
+81 U Caustic Tar
+82 C Dark Ritual
+83 U Deadly Designs
+84 C Death's-Head Buzzard
+85 C Diabolic Edict
+86 C Dirge of Dread
+87 C Disfigure
+88 M Doomsday
+89 C Dusk Legion Zealot
+90 C Erg Raiders
+91 U Fallen Angel
+92 R Hell's Caretaker
+93 C Horror of the Broken Lands
+94 U Ihsan's Shade
+95 R Laquatus's Champion
+96 R Living Death
+97 U Mesmeric Fiend
+98 C Murder
+99 C Nezumi Cutthroat
+100 C Phyrexian Ghoul
+101 M Phyrexian Obliterator
+102 R Plague Wind
+103 R Ratcatcher
+104 U Ravenous Chupacabra
+105 C Relentless Rats
+106 C Returned Phalanx
+107 C Ruthless Ripper
+108 U Street Wraith
+109 C Supernatural Stamina
+110 R Triskaidekaphobia
+111 C Twisted Abomination
+112 U Undead Gladiator
+113 C Unearth
+114 C Vampire Lacerator
+115 U Will-o'-the-Wisp
+116 U Zombify
+117 U Zulaport Cutthroat
+118 C Act of Treason
+119 R Akroma, Angel of Fury
+120 C Balduvian Horde
+121 R Ball Lightning
+122 R Blood Moon
+123 U Browbeat
+124 C Chandra's Outrage
+125 C Chartooth Cougar
+126 C Cinder Storm
+127 C Crimson Mage
+128 R Eidolon of the Great Revel
+129 U Enthralling Victor
+130 R Fortune Thief
+131 C Frenzied Goblin
+132 U Genju of the Spires
+133 U Goblin War Drums
+134 C Hordeling Outburst
+135 U Humble Defector
+136 M Imperial Recruiter
+137 U Ire Shaman
+138 R Izzet Chemister
+139 C Jackal Pup
+140 C Kindle
+141 U Lightning Bolt
+142 R Magus of the Wheel
+143 C Mogg Flunkies
+144 C Pillage
+145 C Pyre Hound
+146 U Pyroclasm
+147 U Red Elemental Blast
+148 U Simian Spirit Guide
+149 C Skeletonize
+150 C Skirk Commando
+151 C Soulbright Flamekin
+152 U Spikeshot Goblin
+153 C Thresher Lizard
+154 C Trumpet Blast
+155 C Uncaged fury
+156 U Zada, Hedron Grinder
+157 C Ainok Survivalist
+158 C Ambassador Oak
+159 U Ancient Stirrings
+160 C Arbor Elf
+161 R Azusa, Lost but Seeking
+162 U Broodhatch Nantuko
+163 C Colossal Dreadmaw
+164 R Courser of Kruphix
+165 C Cultivate
+166 C Echoing Courage
+167 C Elvish Aberration
+168 R Elvish Piper
+169 C Ember Weaver
+170 C Epic Confrontation
+171 U Fierce Empath
+172 C Giant Growth
+173 U Invigorate
+174 U Iwamori of the Open Fist
+175 C Kavu Climber
+176 U Kavu Predator
+177 U Krosan Colossus
+178 U Krosan Tusker
+179 R Living Wish
+180 C Lull
+181 M Master of the Wild Hunt
+182 C Nettle Sentinel
+183 C Plummet
+184 C Presence of Gond
+185 R Protean Hulk
+186 U Rancor
+187 U Regrowth
+188 U Stampede Driver
+189 R Summoner's Pact
+190 C Timberpack Wolf
+191 M Tree of Redemption
+192 U Utopia Sprawl
+193 C Vessel of Nascency
+194 C Wildheart Invoker
+195 C Woolly Loxodon
+196 M Animar, Soul of Elements
+197 U Baloth Null
+198 U Blightning
+199 U Boros Charm
+200 R Brion Stoutarm
+201 U Cloudblazer
+202 M Conflux
+203 R Eladamri's Call
+204 M Gisela, Blade of Goldnight
+205 R Grenzo, Dungeon Warden
+206 R Hanna, Ship's Navigator
+207 U Lorescale Coatl
+208 R Mystic Snake
+209 R Nicol Bolas
+210 R Niv-Mizzet, the Firemind
+211 R Notion Thief
+212 R Pernicious Deed
+213 U Pillory of the Sleepless
+214 M Prossh, Skyraider of Kher
+215 U Quicksilver Dagger
+216 R Ruric Thar, the Unbowed
+217 U Shadowmage Infiltrator
+218 U Stangg
+219 R Vindicate
+220 U Watchwolf
+221 C Assembly-Worker
+222 M Chalice of the Void
+223 R Coalition Relic
+224 M Ensnaring Bridge
+225 U Heavy Arbalest
+226 C Nihil Spellbomb
+227 U Perilous Myr
+228 C Primal Clay
+229 C Prophetic Prism
+230 U Sai of the Shinobi
+231 C Self-Assembler
+232 R Strionic Resonator
+233 R Sundering Titan
+234 U Swiftfoot Boots
+235 U Treasure Keeper
+236 R Rishadan Port
+237 R Fetid Heath
+238 R Twilight Mire
+239 R Cascade Bluffs
+240 R Rugged Prairie
+241 R Flooded Grove
+242 R Mikokoro, Center of the Sea
+243 R Pendelhaven
+244 U Ash Barrens
+245 U Mishra's Factory
+246 C Haunted Fengraf
+247 U Myriad Landscape
+248 U Quicksand
+249 U Zoetic Cavern
\ No newline at end of file