diff --git a/forge-gui/res/cardsfolder/d/dawn_charm.txt b/forge-gui/res/cardsfolder/d/dawn_charm.txt
index cab84804fdc..83fb836ef09 100644
--- a/forge-gui/res/cardsfolder/d/dawn_charm.txt
+++ b/forge-gui/res/cardsfolder/d/dawn_charm.txt
@@ -1,8 +1,9 @@
 Name:Dawn Charm
 ManaCost:1 W
 Types:Instant
-A:SP$ Fog | Cost$ 1 W | SpellDescription$ Prevent all combat damage that would be dealt this turn; | PrecostDesc$ Choose one -
-A:SP$ Regenerate | Cost$ 1 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ or regenerate target creature;
-A:SP$ Counter | Cost$ 1 W | TargetType$ Spell | TargetValidTargeting$ You | TgtPrompt$ Select target spell that is targeting you | ValidTgts$ Card | SpellDescription$ or counter target spell that targets you.
+A:SP$ Charm | Cost$ 1 W | Choices$ DBFog,DBRegen,DBCounter | SpellDescription$ Choose one - Prevent all combat damage that would be dealt this turn; or regenerate target creature; or counter target spell that targets you.
+SVar:DBFog:DB$ Fog | SpellDescription$ Prevent all combat damage that would be dealt this turn;
+SVar:DBRegen:DB$ Regenerate | ValidTgts$ Creature | TgtPrompt$ Select target creature | SpellDescription$ Regenerate target creature;
+SVar:DBCounter:DB$ Counter | TargetType$ Spell | TargetValidTargeting$ You | TgtPrompt$ Select target spell that is targeting you | ValidTgts$ Card | SpellDescription$ Counter target spell that targets you.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dawn_charm.jpg
 Oracle:Choose one - Prevent all combat damage that would be dealt this turn; or regenerate target creature; or counter target spell that targets you.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/e/emerald_charm.txt b/forge-gui/res/cardsfolder/e/emerald_charm.txt
index 54fbedd161c..05f6f36aae5 100644
--- a/forge-gui/res/cardsfolder/e/emerald_charm.txt
+++ b/forge-gui/res/cardsfolder/e/emerald_charm.txt
@@ -1,9 +1,10 @@
 Name:Emerald Charm
 ManaCost:G
 Types:Instant
-A:SP$ Untap | Cost$ G | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | PrecostDesc$ Choose one - | SpellDescription$ Untap target permanent
-A:SP$ Destroy | Cost$ G | ValidTgts$ Enchantment.nonAura | TgtPrompt$ Select target non-Aura enchantment | PrecostDesc$ or | SpellDescription$ Destroy target non-Aura enchantment
-A:SP$ Debuff | Cost$ G | ValidTgts$ Creature | TgtPrompt$ Select target creature | Keywords$ Flying | PrecostDesc$ or | SpellDescription$ Target creature loses flying until end of turn
+A:SP$ Charm | Cost$ G | Choices$ DBUntap,DBDestroy,DBDebuff | Defined$ You | SpellDescription$ Choose one - Untap target permanent; or destroy target non-Aura enchantment; or target creature loses flying until end of turn.
+SVar:DBUntap:DB$ Untap | ValidTgts$ Permanent | TgtPrompt$ Select target permanent | SpellDescription$ Untap target permanent
+SVar:DBDestroy:DB$ Destroy | ValidTgts$ Enchantment.nonAura | TgtPrompt$ Select target non-Aura enchantment | SpellDescription$ Destroy target non-Aura enchantment
+SVar:DBDebuff:DB$ Debuff | ValidTgts$ Creature | TgtPrompt$ Select target creature | Keywords$ Flying | SpellDescription$ Target creature loses flying until end of turn
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/emerald_charm.jpg
 Oracle:Choose one - Untap target permanent; or destroy target non-Aura enchantment; or target creature loses flying until end of turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/t/thunderbolt.txt b/forge-gui/res/cardsfolder/t/thunderbolt.txt
index db4868462aa..de6297b50da 100644
--- a/forge-gui/res/cardsfolder/t/thunderbolt.txt
+++ b/forge-gui/res/cardsfolder/t/thunderbolt.txt
@@ -1,7 +1,8 @@
 Name:Thunderbolt
 ManaCost:1 R
 Types:Instant
-A:SP$ DealDamage | Cost$ 1 R | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 3 | SpellDescription$ Choose one - CARDNAME deals 3 damage to target player;
-A:SP$ DealDamage | Cost$ 1 R | ValidTgts$ Creature.withFlying | NumDmg$ 4 | SpellDescription$ or CARDNAME deals 4 damage to target creature with flying.
+A:SP$ Charm | Cost$ 1 R | Choices$ DBDmg,DBDmg2 | SpellDescription$ Choose one - CARDNAME deals 3 damage to target player; or CARDNAME deals 4 damage to target creature with flying.
+SVar:DBDmg:DB$ DealDamage | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target player;
+SVar:DBDmg2:DB$ DealDamage | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with Flying | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature with flying.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thunderbolt.jpg
 Oracle:Choose one - Thunderbolt deals 3 damage to target player; or Thunderbolt deals 4 damage to target creature with flying.
\ No newline at end of file