diff --git a/forge-gui/res/cardsfolder/upcoming/loamcrafter_faun.txt b/forge-gui/res/cardsfolder/upcoming/loamcrafter_faun.txt
index b0b86bfa80e..b68b221018e 100644
--- a/forge-gui/res/cardsfolder/upcoming/loamcrafter_faun.txt
+++ b/forge-gui/res/cardsfolder/upcoming/loamcrafter_faun.txt
@@ -2,7 +2,7 @@ Name:Loamcrafter Faun
 ManaCost:2 G
 Types:Creature Satyr Druid
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | OptionalDecider$ You | TriggerDescription$ When CARDNAME enters the battlefield, you may discard one or more land cards. When you do, return up to that many target nonland permanent cards from your graveyard to your hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, you may discard one or more land cards. When you do, return up to that many target nonland permanent cards from your graveyard to your hand.
 SVar:TrigDiscard:DB$ Discard | DiscardValid$ Land | AnyNumber$ True | Optional$ True | Mode$ TgtChoose | RememberDiscarded$ True | SubAbility$ TrigImmediateTrig
 SVar:TrigImmediateTrig:DB$ ImmediateTrigger | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | RememberObjects$ Remembered | Execute$ TrigReturn | SubAbility$ DBCleanup | TriggerDescription$ When you do, return up to that many target nonland permanent cards from your graveyard to your hand.
 SVar:TrigReturn:DB$ ChangeZone | TgtPrompt$ Select up to that many target nonland permanents from your graveyard | TargetMin$ 0 | TargetMax$ X | Origin$ Graveyard | Hidden$ True | Destination$ Hand | ValidTgts$ Permanent.nonLand+YouCtrl 
diff --git a/forge-gui/res/cardsfolder/upcoming/timber_paladin.txt b/forge-gui/res/cardsfolder/upcoming/timber_paladin.txt
index c26ebcf51de..e64001e20ea 100644
--- a/forge-gui/res/cardsfolder/upcoming/timber_paladin.txt
+++ b/forge-gui/res/cardsfolder/upcoming/timber_paladin.txt
@@ -3,8 +3,8 @@ ManaCost:1 G
 Types:Artifact Creature Knight
 PT:1/1
 S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 3 | CheckSVar$ X | SVarCompare$ EQ1 | SetToughness$ 3 | Description$ As long as CARDNAME is enchanted by exactly one Aura, it has base power and toughness 3/3.
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 5 | CheckSVar$ X | SVarCompare$ EQ2 | SetToughness$ 5 |  Keywords$ Vigilance | Description$ As long as CARDNAME is enchanted by exactly two Auras, it has base power and toughness 5/5 and vigilance.
-S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 10 | CheckSVar$ X | SVarCompare$ GE3 | SetToughness$ 10 | Keywords$ Vigilance & Trample | Description$ As long as CARDNAME is enchanted by three or more Auras, it has base power and toughness 10/10, vigilance, and trample.
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 5 | CheckSVar$ X | SVarCompare$ EQ2 | SetToughness$ 5 |  AddKeyword$ Vigilance | Description$ As long as CARDNAME is enchanted by exactly two Auras, it has base power and toughness 5/5 and vigilance.
+S:Mode$ Continuous | Affected$ Card.Self | SetPower$ 10 | CheckSVar$ X | SVarCompare$ GE3 | SetToughness$ 10 | AddKeyword$ Vigilance & Trample | Description$ As long as CARDNAME is enchanted by three or more Auras, it has base power and toughness 10/10, vigilance, and trample.
 SVar:X:Count$Valid Aura.Attached
 SVar:EnchantMe:Multiple
 DeckNeeds:Type$Aura