diff --git a/forge-gui/res/cardsfolder/b/burning_hands.txt b/forge-gui/res/cardsfolder/b/burning_hands.txt
index c77631c0d69..b8b2acd290f 100644
--- a/forge-gui/res/cardsfolder/b/burning_hands.txt
+++ b/forge-gui/res/cardsfolder/b/burning_hands.txt
@@ -1,6 +1,7 @@
 Name:Burning Hands
 ManaCost:1 R
 Types:Instant
-A:SP$ DealDamage | Cost$ 1 R | ValidTgts$ Creature,Planeswalker | NumDmg$ 2 | ConditionDefined$ Targeted | ConditionPresent$ Card.Green | ConditionCompare$ EQ0 | SubAbility$ DBExtra | StackDescription$ SpellDescription | SpellDescription$ CARDNAME deals 2 damage to target creature or planeswalker. If that permanent is green, CARDNAME deals 6 damage instead.
-SVar:DBExtra:DB$ DealDamage | Defined$ Targeted | NumDmg$ 6 | ConditionDefined$ Targeted | ConditionPresent$ Card.Green | ConditionCompare$ EQ1 | StackDescription$ None
+A:SP$ DealDamage | ValidTgts$ Creature,Planeswalker | TgtPrompt$ Select target creature or planeswalker | NumDmg$ X | StackDescription$ CARDNAME deals 2 damage to {c:Targeted}. If that permanent is green, CARDNAME deals 6 damage instead. | SpellDescription$ CARDNAME deals 2 damage to target creature or planeswalker. If that permanent is green, CARDNAME deals 6 damage instead.
+SVar:X:Count$Compare Y GE1.6.2
+SVar:Y:Targeted$Valid Card.Green
 Oracle:Burning Hands deals 2 damage to target creature or planeswalker. If that permanent is green, Burning Hands deals 6 damage instead.
diff --git a/forge-gui/res/cardsfolder/p/psychic_pickpocket.txt b/forge-gui/res/cardsfolder/p/psychic_pickpocket.txt
index 4d445688fb7..32472a1546c 100644
--- a/forge-gui/res/cardsfolder/p/psychic_pickpocket.txt
+++ b/forge-gui/res/cardsfolder/p/psychic_pickpocket.txt
@@ -2,7 +2,7 @@ Name:Psychic Pickpocket
 ManaCost:4 U
 Types:Creature Cephalid Rogue
 PT:3/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigConnive | TriggerDescription$ When CARDNAME enters the battlefield, it connives. When it connives this way, return up to one target spell to its owner's hand. (To have a creature connive, draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on that creature.)
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigConnive | TriggerDescription$ When CARDNAME enters the battlefield, it connives. When it connives this way, return up to one target nonland permanent to its owner's hand. (To have a creature connive, draw a card, then discard a card. If you discarded a nonland card, put a +1/+1 counter on that creature.)
 SVar:TrigConnive:DB$ Connive | SubAbility$ DBImmediateTrigger
 SVar:DBImmediateTrigger:DB$ ImmediateTrigger | Execute$ TrigReturn | TriggerDescription$ When it connives this way, return up to one target nonland permanent to its owner's hand.
 SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Permanent.nonLand | TgtPrompt$ Select target nonland permanent | TargetMax$ 1 | TargetMin$ 0 | Origin$ Battlefield | Destination$ Hand