diff --git a/forge-gui/res/cardsfolder/c/crimson_acolyte.txt b/forge-gui/res/cardsfolder/c/crimson_acolyte.txt
index 8b12074cb4d..5b3f52595cc 100644
--- a/forge-gui/res/cardsfolder/c/crimson_acolyte.txt
+++ b/forge-gui/res/cardsfolder/c/crimson_acolyte.txt
@@ -3,5 +3,5 @@ ManaCost:1 W
 Types:Creature Human Cleric
 PT:1/1
 K:Protection from red
-A:AB$ Protection | Cost$ W | ValidTgts$ Creature | Gains$ red | SpellDescription$ Target creature gains protection from red until end of turn.
+A:AB$ Pump | Cost$ W | ValidTgts$ Creature | KW$ Protection from red | SpellDescription$ Target creature gains protection from red until end of turn.
 Oracle:Protection from red\n{W}: Target creature gains protection from red until end of turn.
diff --git a/forge-gui/res/cardsfolder/e/eight_and_a_half_tails.txt b/forge-gui/res/cardsfolder/e/eight_and_a_half_tails.txt
index db4fa8db1e5..f12b1f1f8ec 100644
--- a/forge-gui/res/cardsfolder/e/eight_and_a_half_tails.txt
+++ b/forge-gui/res/cardsfolder/e/eight_and_a_half_tails.txt
@@ -2,7 +2,7 @@ Name:Eight-and-a-Half-Tails
 ManaCost:W W
 Types:Legendary Creature Fox Cleric
 PT:2/2
-A:AB$ Protection | Cost$ 1 W | ValidTgts$ Permanent.YouCtrl | TgtPrompt$ Select target permanent you control | Gains$ white | SpellDescription$ Target permanent you control gains protection from white until end of turn.
+A:AB$ Pump | Cost$ 1 W | ValidTgts$ Permanent.YouCtrl | TgtPrompt$ Select target permanent you control | KW$ Protection from white | SpellDescription$ Target permanent you control gains protection from white until end of turn.
 A:AB$ Animate | Cost$ 1 | Colors$ White | OverwriteColors$ True | ValidTgts$ Card | TgtZone$ Stack,Battlefield | SpellDescription$ Target spell or permanent becomes white until end of turn.
 AI:RemoveDeck:All
 DeckHints:Name$Pious Kitsune
diff --git a/forge-gui/res/cardsfolder/g/goblin_wizard.txt b/forge-gui/res/cardsfolder/g/goblin_wizard.txt
index bcf42a14eb3..792c1aced3c 100644
--- a/forge-gui/res/cardsfolder/g/goblin_wizard.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_wizard.txt
@@ -3,6 +3,6 @@ ManaCost:2 R R
 Types:Creature Goblin Wizard
 PT:1/1
 A:AB$ ChangeZone | Cost$ T | Origin$ Hand | Destination$ Battlefield | ChangeType$ Permanent.Goblin | ChangeNum$ 1 | SpellDescription$ You may put a Goblin permanent card from your hand onto the battlefield.
-A:AB$ Protection | Cost$ R | ValidTgts$ Permanent.Goblin | TgtPrompt$ Select target Goblin | Gains$ white | SpellDescription$ Target Goblin gains protection from white until end of turn.
+A:AB$ Pump | Cost$ R | ValidTgts$ Permanent.Goblin | TgtPrompt$ Select target Goblin | KW$ Protection from white | SpellDescription$ Target Goblin gains protection from white until end of turn.
 DeckHints:Type$Goblin
 Oracle:{T}: You may put a Goblin permanent card from your hand onto the battlefield.\n{R}: Target Goblin gains protection from white until end of turn.
diff --git a/forge-gui/res/cardsfolder/g/grotesque_hybrid.txt b/forge-gui/res/cardsfolder/g/grotesque_hybrid.txt
index 089f8b2fde8..4a958e669b5 100644
--- a/forge-gui/res/cardsfolder/g/grotesque_hybrid.txt
+++ b/forge-gui/res/cardsfolder/g/grotesque_hybrid.txt
@@ -4,6 +4,5 @@ Types:Creature Zombie
 PT:3/3
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Creature | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ Whenever CARDNAME deals combat damage to a creature, destroy that creature. It can't be regenerated.
 SVar:TrigDestroy:DB$ Destroy | Defined$ TriggeredTargetLKICopy | NoRegen$ True
-A:AB$ Pump | Cost$ Discard<1/Card> | Defined$ Self | KW$ Flying | SubAbility$ DBProtect | SpellDescription$ CARDNAME gains flying and protection from green and from white until end of turn.
-SVar:DBProtect:DB$ Protection | Defined$ Self | Gains$ green,white
+A:AB$ Pump | Cost$ Discard<1/Card> | Defined$ Self | KW$ Flying & Protection from green & Protection from white | SpellDescription$ CARDNAME gains flying and protection from green and from white until end of turn.
 Oracle:Whenever Grotesque Hybrid deals combat damage to a creature, destroy that creature. It can't be regenerated.\nDiscard a card: Grotesque Hybrid gains flying and protection from green and from white until end of turn.
