diff --git a/forge-gui/res/cardsfolder/c/chandra_ablaze.txt b/forge-gui/res/cardsfolder/c/chandra_ablaze.txt
index 04dd575c75d..c93d8c75a08 100644
--- a/forge-gui/res/cardsfolder/c/chandra_ablaze.txt
+++ b/forge-gui/res/cardsfolder/c/chandra_ablaze.txt
@@ -7,10 +7,8 @@ SVar:DBChandraDealDamage:DB$ DealDamage | ValidTgts$ Creature,Player | TgtPrompt
 SVar:DBChandraCleanup:DB$ Cleanup | ClearRemembered$ True
 A:AB$ Discard | Cost$ SubCounter<2/LOYALTY> | Mode$ Hand | Defined$ Each | Planeswalker$ True | SubAbility$ DBChandraDraw | SpellDescription$ Each player discards his or her hand, then draws three cards.
 SVar:DBChandraDraw:DB$ Draw | Defined$ Each | NumCards$ 3
-A:AB$ Play | Cost$ SubCounter<7/LOYALTY> | Valid$ Instant.Red+YouCtrl,Sorcery.Red+YouCtrl | ValidZone$ Graveyard | WithoutManaCost$ True | Planeswalker$ True | Ultimate$ True | Amount$ ChandraZ | Controller$ You | Optional$ True | References$ ChandraX,ChandraY,ChandraZ | SpellDescription$ Cast any number of red instant and/or sorcery cards from your graveyard without paying their mana costs.
-SVar:ChandraX:Count$TypeInYourYard.Instant.Red
-SVar:ChandraY:Count$TypeInYourYard.Sorcery.Red
-SVar:ChandraZ:SVar$ChandraX/Plus.ChandraY
+A:AB$ Play | Cost$ SubCounter<7/LOYALTY> | Valid$ Instant.Red+YouCtrl,Sorcery.Red+YouCtrl | ValidZone$ Graveyard | WithoutManaCost$ True | Planeswalker$ True | Ultimate$ True | Amount$ ChandraX | Controller$ You | Optional$ True | References$ ChandraX | SpellDescription$ Cast any number of red instant and/or sorcery cards from your graveyard without paying their mana costs.
+SVar:ChandraX:Count$ValidGraveyard Instant.Red+YouOwn,Sorcery.Red+YouOwn
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chandra_ablaze.jpg
 Oracle:[+1] Discard a card. If a red card is discarded this way, Chandra Ablaze deals 4 damage to target creature or player.\n[-2] Each player discards his or her hand, then draws three cards.\n[-7] Cast any number of red instant and/or sorcery cards from your graveyard without paying their mana costs.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/h/haunting_apparition.txt b/forge-gui/res/cardsfolder/h/haunting_apparition.txt
index 7ddc7dec9e6..b59364b8eda 100644
--- a/forge-gui/res/cardsfolder/h/haunting_apparition.txt
+++ b/forge-gui/res/cardsfolder/h/haunting_apparition.txt
@@ -5,7 +5,7 @@ PT:1/2
 K:Flying
 K:ETBReplacement:Other:ChooseP
 SVar:ChooseP:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | AILogic$ Curse | SpellDescription$ As CARDNAME enters the battlefield, choose an opponent.
-S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | Description$ CARDNAME's power is equal to 1 plus the number of green creature cards in opponent's graveyard.
-SVar:X:Count$GreenTypeInChosenYard.Creature/Plus.1
+S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | Description$ CARDNAME's power is equal to 1 plus the number of green creature cards in the chosen player's graveyard.
+SVar:X:Count$ValidGraveyard Creature.Green+ChosenCtrl/Plus.1
 SVar:Picture:http://www.wizards.com/global/images/magic/general/haunting_apparition.jpg
 Oracle:Flying\nAs Haunting Apparition enters the battlefield, choose an opponent.\nHaunting Apparition's power is equal to 1 plus the number of green creature cards in the chosen player's graveyard.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/starlight.txt b/forge-gui/res/cardsfolder/s/starlight.txt
index e7c57916e5e..2b655c84abd 100644
--- a/forge-gui/res/cardsfolder/s/starlight.txt
+++ b/forge-gui/res/cardsfolder/s/starlight.txt
@@ -1,8 +1,8 @@
 Name:Starlight
 ManaCost:1 W
 Types:Sorcery
-A:SP$ GainLife | Cost$ 1 W | LifeAmount$ X | References$ X | SpellDescription$ You gain 3 life for each black creature target opponent controls.
-SVar:X:Count$BlackTypeOppCtrl.Creature/Times.3
+A:SP$ GainLife | Cost$ 1 W | ValidTgts$ Opponent | Defined$ You | LifeAmount$ X | References$ X | SpellDescription$ You gain 3 life for each black creature target opponent controls.
+SVar:X:Count$Valid Creature.TargetedPlayerCtrl+Black/Times.3
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/starlight.jpg
 Oracle:You gain 3 life for each black creature target opponent controls.
\ No newline at end of file