diff --git a/res/cardsfolder/brainstorm.txt b/res/cardsfolder/brainstorm.txt
index 2d74bef46d6..81fb3994e0e 100644
--- a/res/cardsfolder/brainstorm.txt
+++ b/res/cardsfolder/brainstorm.txt
@@ -2,7 +2,7 @@ Name:Brainstorm
 ManaCost:U
 Types:Instant
 Text:no text
-K:spDrawCards:3:Drawback$YouHandToLibrary/2/Top:Draw three cards, then put two cards from your hand on top of your library in any order.:Brainstorm - draw 3 cards and put 2 on top of your library.
+A:SP$Draw | Cost$ U | NumCards$ 3 | SpellDescription$ Draw three cards, then put two cards from your hand on top of your library in any order. | SubAbility$ YouHandToLibrary/2/Top
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brainstorm.jpg
 End
diff --git a/res/cardsfolder/careful_study.txt b/res/cardsfolder/careful_study.txt
index 3f6f94f14eb..94f21995855 100644
--- a/res/cardsfolder/careful_study.txt
+++ b/res/cardsfolder/careful_study.txt
@@ -2,7 +2,7 @@ Name:Careful Study
 ManaCost:U
 Types:Sorcery
 Text:no text
-K:spDrawCards:2:Drawback$YouDiscard/2:Draw two cards, then discard two cards.:Careful Study - Draw 2 cards, then discard 2 cards.
+A:SP$Draw | Cost$ U | NumCards$ 2 | SpellDescription$ Draw two cards, then discard two cards. | SubAbility$ YouDiscard/2
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/careful_study.jpg
 End
diff --git a/res/cardsfolder/catalog.txt b/res/cardsfolder/catalog.txt
index 78d6ade5df9..f127ccd3ae2 100644
--- a/res/cardsfolder/catalog.txt
+++ b/res/cardsfolder/catalog.txt
@@ -2,7 +2,7 @@ Name:Catalog
 ManaCost:2 U
 Types:Instant
 Text:no text
-K:spDrawCards:2:Drawback$YouDiscard/1:Draw two cards, then discard a card.:Catalog - Draw 2 cards, then discard 1 card.
+A:SP$Draw | Cost$ 2 U | NumCards$ 2 | SpellDescription$ Draw two cards, then discard a card. | SubAbility$ YouDiscard/1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/catalog.jpg
 End