diff --git a/forge-gui/res/cardsfolder/h/hell_bent_raider.txt b/forge-gui/res/cardsfolder/h/hell_bent_raider.txt
index 1f36148e2e5..7b2c9477ae5 100644
--- a/forge-gui/res/cardsfolder/h/hell_bent_raider.txt
+++ b/forge-gui/res/cardsfolder/h/hell_bent_raider.txt
@@ -4,6 +4,6 @@ Types:Creature Human Barbarian
 PT:2/2
 K:First Strike
 K:Haste
-A:AB$ Protection | Cost$ Discard<1/Random> | Gains$ white | SpellDescription$ CARDNAME gains protection from white until end of turn.
+A:AB$ Pump | Cost$ Discard<1/Random> | Defined$ Self | KW$ Protection from white | SpellDescription$ CARDNAME gains protection from white until end of turn.
 AI:RemoveDeck:All
 Oracle:First strike, haste\nDiscard a card at random: Hell-Bent Raider gains protection from white until end of turn.
diff --git a/forge-gui/res/cardsfolder/k/keeper_of_kookus.txt b/forge-gui/res/cardsfolder/k/keeper_of_kookus.txt
index 8f86c0acf8b..134616b7b72 100644
--- a/forge-gui/res/cardsfolder/k/keeper_of_kookus.txt
+++ b/forge-gui/res/cardsfolder/k/keeper_of_kookus.txt
@@ -2,6 +2,6 @@ Name:Keeper of Kookus
 ManaCost:R
 Types:Creature Goblin
 PT:1/1
-A:AB$ Protection | Cost$ R | Defined$ Self | Gains$ red | SpellDescription$ CARDNAME gains protection from red until end of turn.
+A:AB$ Pump | Cost$ R | Defined$ Self | KW$ Protection from red | SpellDescription$ CARDNAME gains protection from red until end of turn.
 DeckHints:Name$Kookus
 Oracle:{R}: Keeper of Kookus gains protection from red until end of turn.
diff --git a/forge-gui/res/cardsfolder/o/obsidian_acolyte.txt b/forge-gui/res/cardsfolder/o/obsidian_acolyte.txt
index 50fd513feb7..26681420823 100644
--- a/forge-gui/res/cardsfolder/o/obsidian_acolyte.txt
+++ b/forge-gui/res/cardsfolder/o/obsidian_acolyte.txt
@@ -3,5 +3,5 @@ ManaCost:1 W
 Types:Creature Human Cleric
 PT:1/1
 K:Protection from black
-A:AB$ Protection | Cost$ W | ValidTgts$ Creature | Gains$ black | SpellDescription$ Target creature gains protection from black until end of turn.
+A:AB$ Pump | Cost$ W | ValidTgts$ Creature | KW$ Protection from black | SpellDescription$ Target creature gains protection from black until end of turn.
 Oracle:Protection from black\n{W}: Target creature gains protection from black until end of turn.
diff --git a/forge-gui/res/cardsfolder/q/questing_phelddagrif.txt b/forge-gui/res/cardsfolder/q/questing_phelddagrif.txt
index c48cf318371..5430a01732d 100644
--- a/forge-gui/res/cardsfolder/q/questing_phelddagrif.txt
+++ b/forge-gui/res/cardsfolder/q/questing_phelddagrif.txt
@@ -3,7 +3,7 @@ ManaCost:1 G W U
 Types:Creature Phelddagrif
 PT:4/4
 A:AB$ Pump | Cost$ G | Defined$ Self | NumAtt$ +1 | NumDef$ +1 | SubAbility$ DBToken | SpellDescription$ CARDNAME gets +1/+1 until end of turn. Target opponent creates a 1/1 green Hippo creature token.
-A:AB$ Protection | Cost$ W | Defined$ Self | Gains$ black,red | SubAbility$ DBGain | SpellDescription$ CARDNAME gains protection from black and from red until end of turn. Target opponent gains 2 life.
+A:AB$ Pump | Cost$ W | Defined$ Self | KW$ Protection from black & Protection from red | SubAbility$ DBGain | SpellDescription$ CARDNAME gains protection from black and from red until end of turn. Target opponent gains 2 life.
 A:AB$ Pump | Cost$ U | Defined$ Self | KW$ Flying | SubAbility$ DBDraw | SpellDescription$ CARDNAME gains flying until end of turn. Target opponent may draw a card.
 SVar:DBToken:DB$ Token | ValidTgts$ Opponent | TokenScript$ g_1_1_hippo | TokenOwner$ Opponent
 SVar:DBGain:DB$ GainLife | LifeAmount$ 2 | ValidTgts$ Opponent
diff --git a/forge-gui/res/cardsfolder/t/tel_jilad_defiance.txt b/forge-gui/res/cardsfolder/t/tel_jilad_defiance.txt
index 7c8b57db36f..e5978ad999e 100644
--- a/forge-gui/res/cardsfolder/t/tel_jilad_defiance.txt
+++ b/forge-gui/res/cardsfolder/t/tel_jilad_defiance.txt
@@ -1,6 +1,6 @@
 Name:Tel-Jilad Defiance
 ManaCost:1 G
 Types:Instant
-A:SP$ Protection | ValidTgts$ Creature | Gains$ Artifact | SpellDescription$ Target creature gains protection from artifacts until end of turn. | SubAbility$ DBDraw
+A:SP$ Pump | ValidTgts$ Creature | KW$ Protection:Artifact | SubAbility$ DBDraw | SpellDescription$ Target creature gains protection from artifacts until end of turn.
 SVar:DBDraw:DB$ Draw | SpellDescription$ Draw a card.
 Oracle:Target creature gains protection from artifacts until end of turn.\nDraw a card.
diff --git a/forge-gui/res/cardsfolder/t/thick_skinned_goblin.txt b/forge-gui/res/cardsfolder/t/thick_skinned_goblin.txt
index d4033388e46..87487098c29 100644
--- a/forge-gui/res/cardsfolder/t/thick_skinned_goblin.txt
+++ b/forge-gui/res/cardsfolder/t/thick_skinned_goblin.txt
@@ -3,5 +3,5 @@ ManaCost:1 R
 Types:Creature Goblin Shaman
 PT:2/1
 S:Mode$ Continuous | Affected$ You | AddKeyword$ You may pay 0 rather than pay the echo cost for permanents you control. | Description$ You may pay {0} rather than pay the echo cost for permanents you control.
-A:AB$ Protection | Cost$ R | Defined$ Self | Gains$ red | SpellDescription$ CARDNAME gains protection from red until end of turn.
+A:AB$ Pump | Cost$ R | Defined$ Self | KW$ Protection from red | SpellDescription$ CARDNAME gains protection from red until end of turn.
 Oracle:You may pay {0} rather than pay the echo cost for permanents you control.\n{R}: Thick-Skinned Goblin gains protection from red until end of turn.
diff --git a/forge-gui/res/cardsfolder/t/tower_of_the_magistrate.txt b/forge-gui/res/cardsfolder/t/tower_of_the_magistrate.txt
index 40a2ff01902..4119a353eef 100644
--- a/forge-gui/res/cardsfolder/t/tower_of_the_magistrate.txt
+++ b/forge-gui/res/cardsfolder/t/tower_of_the_magistrate.txt
@@ -2,5 +2,5 @@ Name:Tower of the Magistrate
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Protection | Cost$ 1 T | ValidTgts$ Creature | Gains$ Artifact | SpellDescription$ Target creature gains protection from artifacts until end of turn.
+A:AB$ Pump | Cost$ 1 T | ValidTgts$ Creature | KW$ Protection:Artifact | SpellDescription$ Target creature gains protection from artifacts until end of turn.
 Oracle:{T}: Add {C}.\n{1}, {T}: Target creature gains protection from artifacts until end of turn.
diff --git a/forge-gui/res/cardsfolder/w/willow_priestess.txt b/forge-gui/res/cardsfolder/w/willow_priestess.txt
index 86af1ec186a..a6b344c77b7 100644
--- a/forge-gui/res/cardsfolder/w/willow_priestess.txt
+++ b/forge-gui/res/cardsfolder/w/willow_priestess.txt
@@ -3,5 +3,5 @@ ManaCost:2 G G
 Types:Creature Faerie Druid
 PT:2/2
 A:AB$ ChangeZone | Cost$ T | Origin$ Hand | Destination$ Battlefield | ChangeType$ Permanent.Faerie | ChangeNum$ 1 | SpellDescription$ You may put a Faerie permanent card from your hand onto the battlefield.
-A:AB$ Protection | Cost$ 2 G | ValidTgts$ Creature.Green | TgtPrompt$ Select target green creature | Gains$ black | SpellDescription$ Target green creature gains protection from black until end of turn.
+A:AB$ Pump | Cost$ 2 G | ValidTgts$ Creature.Green | TgtPrompt$ Select target green creature | KW$ Protection from black | SpellDescription$ Target green creature gains protection from black until end of turn.
 Oracle:{T}: You may put a Faerie permanent card from your hand onto the battlefield.\n{2}{G}: Target green creature gains protection from black until end of turn.