diff --git a/forge-gui/res/cardsfolder/a/acidic_soil.txt b/forge-gui/res/cardsfolder/a/acidic_soil.txt
index 4399d0b16c4..0b0d6bd89c5 100644
--- a/forge-gui/res/cardsfolder/a/acidic_soil.txt
+++ b/forge-gui/res/cardsfolder/a/acidic_soil.txt
@@ -1,9 +1,9 @@
 Name:Acidic Soil
 ManaCost:2 R
 Types:Sorcery
-A:SP$ RepeatEach | Cost$ 2 R | RepeatPlayers$ Player | RepeatSubAbility$ DBDamage | DamageMap$ True | SpellDescription$ CARDNAME deals damage to each player equal to the number of lands he or she controls.
+A:SP$ RepeatEach | Cost$ 2 R | RepeatPlayers$ Player | RepeatSubAbility$ DBDamage | DamageMap$ True | SpellDescription$ CARDNAME deals damage to each player equal to the number of lands they control.
 SVar:DBDamage:DB$ DealDamage | Defined$ Remembered | NumDmg$ X | References$ X
 SVar:X:Count$Valid Land.RememberedPlayerCtrl
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/acidic_soil.jpg
-Oracle:Acidic Soil deals damage to each player equal to the number of lands he or she controls.
+Oracle:Acidic Soil deals damage to each player equal to the number of lands they control.
diff --git a/forge-gui/res/cardsfolder/a/all_is_dust.txt b/forge-gui/res/cardsfolder/a/all_is_dust.txt
index 0f621496c5d..619ba00d9a9 100644
--- a/forge-gui/res/cardsfolder/a/all_is_dust.txt
+++ b/forge-gui/res/cardsfolder/a/all_is_dust.txt
@@ -1,6 +1,6 @@
 Name:All Is Dust
 ManaCost:7
 Types:Tribal Sorcery Eldrazi
-A:SP$ SacrificeAll | Cost$ 7 | ValidCards$ Permanent.nonColorless | SpellDescription$ Each player sacrifices all colored permanents he or she controls.
+A:SP$ SacrificeAll | Cost$ 7 | ValidCards$ Permanent.nonColorless | SpellDescription$ Each player sacrifices all colored permanents they control.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/all_is_dust.jpg
-Oracle:Each player sacrifices all colored permanents he or she controls.
+Oracle:Each player sacrifices all colored permanents they control.
diff --git a/forge-gui/res/cardsfolder/a/allied_strategies.txt b/forge-gui/res/cardsfolder/a/allied_strategies.txt
index 1a9763e57d2..985c8823b02 100644
--- a/forge-gui/res/cardsfolder/a/allied_strategies.txt
+++ b/forge-gui/res/cardsfolder/a/allied_strategies.txt
@@ -1,8 +1,8 @@
 Name:Allied Strategies
 ManaCost:4 U
 Types:Sorcery
-A:SP$ Draw | Cost$ 4 U | NumCards$ X | ValidTgts$ Player | TgtPrompt$ Select target player | References$ X | SpellDescription$ Domain — Target player draws a card for each basic land type among lands he or she controls.
+A:SP$ Draw | Cost$ 4 U | NumCards$ X | ValidTgts$ Player | TgtPrompt$ Select target player | References$ X | SpellDescription$ Domain — Target player draws a card for each basic land type among lands they control.
 SVar:X:TargetedPlayer$DomainPlayer
 SVar:RemRandomDeck:True
 SVar:Picture:http://resources.wizards.com/magic/cards/ps/en-us/card26383.jpg
-Oracle:Domain — Target player draws a card for each basic land type among lands he or she controls.
+Oracle:Domain — Target player draws a card for each basic land type among lands they control.
diff --git a/forge-gui/res/cardsfolder/a/ancient_runes.txt b/forge-gui/res/cardsfolder/a/ancient_runes.txt
index 469ce0de9d6..b1ca56a8c27 100644
--- a/forge-gui/res/cardsfolder/a/ancient_runes.txt
+++ b/forge-gui/res/cardsfolder/a/ancient_runes.txt
@@ -1,9 +1,9 @@
 Name:Ancient Runes
 ManaCost:2 R
 Types:Enchantment
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's upkeep, CARDNAME deals damage to that player equal to the number of artifacts he or she controls.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's upkeep, CARDNAME deals damage to that player equal to the number of artifacts they control.
 SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ X | References$ X
 SVar:X:Count$Valid Artifact.ActivePlayerCtrl
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ancient_runes.jpg
-Oracle:At the beginning of each player's upkeep, Ancient Runes deals damage to that player equal to the number of artifacts he or she controls.
+Oracle:At the beginning of each player's upkeep, Ancient Runes deals damage to that player equal to the number of artifacts they control.
diff --git a/forge-gui/res/cardsfolder/a/angrath_minotaur_pirate.txt b/forge-gui/res/cardsfolder/a/angrath_minotaur_pirate.txt
index 48c542d0d55..470a24bc4b0 100644
--- a/forge-gui/res/cardsfolder/a/angrath_minotaur_pirate.txt
+++ b/forge-gui/res/cardsfolder/a/angrath_minotaur_pirate.txt
@@ -1,7 +1,7 @@
 Name:Angrath, Minotaur Pirate
 ManaCost:4 B R
 Types:Legendary Planeswalker Angrath
-A:AB$ DamageAll | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | NumDmg$ 1 | ValidTgts$ Opponent | TgtPrompt$ Select an opponent | ValidCards$ Creature | ValidPlayers$ Targeted | ValidDescription$ target opponent and each creature he or she controls. | SpellDescription$ CARDNAME deals 1 damage to target opponent and each creature he or she controls.
+A:AB$ DamageAll | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | NumDmg$ 1 | ValidTgts$ Opponent | TgtPrompt$ Select an opponent | ValidCards$ Creature | ValidPlayers$ Targeted | ValidDescription$ target opponent and each creature they control. | SpellDescription$ CARDNAME deals 1 damage to target opponent and each creature they control.
 A:AB$ ChangeZone | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Card.Pirate+YouCtrl | TgtPrompt$ Select target Pirate card in your graveyard. | SpellDescription$ Return target Pirate card from your graveyard to the battlefield.
 A:AB$ DestroyAll | Cost$ SubCounter<11/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | ValidCards$ Creature | ValidDescription$ all creatures targeted opponent controls | RememberAllObjects$ True | SubAbility$ DBDealDamage | SpellDescription$ Destroy all creatures target opponent controls. CARDNAME deals damage to that player equal to their total power.
 SVar:DBDealDamage:DB$ DealDamage | Defined$ Targeted | NumDmg$ X | References$ X
diff --git a/forge-gui/res/cardsfolder/a/archfiend_of_depravity.txt b/forge-gui/res/cardsfolder/a/archfiend_of_depravity.txt
index 1de1b30365a..c27984a8366 100644
--- a/forge-gui/res/cardsfolder/a/archfiend_of_depravity.txt
+++ b/forge-gui/res/cardsfolder/a/archfiend_of_depravity.txt
@@ -3,9 +3,9 @@ ManaCost:3 B B
 Types:Creature Demon
 PT:5/4
 K:Flying
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ At the beginning of each opponent's end step, that player chooses up to two creature he or she controls and sacrifices the rest.
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ At the beginning of each opponent's end step, that player chooses up to two creature they control and sacrifices the rest.
 SVar:TrigChoose:DB$ ChooseCard | Defined$ TriggeredPlayer | Amount$ 2 | TargetControls$ True | Choices$ Creature | ChoiceTitle$ Choose up to two creatures | SubAbility$ DBSacrificeAll | RememberChosen$ True
 SVar:DBSacrificeAll:DB$ SacrificeAll | ValidCards$ Creature.IsNotRemembered | Controller$ TriggeredPlayer | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/archfiend_of_depravity.jpg
-Oracle:Flying\nAt the beginning of each opponent's end step, that player chooses up to two creatures he or she controls, then sacrifices the rest.
+Oracle:Flying\nAt the beginning of each opponent's end step, that player chooses up to two creatures they control, then sacrifices the rest.
diff --git a/forge-gui/res/cardsfolder/a/arena.txt b/forge-gui/res/cardsfolder/a/arena.txt
index f3f61efdc59..316b1eddf4f 100644
--- a/forge-gui/res/cardsfolder/a/arena.txt
+++ b/forge-gui/res/cardsfolder/a/arena.txt
@@ -1,10 +1,10 @@
 Name:Arena
 ManaCost:no cost
 Types:Land
-A:AB$ Tap | Cost$ 3 T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SubAbility$ DBTap | AlwaysRemember$ True | SpellDescription$ Tap target creature you control and target creature of an opponent's choice he or she controls. Those creatures fight each other. (Each deals damage equal to its power to the other.)
+A:AB$ Tap | Cost$ 3 T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SubAbility$ DBTap | AlwaysRemember$ True | SpellDescription$ Tap target creature you control and target creature of an opponent's choice they control. Those creatures fight each other. (Each deals damage equal to its power to the other.)
 SVar:DBTap:DB$ Tap | TargetingPlayer$ Player.Opponent | TargetingPlayerControls$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature you control | SubAbility$ DBFight | AlwaysRemember$ True
 SVar:DBFight:DB$ Fight | Defined$ Remembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/arena.jpg
-Oracle:{3}, {T}: Tap target creature you control and target creature of an opponent's choice he or she controls. Those creatures fight each other. (Each deals damage equal to its power to the other.)
+Oracle:{3}, {T}: Tap target creature you control and target creature of an opponent's choice they control. Those creatures fight each other. (Each deals damage equal to its power to the other.)
diff --git a/forge-gui/res/cardsfolder/a/awesome_presence.txt b/forge-gui/res/cardsfolder/a/awesome_presence.txt
index 8a947ead7cb..af23c40f160 100644
--- a/forge-gui/res/cardsfolder/a/awesome_presence.txt
+++ b/forge-gui/res/cardsfolder/a/awesome_presence.txt
@@ -3,6 +3,6 @@ ManaCost:U
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ U | ValidTgts$ Creature | AILogic$ Pump
-S:Mode$ CantBlockUnless | Attacker$ Creature.AttachedBy | Cost$ 3 | Description$ Enchanted creature can't be blocked unless defending player pays {3} for each creature he or she controls that's blocking it.
+S:Mode$ CantBlockUnless | Attacker$ Creature.AttachedBy | Cost$ 3 | Description$ Enchanted creature can't be blocked unless defending player pays {3} for each creature they control that's blocking it.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/awesome_presence.jpg
-Oracle:Enchant creature\nEnchanted creature can't be blocked unless defending player pays {3} for each creature he or she controls that's blocking it.
+Oracle:Enchant creature\nEnchanted creature can't be blocked unless defending player pays {3} for each creature they control that's blocking it.
diff --git a/forge-gui/res/cardsfolder/b/balance.txt b/forge-gui/res/cardsfolder/b/balance.txt
index 81e315dc702..a0e489f81e2 100644
--- a/forge-gui/res/cardsfolder/b/balance.txt
+++ b/forge-gui/res/cardsfolder/b/balance.txt
@@ -1,8 +1,8 @@
 Name:Balance
 ManaCost:1 W
 Types:Sorcery
-A:SP$ Balance | Cost$ 1 W | Valid$ Land | AILogic$ BalanceCreaturesAndLands | SubAbility$ BalanceHands | SpellDescription$ Each player chooses a number of lands he or she controls equal to the number of lands controlled by the player who controls the fewest, then sacrifices the rest. Players discard cards and sacrifice creatures the same way.
+A:SP$ Balance | Cost$ 1 W | Valid$ Land | AILogic$ BalanceCreaturesAndLands | SubAbility$ BalanceHands | SpellDescription$ Each player chooses a number of lands they control equal to the number of lands controlled by the player who controls the fewest, then sacrifices the rest. Players discard cards and sacrifice creatures the same way.
 SVar:BalanceHands:DB$ Balance | Zone$ Hand | SubAbility$ BalanceCreatures
 SVar:BalanceCreatures:DB$ Balance | Valid$ Creature
 SVar:Picture:http://www.wizards.com/global/images/magic/general/balance.jpg
-Oracle:Each player chooses a number of lands he or she controls equal to the number of lands controlled by the player who controls the fewest, then sacrifices the rest. Players discard cards and sacrifice creatures the same way.
+Oracle:Each player chooses a number of lands they control equal to the number of lands controlled by the player who controls the fewest, then sacrifices the rest. Players discard cards and sacrifice creatures the same way.
diff --git a/forge-gui/res/cardsfolder/b/balancing_act.txt b/forge-gui/res/cardsfolder/b/balancing_act.txt
index b26a7dc7e33..e35f4e4e6fb 100644
--- a/forge-gui/res/cardsfolder/b/balancing_act.txt
+++ b/forge-gui/res/cardsfolder/b/balancing_act.txt
@@ -1,9 +1,9 @@
 Name:Balancing Act
 ManaCost:2 W W
 Types:Sorcery
-A:SP$ Balance | Cost$ 2 W W | Valid$ Permanent | AILogic$ BalancePermanents | SubAbility$ BalanceHands | SpellDescription$ Each player chooses a number of permanents he or she controls equal to the number of permanents controlled by the player who controls the fewest, then sacrifices the rest. Each player discards cards the same way.
+A:SP$ Balance | Cost$ 2 W W | Valid$ Permanent | AILogic$ BalancePermanents | SubAbility$ BalanceHands | SpellDescription$ Each player chooses a number of permanents they control equal to the number of permanents controlled by the player who controls the fewest, then sacrifices the rest. Each player discards cards the same way.
 SVar:BalanceHands:DB$ Balance | Zone$ Hand
 SVar:Picture:http://www.wizards.com/global/images/magic/general/balancing_act.jpg
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
-Oracle:Each player chooses a number of permanents he or she controls equal to the number of permanents controlled by the player who controls the fewest, then sacrifices the rest. Each player discards cards the same way.
+Oracle:Each player chooses a number of permanents they control equal to the number of permanents controlled by the player who controls the fewest, then sacrifices the rest. Each player discards cards the same way.
diff --git a/forge-gui/res/cardsfolder/b/bane_of_bala_ged.txt b/forge-gui/res/cardsfolder/b/bane_of_bala_ged.txt
index a597811230e..6e409ea672a 100644
--- a/forge-gui/res/cardsfolder/b/bane_of_bala_ged.txt
+++ b/forge-gui/res/cardsfolder/b/bane_of_bala_ged.txt
@@ -2,8 +2,8 @@ Name:Bane of Bala Ged
 ManaCost:7
 Types:Creature Eldrazi
 PT:7/5
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ Whenever CARDNAME attacks, defending player exiles two permanents he or she controls.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ Whenever CARDNAME attacks, defending player exiles two permanents they control.
 SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | DefinedPlayer$ DefendingPlayer | Mandatory$ True | ChangeType$ Permanent | ChangeNum$ 2 | Chooser$ DefendingPlayer | Hidden$ True
 SVar:HasAttackEffect:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bane_of_bala_ged.jpg
-Oracle:Whenever Bane of Bala Ged attacks, defending player exiles two permanents he or she controls.
\ No newline at end of file
+Oracle:Whenever Bane of Bala Ged attacks, defending player exiles two permanents they control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/b/banshee_of_the_dread_choir.txt b/forge-gui/res/cardsfolder/b/banshee_of_the_dread_choir.txt
index 98eae6325fa..fdb1793bac6 100644
--- a/forge-gui/res/cardsfolder/b/banshee_of_the_dread_choir.txt
+++ b/forge-gui/res/cardsfolder/b/banshee_of_the_dread_choir.txt
@@ -7,4 +7,4 @@ T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ Tri
 SVar:TrigDiscard:DB$ Discard | Defined$ TriggeredTarget | NumCards$ 1 | Mode$ TgtChoose
 DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/banshee_of_the_dread_choir.jpg
-Oracle:Myriad (Whenever this creature attacks, for each opponent other than defending player, you may create a token that's a copy of this creature that's tapped and attacking that player or a planeswalker he or she controls. If one or more tokens are created this way, exile the tokens at end of combat.)\nWhen Banshee of the Dread Choir deals combat damage to a player, that player discards a card.
+Oracle:Myriad (Whenever this creature attacks, for each opponent other than defending player, you may create a token that's a copy of this creature that's tapped and attacking that player or a planeswalker they control. If one or more tokens are created this way, exile the tokens at end of combat.)\nWhen Banshee of the Dread Choir deals combat damage to a player, that player discards a card.
diff --git a/forge-gui/res/cardsfolder/b/batwing_brume.txt b/forge-gui/res/cardsfolder/b/batwing_brume.txt
index 3c1f5ec1408..3760b5e3fe8 100644
--- a/forge-gui/res/cardsfolder/b/batwing_brume.txt
+++ b/forge-gui/res/cardsfolder/b/batwing_brume.txt
@@ -1,10 +1,10 @@
 Name:Batwing Brume
 ManaCost:1 WB
 Types:Instant
-A:SP$ Fog | Cost$ 1 WB | ConditionManaSpent$ W | SubAbility$ BatwingRepeat | SpellDescription$ Prevent all combat damage that would be dealt this turn if {W} was spent to cast CARDNAME. Each player loses 1 life for each attacking creature he or she controls if {B} was spent to cast CARDNAME. (Do both if {W}{B} was spent.) | StackDescription$ SpellDescription
+A:SP$ Fog | Cost$ 1 WB | ConditionManaSpent$ W | SubAbility$ BatwingRepeat | SpellDescription$ Prevent all combat damage that would be dealt this turn if {W} was spent to cast CARDNAME. Each player loses 1 life for each attacking creature they control if {B} was spent to cast CARDNAME. (Do both if {W}{B} was spent.) | StackDescription$ SpellDescription
 SVar:BatwingRepeat:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ BatwingLoseLife
 SVar:BatwingLoseLife:DB$ LoseLife | LifeAmount$ X | Defined$ Remembered | ConditionManaSpent$ B | References$ X
 SVar:X:PlayerCountRemembered$Valid Creature.YouCtrl+attacking
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/batwing_brume.jpg
-Oracle:Prevent all combat damage that would be dealt this turn if {W} was spent to cast Batwing Brume. Each player loses 1 life for each attacking creature he or she controls if {B} was spent to cast Batwing Brume. (Do both if {W}{B} was spent.)
+Oracle:Prevent all combat damage that would be dealt this turn if {W} was spent to cast Batwing Brume. Each player loses 1 life for each attacking creature they control if {B} was spent to cast Batwing Brume. (Do both if {W}{B} was spent.)
diff --git a/forge-gui/res/cardsfolder/b/bend_or_break.txt b/forge-gui/res/cardsfolder/b/bend_or_break.txt
index 5d7f2c11953..eb2265dc2e3 100644
--- a/forge-gui/res/cardsfolder/b/bend_or_break.txt
+++ b/forge-gui/res/cardsfolder/b/bend_or_break.txt
@@ -1,7 +1,7 @@
 Name:Bend or Break
 ManaCost:3 R
 Types:Sorcery
-A:SP$ RepeatEach | Cost$ 3 R | RepeatPlayers$ Player | RepeatSubAbility$ DBChoosePlayer | SpellDescription$ Each player separates all nontoken lands he or she controls into two piles. For each player, one of his or her piles is chosen by one of his or her opponents of his or her choice. Destroy all lands in the chosen piles. Tap all lands in the other piles.
+A:SP$ RepeatEach | Cost$ 3 R | RepeatPlayers$ Player | RepeatSubAbility$ DBChoosePlayer | SpellDescription$ Each player separates all nontoken lands they control into two piles. For each player, one of his or her piles is chosen by one of his or her opponents of his or her choice. Destroy all lands in the chosen piles. Tap all lands in the other piles.
 SVar:DBChoosePlayer:DB$ ChoosePlayer | Defined$ Remembered | Choices$ Player.OpponentOf Remembered | AILogic$ Curse | SubAbility$ DBTwoPiles
 SVar:DBTwoPiles:DB$ TwoPiles | Defined$ Remembered | Separator$ Remembered | Chooser$ ChosenPlayer | ChosenPile$ DBBreak | UnchosenPile$ DBBend | ValidCards$ Land.nonToken+RememberedPlayerCtrl | Zone$ Battlefield | SubAbility$ DBCleanupChosen
 SVar:DBBreak:DB$ DestroyAll | ValidCards$ Land.IsRemembered
@@ -9,4 +9,4 @@ SVar:DBBend:DB$ TapAll | ValidCards$ Land.IsRemembered
 SVar:DBCleanupChosen:DB$ Cleanup | ClearChosenPlayer$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bend_or_break.jpg
-Oracle:Each player separates all nontoken lands he or she controls into two piles. For each player, one of his or her piles is chosen by one of his or her opponents of his or her choice. Destroy all lands in the chosen piles. Tap all lands in the other piles.
+Oracle:Each player separates all nontoken lands they control into two piles. For each player, one of his or her piles is chosen by one of his or her opponents of his or her choice. Destroy all lands in the chosen piles. Tap all lands in the other piles.
diff --git a/forge-gui/res/cardsfolder/b/benevolent_offering.txt b/forge-gui/res/cardsfolder/b/benevolent_offering.txt
index b15da6e6fde..3d8fdaa91cb 100644
--- a/forge-gui/res/cardsfolder/b/benevolent_offering.txt
+++ b/forge-gui/res/cardsfolder/b/benevolent_offering.txt
@@ -1,7 +1,7 @@
 Name:Benevolent Offering
 ManaCost:3 W
 Types:Instant
-A:SP$ ChoosePlayer | Cost$ 3 W | Defined$ You | Choices$ Player.Opponent | SubAbility$ DBToken | SpellDescription$ Choose an opponent. You and that player each create three 1/1 white Spirit creature tokens with flying. Choose an opponent. You gain 2 life for each creature you control and that player gains 2 life for each creature he or she controls.
+A:SP$ ChoosePlayer | Cost$ 3 W | Defined$ You | Choices$ Player.Opponent | SubAbility$ DBToken | SpellDescription$ Choose an opponent. You and that player each create three 1/1 white Spirit creature tokens with flying. Choose an opponent. You gain 2 life for each creature you control and that player gains 2 life for each creature they control.
 SVar:DBToken:DB$ Token | TokenAmount$ 3 | TokenName$ Spirit | TokenTypes$ Creature,Spirit | TokenOwner$ ChosenAndYou | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | TokenImage$ w 1 1 spirit C14 | TokenKeywords$ Flying | SubAbility$ DBChoose
 SVar:DBChoose:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent | SubAbility$ DBGainLifeYou
 SVar:DBGainLifeYou:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X | SubAbility$ DBGainLifeOpp
@@ -12,4 +12,4 @@ SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/benevolent_offering.jpg
-Oracle:Choose an opponent. You and that player each create three 1/1 white Spirit creature tokens with flying.\nChoose an opponent. You gain 2 life for each creature you control and that player gains 2 life for each creature he or she controls.
+Oracle:Choose an opponent. You and that player each create three 1/1 white Spirit creature tokens with flying.\nChoose an opponent. You gain 2 life for each creature you control and that player gains 2 life for each creature they control.
diff --git a/forge-gui/res/cardsfolder/b/biorhythm.txt b/forge-gui/res/cardsfolder/b/biorhythm.txt
index 5caffc99ced..23a29e4e2fa 100644
--- a/forge-gui/res/cardsfolder/b/biorhythm.txt
+++ b/forge-gui/res/cardsfolder/b/biorhythm.txt
@@ -1,9 +1,9 @@
 Name:Biorhythm
 ManaCost:6 G G
 Types:Sorcery
-A:SP$ RepeatEach | Cost$ 6 G G | RepeatPlayers$ Player | RepeatSubAbility$ DBSetLife | SpellDescription$ Each player's life total becomes the number of creatures he or she controls.
+A:SP$ RepeatEach | Cost$ 6 G G | RepeatPlayers$ Player | RepeatSubAbility$ DBSetLife | SpellDescription$ Each player's life total becomes the number of creatures they control.
 SVar:DBSetLife:DB$ SetLife | Defined$ Player.IsRemembered | LifeAmount$ X | References$ X
 SVar:X:Count$Valid Creature.RememberedPlayerCtrl
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/biorhythm.jpg
-Oracle:Each player's life total becomes the number of creatures he or she controls.
+Oracle:Each player's life total becomes the number of creatures they control.
diff --git a/forge-gui/res/cardsfolder/b/blade_of_selves.txt b/forge-gui/res/cardsfolder/b/blade_of_selves.txt
index b73c541edf8..60df063e42f 100644
--- a/forge-gui/res/cardsfolder/b/blade_of_selves.txt
+++ b/forge-gui/res/cardsfolder/b/blade_of_selves.txt
@@ -1,9 +1,9 @@
 Name:Blade of Selves
 ManaCost:2
 Types:Artifact Equipment
-S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Myriad | Description$ Equipped creature has myriad. (Whenever it attacks, for each opponent other than defending player, you may create a token that's a copy of that creature that's tapped and attacking that player or a planeswalker he or she controls. Exile the tokens at end of combat.)
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Myriad | Description$ Equipped creature has myriad. (Whenever it attacks, for each opponent other than defending player, you may create a token that's a copy of that creature that's tapped and attacking that player or a planeswalker they control. Exile the tokens at end of combat.)
 K:Equip:4
 SVar:RemRandomDeck:True
 DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blade_of_selves.jpg
-Oracle:Equipped creature has myriad. (Whenever it attacks, for each opponent other than defending player, you may create a token that's a copy of that creature that's tapped and attacking that player or a planeswalker he or she controls. Exile the tokens at end of combat.)\nEquip {4}
+Oracle:Equipped creature has myriad. (Whenever it attacks, for each opponent other than defending player, you may create a token that's a copy of that creature that's tapped and attacking that player or a planeswalker they control. Exile the tokens at end of combat.)\nEquip {4}
diff --git a/forge-gui/res/cardsfolder/b/blinkmoth_urn.txt b/forge-gui/res/cardsfolder/b/blinkmoth_urn.txt
index f3ab9bf63e7..1a13743a491 100644
--- a/forge-gui/res/cardsfolder/b/blinkmoth_urn.txt
+++ b/forge-gui/res/cardsfolder/b/blinkmoth_urn.txt
@@ -1,9 +1,9 @@
 Name:Blinkmoth Urn
 ManaCost:5
 Types:Artifact
-T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ Player | TriggerZones$ Battlefield | IsPresent$ Card.Self+untapped | Execute$ TrigGetMana | TriggerDescription$ At the beginning of each player's precombat main phase, if CARDNAME is untapped, that player adds {C} for each artifact he or she controls.
+T:Mode$ Phase | Phase$ Main1 | PreCombatMain$ True | ValidPlayer$ Player | TriggerZones$ Battlefield | IsPresent$ Card.Self+untapped | Execute$ TrigGetMana | TriggerDescription$ At the beginning of each player's precombat main phase, if CARDNAME is untapped, that player adds {C} for each artifact they control.
 SVar:TrigGetMana:DB$ Mana | Produced$ C | Amount$ X | References$ X | Defined$ TriggeredPlayer
 SVar:X:Count$Valid Artifact.ActivePlayerCtrl
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blinkmoth_urn.jpg
-Oracle:At the beginning of each player's precombat main phase, if Blinkmoth Urn is untapped, that player adds {C} for each artifact he or she controls.
+Oracle:At the beginning of each player's precombat main phase, if Blinkmoth Urn is untapped, that player adds {C} for each artifact they control.
diff --git a/forge-gui/res/cardsfolder/b/blizzard_specter.txt b/forge-gui/res/cardsfolder/b/blizzard_specter.txt
index e58a09d4dd1..23e1a6820a3 100644
--- a/forge-gui/res/cardsfolder/b/blizzard_specter.txt
+++ b/forge-gui/res/cardsfolder/b/blizzard_specter.txt
@@ -5,7 +5,7 @@ PT:2/3
 K:Flying
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigCharm | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, ABILITY
 SVar:TrigCharm:DB$ Charm | Choices$ DBBounce,DBDiscard
-SVar:DBBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | ChangeType$ Permanent.DefenderCtrl | ChangeNum$ 1 | Chooser$ TriggeredTarget | Mandatory$ True | SpellDescription$ That player returns a permanent he or she controls to its owner's hand.
+SVar:DBBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | ChangeType$ Permanent.DefenderCtrl | ChangeNum$ 1 | Chooser$ TriggeredTarget | Mandatory$ True | SpellDescription$ That player returns a permanent they control to its owner's hand.
 SVar:DBDiscard:DB$ Discard | Defined$ TriggeredTarget | NumCards$ 1 | Mode$ TgtChoose | SpellDescription$ That player discards a card.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blizzard_specter.jpg
-Oracle:Flying\nWhenever Blizzard Specter deals combat damage to a player, choose one —\n• That player returns a permanent he or she controls to its owner's hand.\n• That player discards a card.
+Oracle:Flying\nWhenever Blizzard Specter deals combat damage to a player, choose one —\n• That player returns a permanent they control to its owner's hand.\n• That player discards a card.
diff --git a/forge-gui/res/cardsfolder/b/blood_clock.txt b/forge-gui/res/cardsfolder/b/blood_clock.txt
index 0bfab3fc31b..6d314e41634 100644
--- a/forge-gui/res/cardsfolder/b/blood_clock.txt
+++ b/forge-gui/res/cardsfolder/b/blood_clock.txt
@@ -1,8 +1,8 @@
 Name:Blood Clock
 ManaCost:4
 Types:Artifact
-T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ At the beginning of each player's upkeep, that player returns a permanent he or she controls to its owner's hand unless he or she pays 2 life.
+T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigChangeZone | TriggerDescription$ At the beginning of each player's upkeep, that player returns a permanent they control to its owner's hand unless he or she pays 2 life.
 SVar:TrigChangeZone:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ChangeType$ Permanent | DefinedPlayer$ TriggeredPlayer | ChangeNum$ 1 | Hidden$ True | Mandatory$ True | UnlessCost$ PayLife<2> | UnlessPayer$ TriggeredPlayer
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blood_clock.jpg
-Oracle:At the beginning of each player's upkeep, that player returns a permanent he or she controls to its owner's hand unless he or she pays 2 life.
+Oracle:At the beginning of each player's upkeep, that player returns a permanent they control to its owner's hand unless he or she pays 2 life.
diff --git a/forge-gui/res/cardsfolder/b/bonfire_of_the_damned.txt b/forge-gui/res/cardsfolder/b/bonfire_of_the_damned.txt
index a687925c5df..16a08a72aa8 100644
--- a/forge-gui/res/cardsfolder/b/bonfire_of_the_damned.txt
+++ b/forge-gui/res/cardsfolder/b/bonfire_of_the_damned.txt
@@ -1,8 +1,8 @@
 Name:Bonfire of the Damned
 ManaCost:X X R
 Types:Sorcery
-A:SP$ DamageAll | Cost$ X X R | NumDmg$ X | ValidTgts$ Player | TgtPrompt$ Select a player | ValidCards$ Creature | ValidPlayers$ Targeted | ValidDescription$ target player and each creature he or she controls. | References$ X | SpellDescription$ CARDNAME deals X damage to target player and each creature he or she controls.
+A:SP$ DamageAll | Cost$ X X R | NumDmg$ X | ValidTgts$ Player | TgtPrompt$ Select a player | ValidCards$ Creature | ValidPlayers$ Targeted | ValidDescription$ target player and each creature they control. | References$ X | SpellDescription$ CARDNAME deals X damage to target player and each creature they control.
 K:Miracle:X R
 SVar:X:Count$xPaid
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bonfire_of_the_damned.jpg
-Oracle:Bonfire of the Damned deals X damage to target player and each creature he or she controls.\nMiracle {X}{R} (You may cast this card for its miracle cost when you draw it if it's the first card you drew this turn.)
+Oracle:Bonfire of the Damned deals X damage to target player and each creature they control.\nMiracle {X}{R} (You may cast this card for its miracle cost when you draw it if it's the first card you drew this turn.)
diff --git a/forge-gui/res/cardsfolder/b/broodbirth_viper.txt b/forge-gui/res/cardsfolder/b/broodbirth_viper.txt
index cefd5b24307..94e614f2897 100644
--- a/forge-gui/res/cardsfolder/b/broodbirth_viper.txt
+++ b/forge-gui/res/cardsfolder/b/broodbirth_viper.txt
@@ -7,4 +7,4 @@ T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player.Opponent | Com
 SVar:TrigDraw:DB$ Draw | NumCards$ 1
 DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/broodbirth_viper.jpg
-Oracle:Myriad (Whenever this creature attacks, for each opponent other than defending player, you may create a token that's a copy of this creature that's tapped and attacking that player or a planeswalker he or she controls. If one or more tokens are created this way, exile the tokens at end of combat.)\nWhenever Broodbirth Viper deals combat damage to an opponent, you may draw a card.
+Oracle:Myriad (Whenever this creature attacks, for each opponent other than defending player, you may create a token that's a copy of this creature that's tapped and attacking that player or a planeswalker they control. If one or more tokens are created this way, exile the tokens at end of combat.)\nWhenever Broodbirth Viper deals combat damage to an opponent, you may draw a card.
diff --git a/forge-gui/res/cardsfolder/b/burden_of_greed.txt b/forge-gui/res/cardsfolder/b/burden_of_greed.txt
index e7303a76c49..db4afe64071 100644
--- a/forge-gui/res/cardsfolder/b/burden_of_greed.txt
+++ b/forge-gui/res/cardsfolder/b/burden_of_greed.txt
@@ -1,8 +1,8 @@
 Name:Burden of Greed
 ManaCost:3 B
 Types:Instant
-A:SP$ LoseLife | Cost$ 3 B | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ X | References$ X | SpellDescription$ Target player loses 1 life for each tapped artifact he or she controls.
+A:SP$ LoseLife | Cost$ 3 B | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ X | References$ X | SpellDescription$ Target player loses 1 life for each tapped artifact they control.
 SVar:X:TargetedPlayer$Valid Artifact.tapped+YouCtrl
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/burden_of_greed.jpg
-Oracle:Target player loses 1 life for each tapped artifact he or she controls.
+Oracle:Target player loses 1 life for each tapped artifact they control.
diff --git a/forge-gui/res/cardsfolder/b/burning_of_xinye.txt b/forge-gui/res/cardsfolder/b/burning_of_xinye.txt
index 98c51ffd43f..98c1b006346 100644
--- a/forge-gui/res/cardsfolder/b/burning_of_xinye.txt
+++ b/forge-gui/res/cardsfolder/b/burning_of_xinye.txt
@@ -1,9 +1,9 @@
 Name:Burning of Xinye
 ManaCost:4 R R
 Types:Sorcery
-A:SP$ Sacrifice | Defined$ You | Cost$ 4 R R | SacValid$ Land.withoutIndestructible | Amount$ 4 | SubAbility$ DBSac | Destroy$ True | SpellDescription$ You destroy four lands you control, then target opponent destroys four lands he or she controls. Then CARDNAME deals 4 damage to each creature.
+A:SP$ Sacrifice | Defined$ You | Cost$ 4 R R | SacValid$ Land.withoutIndestructible | Amount$ 4 | SubAbility$ DBSac | Destroy$ True | SpellDescription$ You destroy four lands you control, then target opponent destroys four lands they control. Then CARDNAME deals 4 damage to each creature.
 SVar:DBSac:DB$ Sacrifice | ValidTgts$ Opponent | SacValid$ Land.withoutIndestructible | Amount$ 4 | Destroy$ True | SubAbility$ DBDamage
 SVar:DBDamage:DB$ DamageAll | NumDmg$ 4 | ValidCards$ Creature
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/burning_of_xinye.jpg
-Oracle:You destroy four lands you control, then target opponent destroys four lands he or she controls. Then Burning of Xinye deals 4 damage to each creature.
+Oracle:You destroy four lands you control, then target opponent destroys four lands they control. Then Burning of Xinye deals 4 damage to each creature.
diff --git a/forge-gui/res/cardsfolder/c/caller_of_the_pack.txt b/forge-gui/res/cardsfolder/c/caller_of_the_pack.txt
index 90fa5bce91b..c387f31e948 100644
--- a/forge-gui/res/cardsfolder/c/caller_of_the_pack.txt
+++ b/forge-gui/res/cardsfolder/c/caller_of_the_pack.txt
@@ -6,4 +6,4 @@ K:Trample
 K:Myriad
 DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/caller_of_the_pack.jpg
-Oracle:Trample\nMyriad (Whenever this creature attacks, for each opponent other than defending player, you may create a token that's a copy of this creature that's tapped and attacking that player or a planeswalker he or she controls. If one or more tokens are created this way, exile the tokens at end of combat.)
+Oracle:Trample\nMyriad (Whenever this creature attacks, for each opponent other than defending player, you may create a token that's a copy of this creature that's tapped and attacking that player or a planeswalker they control. If one or more tokens are created this way, exile the tokens at end of combat.)
diff --git a/forge-gui/res/cardsfolder/c/cataclysm.txt b/forge-gui/res/cardsfolder/c/cataclysm.txt
index 36d3e617680..9fc769f5458 100644
--- a/forge-gui/res/cardsfolder/c/cataclysm.txt
+++ b/forge-gui/res/cardsfolder/c/cataclysm.txt
@@ -1,7 +1,7 @@
 Name:Cataclysm
 ManaCost:2 W W
 Types:Sorcery
-A:SP$ RepeatEach | Cost$ 2 W W | RepeatPlayers$ Player | RepeatSubAbility$ ChooseArtf | SubAbility$ SacAllOthers | SpellDescription$ Each player chooses from among the permanents he or she controls an artifact, a creature, an enchantment, and a land, then sacrifices the rest.
+A:SP$ RepeatEach | Cost$ 2 W W | RepeatPlayers$ Player | RepeatSubAbility$ ChooseArtf | SubAbility$ SacAllOthers | SpellDescription$ Each player chooses from among the permanents they control an artifact, a creature, an enchantment, and a land, then sacrifices the rest.
 SVar:ChooseArtf:DB$ ChooseCard | Defined$ Remembered | Amount$ 1 | Choices$ Artifact.RememberedPlayerCtrl | ChoiceTitle$ Choose an artifact to keep | SubAbility$ ChooseCrtr | RememberChosen$ True | Mandatory$ True
 SVar:ChooseCrtr:DB$ ChooseCard | Defined$ Remembered | Amount$ 1 | Choices$ Creature.RememberedPlayerCtrl | ChoiceTitle$ Choose a creature to keep | SubAbility$ ChooseEnch | RememberChosen$ True | Mandatory$ True
 SVar:ChooseEnch:DB$ ChooseCard | Defined$ Remembered | Amount$ 1 | Choices$ Enchantment.RememberedPlayerCtrl | ChoiceTitle$ Choose an enchantment to keep | SubAbility$ ChooseLand | RememberChosen$ True | Mandatory$ True
@@ -10,4 +10,4 @@ SVar:SacAllOthers:DB$ SacrificeAll | ValidCards$ Permanent.IsNotRemembered | Sub
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cataclysm.jpg
-Oracle:Each player chooses from among the permanents he or she controls an artifact, a creature, an enchantment, and a land, then sacrifices the rest.
+Oracle:Each player chooses from among the permanents they control an artifact, a creature, an enchantment, and a land, then sacrifices the rest.
diff --git a/forge-gui/res/cardsfolder/c/cataclysmic_gearhulk.txt b/forge-gui/res/cardsfolder/c/cataclysmic_gearhulk.txt
index 3107a4f501c..c5f5e70733d 100644
--- a/forge-gui/res/cardsfolder/c/cataclysmic_gearhulk.txt
+++ b/forge-gui/res/cardsfolder/c/cataclysmic_gearhulk.txt
@@ -3,7 +3,7 @@ ManaCost:3 W W
 Types:Artifact Creature Construct
 PT:4/5
 K:Vigilance
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCataclysm | TriggerDescription$ When CARDNAME enters the battlefield, each player chooses an artifact, a creature, an enchantment, and a planeswalker from among the nonland permanents he or she controls, then sacrifices the rest.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigCataclysm | TriggerDescription$ When CARDNAME enters the battlefield, each player chooses an artifact, a creature, an enchantment, and a planeswalker from among the nonland permanents they control, then sacrifices the rest.
 SVar:TrigCataclysm:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ ChooseArtf | SubAbility$ SacAllOthers
 SVar:ChooseArtf:DB$ ChooseCard | Defined$ Remembered | Amount$ 1 | Choices$ Artifact.nonLand+RememberedPlayerCtrl | ChoiceTitle$ Choose an artifact to keep | SubAbility$ ChooseCrtr | RememberChosen$ True | Mandatory$ True
 SVar:ChooseCrtr:DB$ ChooseCard | Defined$ Remembered | Amount$ 1 | Choices$ Creature.nonLand+RememberedPlayerCtrl | ChoiceTitle$ Choose a creature to keep | SubAbility$ ChooseEnch | RememberChosen$ True | Mandatory$ True
@@ -13,4 +13,4 @@ SVar:SacAllOthers:DB$ SacrificeAll | ValidCards$ Permanent.nonLand+IsNotRemember
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cataclysmic_gearhulk.jpg
-Oracle:Vigilance\nWhen Cataclysmic Gearhulk enters the battlefield, each player chooses an artifact, a creature, an enchantment, and a planeswalker from among the nonland permanents he or she controls, then sacrifices the rest.
\ No newline at end of file
+Oracle:Vigilance\nWhen Cataclysmic Gearhulk enters the battlefield, each player chooses an artifact, a creature, an enchantment, and a planeswalker from among the nonland permanents they control, then sacrifices the rest.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/c/cerebral_eruption.txt b/forge-gui/res/cardsfolder/c/cerebral_eruption.txt
index b3b8319b7b8..e11ca6e5181 100644
--- a/forge-gui/res/cardsfolder/c/cerebral_eruption.txt
+++ b/forge-gui/res/cardsfolder/c/cerebral_eruption.txt
@@ -1,10 +1,10 @@
 Name:Cerebral Eruption
 ManaCost:2 R R
 Types:Sorcery
-A:SP$ Dig | Cost$ 2 R R | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | DigNum$ 1 | Reveal$ True | NoMove$ True | RememberRevealed$ True | SubAbility$ DBDamage | SpellDescription$ Target opponent reveals the top card of their library. Cerebral Eruption deals damage equal to the revealed card's converted mana cost to that player and each creature he or she controls. If a land card is revealed this way, return Cerebral Eruption to its owner's hand.
-SVar:DBDamage:DB$ DamageAll | ValidCards$ Creature.TargetedPlayerCtrl | ValidPlayers$ Targeted | ValidDescription$ that player and each creature he or she controls. | NumDmg$ X | SubAbility$ DBReturn | References$ X
+A:SP$ Dig | Cost$ 2 R R | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | DigNum$ 1 | Reveal$ True | NoMove$ True | RememberRevealed$ True | SubAbility$ DBDamage | SpellDescription$ Target opponent reveals the top card of their library. Cerebral Eruption deals damage equal to the revealed card's converted mana cost to that player and each creature they control. If a land card is revealed this way, return Cerebral Eruption to its owner's hand.
+SVar:DBDamage:DB$ DamageAll | ValidCards$ Creature.TargetedPlayerCtrl | ValidPlayers$ Targeted | ValidDescription$ that player and each creature they control. | NumDmg$ X | SubAbility$ DBReturn | References$ X
 SVar:DBReturn:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Hand | ConditionDefined$ Remembered | ConditionPresent$ Land | ConditionCompare$ EQ1 | ConditionDescription$ If a land card is revealed this way, | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$CardManaCost
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cerebral_eruption.jpg
-Oracle:Target opponent reveals the top card of their library. Cerebral Eruption deals damage equal to the revealed card's converted mana cost to that player and each creature he or she controls. If a land card is revealed this way, return Cerebral Eruption to its owner's hand.
+Oracle:Target opponent reveals the top card of their library. Cerebral Eruption deals damage equal to the revealed card's converted mana cost to that player and each creature they control. If a land card is revealed this way, return Cerebral Eruption to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/c/chandra_nalaar.txt b/forge-gui/res/cardsfolder/c/chandra_nalaar.txt
index 1f779b42044..b44dce95c59 100644
--- a/forge-gui/res/cardsfolder/c/chandra_nalaar.txt
+++ b/forge-gui/res/cardsfolder/c/chandra_nalaar.txt
@@ -4,7 +4,7 @@ Types:Legendary Planeswalker Chandra
 Loyalty:6
 A:AB$ DealDamage | Cost$ AddCounter<1/LOYALTY> | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 1 | Planeswalker$ True | SpellDescription$ CARDNAME deals 1 damage to target player.
 A:AB$ DealDamage | Cost$ SubCounter<X/LOYALTY> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ ChosenX | Planeswalker$ True | References$ X | SpellDescription$ CARDNAME deals X damage to target creature.
-A:AB$ DamageAll | Cost$ SubCounter<8/LOYALTY> | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 10 | ValidCards$ Creature | ValidPlayers$ Targeted | Planeswalker$ True | Ultimate$ True | ValidDescription$ target player and each creature he or she controls. | SpellDescription$ CARDNAME deals 10 damage to target player and each creature he or she controls.
+A:AB$ DamageAll | Cost$ SubCounter<8/LOYALTY> | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 10 | ValidCards$ Creature | ValidPlayers$ Targeted | Planeswalker$ True | Ultimate$ True | ValidDescription$ target player and each creature they control. | SpellDescription$ CARDNAME deals 10 damage to target player and each creature they control.
 SVar:X:XChoice
 SVar:Picture:http://resources.wizards.com/magic/cards/lrw/en/card140176.jpg
-Oracle:[+1]: Chandra Nalaar deals 1 damage to target player.\n[-X]: Chandra Nalaar deals X damage to target creature.\n[-8]: Chandra Nalaar deals 10 damage to target player and each creature he or she controls.
+Oracle:[+1]: Chandra Nalaar deals 1 damage to target player.\n[-X]: Chandra Nalaar deals X damage to target creature.\n[-8]: Chandra Nalaar deals 10 damage to target player and each creature they control.
diff --git a/forge-gui/res/cardsfolder/c/chandra_pyrogenius.txt b/forge-gui/res/cardsfolder/c/chandra_pyrogenius.txt
index bdc0eb8cc63..45c2fb38f2f 100644
--- a/forge-gui/res/cardsfolder/c/chandra_pyrogenius.txt
+++ b/forge-gui/res/cardsfolder/c/chandra_pyrogenius.txt
@@ -4,7 +4,7 @@ Types:Legendary Planeswalker Chandra
 Loyalty:5
 A:AB$ DealDamage | Cost$ AddCounter<2/LOYALTY> | Planeswalker$ True | Defined$ Player.Opponent | NumDmg$ 2 | AILogic$ Good | SpellDescription$ CARDNAME deals 2 damage to each opponent.
 A:AB$ DealDamage | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 4 | SpellDescription$ CARDNAME deals 4 damage to target creature.
-A:AB$ DamageAll | Cost$ SubCounter<10/LOYALTY> | Planeswalker$ True | Ultimate$ True | NumDmg$ 6 | ValidTgts$ Player | TgtPrompt$ Select a player | ValidCards$ Creature | ValidPlayers$ Targeted | ValidDescription$ target player and each creature he or she controls. | SpellDescription$ CARDNAME deals 6 damage to target player and each creature he or she controls.
+A:AB$ DamageAll | Cost$ SubCounter<10/LOYALTY> | Planeswalker$ True | Ultimate$ True | NumDmg$ 6 | ValidTgts$ Player | TgtPrompt$ Select a player | ValidCards$ Creature | ValidPlayers$ Targeted | ValidDescription$ target player and each creature they control. | SpellDescription$ CARDNAME deals 6 damage to target player and each creature they control.
 DeckHints:Name$Liberating Combustion
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chandra_pyrogenius.jpg
-Oracle:[+2]: Chandra, Pyrogenius deals 2 damage to each opponent.\n[-3]: Chandra, Pyrogenius deals 4 damage to target creature.\n[-10]: Chandra, Pyrogenius deals 6 damage to target player and each creature he or she controls.
+Oracle:[+2]: Chandra, Pyrogenius deals 2 damage to each opponent.\n[-3]: Chandra, Pyrogenius deals 4 damage to target creature.\n[-10]: Chandra, Pyrogenius deals 6 damage to target player and each creature they control.
diff --git a/forge-gui/res/cardsfolder/c/chaotic_backlash.txt b/forge-gui/res/cardsfolder/c/chaotic_backlash.txt
index e481f40bb1f..1c6dd9c0e96 100644
--- a/forge-gui/res/cardsfolder/c/chaotic_backlash.txt
+++ b/forge-gui/res/cardsfolder/c/chaotic_backlash.txt
@@ -1,7 +1,7 @@
 Name:Chaotic Backlash
 ManaCost:4 R
 Types:Instant
-A:SP$ DealDamage | Cost$ 4 R | NumDmg$ Backlash | References$ Backlash | TgtPrompt$ Select target player to damage | ValidTgts$ Player | SpellDescription$ CARDNAME deals damage to target player equal to twice the number of white and/or blue permanents he or she controls.
+A:SP$ DealDamage | Cost$ 4 R | NumDmg$ Backlash | References$ Backlash | TgtPrompt$ Select target player to damage | ValidTgts$ Player | SpellDescription$ CARDNAME deals damage to target player equal to twice the number of white and/or blue permanents they control.
 SVar:Backlash:Count$Valid Permanent.Blue+TargetedPlayerCtrl,Permanent.White+TargetedPlayerCtrl/Times.2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/chaotic_backlash.jpg
-Oracle:Chaotic Backlash deals damage to target player equal to twice the number of white and/or blue permanents he or she controls.
+Oracle:Chaotic Backlash deals damage to target player equal to twice the number of white and/or blue permanents they control.
diff --git a/forge-gui/res/cardsfolder/c/citadel_of_pain.txt b/forge-gui/res/cardsfolder/c/citadel_of_pain.txt
index 354e9602d5e..2790d51da5a 100644
--- a/forge-gui/res/cardsfolder/c/citadel_of_pain.txt
+++ b/forge-gui/res/cardsfolder/c/citadel_of_pain.txt
@@ -1,11 +1,11 @@
 Name:Citadel of Pain
 ManaCost:2 R
 Types:Enchantment
-T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of each player's end step, CARDNAME deals X damage to that player, where X is the number of untapped lands he or she controls.
+T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of each player's end step, CARDNAME deals X damage to that player, where X is the number of untapped lands they control.
 SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ X | References$ X
 SVar:X:Count$Valid Land.untapped+ActivePlayerCtrl
 S:Mode$ Continuous | Affected$ Land | AddSVar$ AITap
 SVar:AITap:SVar:AITapDown:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/citadel_of_pain.jpg
-Oracle:At the beginning of each player's end step, Citadel of Pain deals X damage to that player, where X is the number of untapped lands he or she controls.
+Oracle:At the beginning of each player's end step, Citadel of Pain deals X damage to that player, where X is the number of untapped lands they control.
diff --git a/forge-gui/res/cardsfolder/c/cold_snap.txt b/forge-gui/res/cardsfolder/c/cold_snap.txt
index dd513d29d05..265f7140d74 100644
--- a/forge-gui/res/cardsfolder/c/cold_snap.txt
+++ b/forge-gui/res/cardsfolder/c/cold_snap.txt
@@ -2,9 +2,9 @@ Name:Cold Snap
 ManaCost:2 W
 Types:Enchantment
 K:Cumulative upkeep:2
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's upkeep, CARDNAME deals damage to that player equal to the number of snow lands he or she controls.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's upkeep, CARDNAME deals damage to that player equal to the number of snow lands they control.
 SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ X | References$ X
 SVar:X:Count$Valid Land.Snow+ActivePlayerCtrl
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cold_snap.jpg
-Oracle:Cumulative upkeep {2} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)\nAt the beginning of each player's upkeep, Cold Snap deals damage to that player equal to the number of snow lands he or she controls.
+Oracle:Cumulative upkeep {2} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)\nAt the beginning of each player's upkeep, Cold Snap deals damage to that player equal to the number of snow lands they control.
diff --git a/forge-gui/res/cardsfolder/c/collapsing_borders.txt b/forge-gui/res/cardsfolder/c/collapsing_borders.txt
index 76675e4c44e..01d5af149d0 100644
--- a/forge-gui/res/cardsfolder/c/collapsing_borders.txt
+++ b/forge-gui/res/cardsfolder/c/collapsing_borders.txt
@@ -1,10 +1,10 @@
 Name:Collapsing Borders
 ManaCost:3 R
 Types:Enchantment
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ TrigGainLife | TriggerZones$ Battlefield | TriggerDescription$ Domain — At the beginning of each player's upkeep, that player gains 1 life for each basic land type among lands he or she controls. Then CARDNAME deals 3 damage to him or her.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ TrigGainLife | TriggerZones$ Battlefield | TriggerDescription$ Domain — At the beginning of each player's upkeep, that player gains 1 life for each basic land type among lands they control. Then CARDNAME deals 3 damage to him or her.
 SVar:TrigGainLife:DB$ GainLife | Defined$ TriggeredPlayer | LifeAmount$ DomainX | SubAbility$ DBDamage | References$ DomainX
 SVar:DBDamage:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ 3
 SVar:DomainX:Count$DomainActivePlayer
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/collapsing_borders.jpg
-Oracle:Domain — At the beginning of each player's upkeep, that player gains 1 life for each basic land type among lands he or she controls. Then Collapsing Borders deals 3 damage to him or her.
+Oracle:Domain — At the beginning of each player's upkeep, that player gains 1 life for each basic land type among lands they control. Then Collapsing Borders deals 3 damage to him or her.
diff --git a/forge-gui/res/cardsfolder/c/collective_restraint.txt b/forge-gui/res/cardsfolder/c/collective_restraint.txt
index 16cd2e8bf69..aa5bba422b1 100644
--- a/forge-gui/res/cardsfolder/c/collective_restraint.txt
+++ b/forge-gui/res/cardsfolder/c/collective_restraint.txt
@@ -1,7 +1,7 @@
 Name:Collective Restraint
 ManaCost:3 U
 Types:Enchantment
-S:Mode$ CantAttackUnless | ValidCard$ Creature | Target$ You | Cost$ X | Description$ Domain — Creatures can't attack you unless their controller pays {X} for each creature he or she controls that's attacking you, where X is the number of basic land types among lands you control.
+S:Mode$ CantAttackUnless | ValidCard$ Creature | Target$ You | Cost$ X | Description$ Domain — Creatures can't attack you unless their controller pays {X} for each creature they control that's attacking you, where X is the number of basic land types among lands you control.
 SVar:X:Count$Domain
 SVar:Picture:http://www.wizards.com/global/images/magic/general/collective_restraint.jpg
-Oracle:Domain — Creatures can't attack you unless their controller pays {X} for each creature he or she controls that's attacking you, where X is the number of basic land types among lands you control.
+Oracle:Domain — Creatures can't attack you unless their controller pays {X} for each creature they control that's attacking you, where X is the number of basic land types among lands you control.
diff --git a/forge-gui/res/cardsfolder/c/crackling_doom.txt b/forge-gui/res/cardsfolder/c/crackling_doom.txt
index 225914fac64..5853c8446d3 100644
--- a/forge-gui/res/cardsfolder/c/crackling_doom.txt
+++ b/forge-gui/res/cardsfolder/c/crackling_doom.txt
@@ -1,9 +1,9 @@
 Name:Crackling Doom
 ManaCost:R W B
 Types:Instant
-A:SP$ DealDamage | Cost$ R B W | Defined$ Player.Opponent | NumDmg$ 2 | AILogic$ OpponentHasCreatures | SubAbility$ DBRepeat | SpellDescription$ CARDNAME deals 2 damage to each opponent. Each opponent sacrifices a creature with the greatest power among creatures he or she controls.
+A:SP$ DealDamage | Cost$ R B W | Defined$ Player.Opponent | NumDmg$ 2 | AILogic$ OpponentHasCreatures | SubAbility$ DBRepeat | SpellDescription$ CARDNAME deals 2 damage to each opponent. Each opponent sacrifices a creature with the greatest power among creatures they control.
 SVar:DBRepeat:DB$ RepeatEach | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ DBChooseCard
 SVar:DBChooseCard:DB$ ChooseCard | Defined$ Player.IsRemembered | Choices$ Creature.greatestPowerControlledByRemembered | Mandatory$ True | SubAbility$ DBSac
 SVar:DBSac:DB$ Sacrifice | Defined$ Player.IsRemembered | SacValid$ Card.ChosenCard | SacMessage$ the creature with the highest power
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crackling_doom.jpg
-Oracle:Crackling Doom deals 2 damage to each opponent. Each opponent sacrifices a creature with the greatest power among creatures he or she controls.
+Oracle:Crackling Doom deals 2 damage to each opponent. Each opponent sacrifices a creature with the greatest power among creatures they control.
diff --git a/forge-gui/res/cardsfolder/c/crashing_boars.txt b/forge-gui/res/cardsfolder/c/crashing_boars.txt
index 25571dd40cb..c8f4d34763a 100644
--- a/forge-gui/res/cardsfolder/c/crashing_boars.txt
+++ b/forge-gui/res/cardsfolder/c/crashing_boars.txt
@@ -2,8 +2,8 @@ Name:Crashing Boars
 ManaCost:3 G G
 Types:Creature Boar
 PT:4/4
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ Whenever CARDNAME attacks, defending player chooses an untapped creature he or she controls. That creature blocks CARDNAME this turn if able.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ Whenever CARDNAME attacks, defending player chooses an untapped creature they control. That creature blocks CARDNAME this turn if able.
 SVar:TrigChoose:DB$ ChooseCard | Defined$ DefendingPlayer | Amount$ 1 | Choices$ Creature.untapped+DefenderCtrl | Mandatory$ True | SubAbility$ DBMustBlock
 SVar:DBMustBlock:DB$ MustBlock | Defined$ ChosenCard
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crashing_boars.jpg
-Oracle:Whenever Crashing Boars attacks, defending player chooses an untapped creature he or she controls. That creature blocks Crashing Boars this turn if able.
+Oracle:Whenever Crashing Boars attacks, defending player chooses an untapped creature they control. That creature blocks Crashing Boars this turn if able.
diff --git a/forge-gui/res/cardsfolder/c/crimson_honor_guard.txt b/forge-gui/res/cardsfolder/c/crimson_honor_guard.txt
index da17b58cf62..bc40d17a44b 100644
--- a/forge-gui/res/cardsfolder/c/crimson_honor_guard.txt
+++ b/forge-gui/res/cardsfolder/c/crimson_honor_guard.txt
@@ -3,8 +3,8 @@ ManaCost:3 R R
 Types:Creature Vampire Knight
 PT:4/5
 K:Trample
-T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | Execute$ TrigDealDamage | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's end step, CARDNAME deals 4 damage to that player unless he or she controls a commander.
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | Execute$ TrigDealDamage | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's end step, CARDNAME deals 4 damage to that player unless they control a commander.
 SVar:TrigDealDamage:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ 4 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | References$ X
 SVar:X:Count$Valid Permanent.IsCommander+ActivePlayerCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crimson_honor_guard.jpg
-Oracle:Trample\nAt the beginning of each player's end step, Crimson Honor Guard deals 4 damage to that player unless he or she controls a commander.
\ No newline at end of file
+Oracle:Trample\nAt the beginning of each player's end step, Crimson Honor Guard deals 4 damage to that player unless they control a commander.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/c/curfew.txt b/forge-gui/res/cardsfolder/c/curfew.txt
index d06f7bf2bb9..d6a2550348d 100644
--- a/forge-gui/res/cardsfolder/c/curfew.txt
+++ b/forge-gui/res/cardsfolder/c/curfew.txt
@@ -1,9 +1,9 @@
 Name:Curfew
 ManaCost:U
 Types:Instant
-A:SP$ RepeatEach | Cost$ U | RepeatPlayers$ Player | RepeatSubAbility$ PlayChoose | SubAbility$ BounceAll | SpellDescription$ Each player returns a creature he or she controls to its owner's hand.
+A:SP$ RepeatEach | Cost$ U | RepeatPlayers$ Player | RepeatSubAbility$ PlayChoose | SubAbility$ BounceAll | SpellDescription$ Each player returns a creature they control to its owner's hand.
 SVar:PlayChoose:DB$ ChooseCard | Defined$ Player.IsRemembered | Choices$ Creature.RememberedPlayerCtrl | Amount$ 1 | Mandatory$ True | AILogic$ WorstCard | ChoiceTitle$ Choose a creature you control | RememberChosen$ True
 SVar:BounceAll:DB$ ChangeZoneAll | Origin$ Battlefield | Destination$ Hand | ChangeType$ Creature.IsRemembered
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/curfew.jpg
-Oracle:Each player returns a creature he or she controls to its owner's hand.
+Oracle:Each player returns a creature they control to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/c/curse_of_bounty.txt b/forge-gui/res/cardsfolder/c/curse_of_bounty.txt
index 0c7e2d97099..9b2104aa9ee 100644
--- a/forge-gui/res/cardsfolder/c/curse_of_bounty.txt
+++ b/forge-gui/res/cardsfolder/c/curse_of_bounty.txt
@@ -3,8 +3,8 @@ ManaCost:1 G
 Types:Enchantment Aura Curse
 K:Enchant player
 A:SP$ Attach | Cost$ 1 G | ValidTgts$ Player | AILogic$ Curse
-T:Mode$ AttackersDeclared | ValidCard$ Creature | AttackedTarget$ Player.EnchantedBy | Execute$ TrigRepeat | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted player is attacked, untap all nonland permanents you control. Each opponent attacking that player untaps all nonland permanents he or she controls.
+T:Mode$ AttackersDeclared | ValidCard$ Creature | AttackedTarget$ Player.EnchantedBy | Execute$ TrigRepeat | TriggerZones$ Battlefield | TriggerDescription$ Whenever enchanted player is attacked, untap all nonland permanents you control. Each opponent attacking that player untaps all nonland permanents they control.
 SVar:TrigRepeat:DB$ RepeatEach | RepeatPlayers$ TriggeredAttackingPlayerAndYou | RepeatSubAbility$ TrigUntap
-SVar:TrigUntap:DB$ UntapAll | Defined$ Player.IsRemembered | ValidCards$ Permanent.nonLand | SpellDescription$ Whenever enchanted player is attacked, untap all nonland permanents you control. Each opponent attacking that player untaps all nonland permanents he or she controls.
+SVar:TrigUntap:DB$ UntapAll | Defined$ Player.IsRemembered | ValidCards$ Permanent.nonLand | SpellDescription$ Whenever enchanted player is attacked, untap all nonland permanents you control. Each opponent attacking that player untaps all nonland permanents they control.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/curse_of_vitality.jpg
-Oracle:Enchant player\nWhenever enchanted player is attacked, untap all nonland permanents you control. Each opponent attacking that player untaps all nonland permanents he or she controls.
+Oracle:Enchant player\nWhenever enchanted player is attacked, untap all nonland permanents you control. Each opponent attacking that player untaps all nonland permanents they control.
diff --git a/forge-gui/res/cardsfolder/c/curse_of_echoes.txt b/forge-gui/res/cardsfolder/c/curse_of_echoes.txt
index 5e2c7905dbb..71567499147 100644
--- a/forge-gui/res/cardsfolder/c/curse_of_echoes.txt
+++ b/forge-gui/res/cardsfolder/c/curse_of_echoes.txt
@@ -3,9 +3,9 @@ ManaCost:4 U
 Types:Enchantment Aura Curse
 K:Enchant player
 A:SP$ Attach | Cost$ 4 U | ValidTgts$ Player | AILogic$ Curse
-T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ Player.EnchantedBy | Execute$ TrigCopy | TriggerZones$ Battlefield | OptionalDecider$ TriggeredCardOpponent | TriggerDescription$ Whenever enchanted player casts an instant or sorcery spell, each other player may copy that spell and may choose new targets for the copy he or she controls.
+T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ Player.EnchantedBy | Execute$ TrigCopy | TriggerZones$ Battlefield | OptionalDecider$ TriggeredCardOpponent | TriggerDescription$ Whenever enchanted player casts an instant or sorcery spell, each other player may copy that spell and may choose new targets for the copy they control.
 SVar:TrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | Controller$ TriggeredCardOpponent
 SVar:RemAIDeck:True
 SVar:RemMultiplayer:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/curse_of_echoes.jpg
-Oracle:Enchant player\nWhenever enchanted player casts an instant or sorcery spell, each other player may copy that spell and may choose new targets for the copy he or she controls.
+Oracle:Enchant player\nWhenever enchanted player casts an instant or sorcery spell, each other player may copy that spell and may choose new targets for the copy they control.
diff --git a/forge-gui/res/cardsfolder/c/curse_of_the_cabal.txt b/forge-gui/res/cardsfolder/c/curse_of_the_cabal.txt
index 5ab21fa7f1d..71d37ec50e0 100644
--- a/forge-gui/res/cardsfolder/c/curse_of_the_cabal.txt
+++ b/forge-gui/res/cardsfolder/c/curse_of_the_cabal.txt
@@ -3,11 +3,11 @@ ManaCost:9 B
 Types:Sorcery
 K:Suspend:2:2 B B
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | Execute$ TrigCursePayUP | TriggerZones$ Exile | IsPresent$ Card.suspended+Self | PresentZone$ Exile | TriggerDescription$ At the beginning of each player's upkeep, if CARDNAME is suspended, that player may sacrifice a permanent. If he or she does, put two time counters on CARDNAME.
-A:SP$ Sacrifice | Cost$ 9 B | ValidTgts$ Player | TgtPrompt$ Select target player | Amount$ CurseX | SacValid$ Permanent | References$ CurseX | SpellDescription$ Target player sacrifices half the permanents he or she controls, rounded down.
+A:SP$ Sacrifice | Cost$ 9 B | ValidTgts$ Player | TgtPrompt$ Select target player | Amount$ CurseX | SacValid$ Permanent | References$ CurseX | SpellDescription$ Target player sacrifices half the permanents they control, rounded down.
 SVar:TrigCursePayUP:DB$ Sacrifice | Amount$ 1 | SacValid$ Permanent | Defined$ TriggeredPlayer | Optional$ True | AILogic$ OpponentOnly | RememberSacrificed$ True | SubAbility$ DBCursePutCounter
 SVar:DBCursePutCounter:DB$ PutCounter | CounterType$ TIME | CounterNum$ 2 | ConditionCheckSVar$ CurseY | ConditionSVarCompare$ GT0 | SubAbility$ DBCurseCleanup | References$ CurseY
 SVar:DBCurseCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:CurseX:TargetedPlayer$Valid Permanent.YouCtrl/HalfDown
 SVar:CurseY:Remembered$Amount
 SVar:Picture:http://www.wizards.com/global/images/magic/general/curse_of_the_cabal.jpg
-Oracle:Target player sacrifices half the permanents he or she controls, rounded down.\nSuspend 2—{2}{B}{B} (Rather than cast this card from your hand, you may pay {2}{B}{B} and exile it with two time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost.)\nAt the beginning of each player's upkeep, if Curse of the Cabal is suspended, that player may sacrifice a permanent. If he or she does, put two time counters on Curse of the Cabal.
+Oracle:Target player sacrifices half the permanents they control, rounded down.\nSuspend 2—{2}{B}{B} (Rather than cast this card from your hand, you may pay {2}{B}{B} and exile it with two time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost.)\nAt the beginning of each player's upkeep, if Curse of the Cabal is suspended, that player may sacrifice a permanent. If he or she does, put two time counters on Curse of the Cabal.
diff --git a/forge-gui/res/cardsfolder/d/descent_into_madness.txt b/forge-gui/res/cardsfolder/d/descent_into_madness.txt
index 22313ba8348..bb3e8b8ab96 100644
--- a/forge-gui/res/cardsfolder/d/descent_into_madness.txt
+++ b/forge-gui/res/cardsfolder/d/descent_into_madness.txt
@@ -1,7 +1,7 @@
 Name:Descent into Madness
 ManaCost:3 B B
 Types:Enchantment
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, put a despair counter on CARDNAME, then each player exiles X permanents he or she controls and/or cards from his or her hand, where X is the number of despair counters on CARDNAME.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, put a despair counter on CARDNAME, then each player exiles X permanents they control and/or cards from his or her hand, where X is the number of despair counters on CARDNAME.
 SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ DESPAIR | CounterNum$ 1 | SubAbility$ DBExileSelf
 SVar:DBExileSelf:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBExile
 SVar:DBExile:DB$ ChangeZone | DefinedPlayer$ Player.IsRemembered | Chooser$ Player.IsRemembered | ChangeType$ Permanent.RememberedPlayerCtrl,Card.RememberedPlayerCtrl | ChangeNum$ X | Hidden$ True | Origin$ Battlefield,Hand | Destination$ Exile | References$ X | Mandatory$ True
@@ -9,4 +9,4 @@ SVar:X:Count$CardCounters.DESPAIR
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/descent_into_madness.jpg
-Oracle:At the beginning of your upkeep, put a despair counter on Descent into Madness, then each player exiles X permanents he or she controls and/or cards from his or her hand, where X is the number of despair counters on Descent into Madness.
+Oracle:At the beginning of your upkeep, put a despair counter on Descent into Madness, then each player exiles X permanents they control and/or cards from his or her hand, where X is the number of despair counters on Descent into Madness.
diff --git a/forge-gui/res/cardsfolder/d/divine_reckoning.txt b/forge-gui/res/cardsfolder/d/divine_reckoning.txt
index 5dfd69653a1..d0a0e52fe5f 100644
--- a/forge-gui/res/cardsfolder/d/divine_reckoning.txt
+++ b/forge-gui/res/cardsfolder/d/divine_reckoning.txt
@@ -2,10 +2,10 @@ Name:Divine Reckoning
 ManaCost:2 W W
 Types:Sorcery
 K:Flashback 5 W W
-A:SP$ RepeatEach | Cost$ 2 W W | AILogic$ OpponentHasMultipleCreatures | RepeatPlayers$ Player | RepeatSubAbility$ DBChoose | SubAbility$ DBDestroyAll | SpellDescription$ Each player chooses a creature he or she controls. Destroy the rest.
+A:SP$ RepeatEach | Cost$ 2 W W | AILogic$ OpponentHasMultipleCreatures | RepeatPlayers$ Player | RepeatSubAbility$ DBChoose | SubAbility$ DBDestroyAll | SpellDescription$ Each player chooses a creature they control. Destroy the rest.
 SVar:DBChoose:DB$ ChooseCard | Defined$ Remembered | Amount$ 1 | Choices$ Creature.RememberedPlayerCtrl | Mandatory$ True | RememberChosen$ True
 SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Creature.IsNotRemembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/divine_reckoning.jpg
-Oracle:Each player chooses a creature he or she controls. Destroy the rest.\nFlashback {5}{W}{W} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
+Oracle:Each player chooses a creature they control. Destroy the rest.\nFlashback {5}{W}{W} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
diff --git a/forge-gui/res/cardsfolder/d/doomfall.txt b/forge-gui/res/cardsfolder/d/doomfall.txt
index 04c0865d978..efa518c25e8 100644
--- a/forge-gui/res/cardsfolder/d/doomfall.txt
+++ b/forge-gui/res/cardsfolder/d/doomfall.txt
@@ -2,7 +2,7 @@ Name:Doomfall
 ManaCost:2 B
 Types:Sorcery
 A:SP$ Charm | Cost$ 2 B | Choices$ DBChangeZone1,DBChangeZone2 | Defined$ You
-SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Player | DefinedPlayer$ Targeted | Mandatory$ True | ChangeType$ Creature | ChangeNum$ 1 | Hidden$ True | IsCurse$ True | Chooser$ Targeted | SpellDescription$ Target player exiles a creature he or she controls.
+SVar:DBChangeZone1:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Player | DefinedPlayer$ Targeted | Mandatory$ True | ChangeType$ Creature | ChangeNum$ 1 | Hidden$ True | IsCurse$ True | Chooser$ Targeted | SpellDescription$ Target player exiles a creature they control.
 SVar:DBChangeZone2:DB$ ChangeZone | Origin$ Hand | Destination$ Exile | DefinedPlayer$ Targeted | ValidTgts$ Player | Chooser$ You | ChangeType$ Card.nonLand | ChangeNum$ 1 | IsCurse$ True | Mandatory$ True | StackDescription$ SpellDescription | SpellDescription$ Target opponent reveals his or her hand. You choose a nonland card from it. Exile that card.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/doomfall.jpg
-Oracle:Choose one —\n• Target player exiles a creature he or she controls.\n• Target opponent reveals his or her hand. You choose a nonland card from it. Exile that card.
+Oracle:Choose one —\n• Target player exiles a creature they control.\n• Target opponent reveals his or her hand. You choose a nonland card from it. Exile that card.
diff --git a/forge-gui/res/cardsfolder/d/drain_power.txt b/forge-gui/res/cardsfolder/d/drain_power.txt
index 8e739a31876..4dd0f7a6bac 100644
--- a/forge-gui/res/cardsfolder/d/drain_power.txt
+++ b/forge-gui/res/cardsfolder/d/drain_power.txt
@@ -1,7 +1,7 @@
 Name:Drain Power
 ManaCost:U U
 Types:Sorcery
-A:SP$ ActivateAbility | Cost$ U U | ValidTgts$ Player | Type$ Land | ManaAbility$ True | SubAbility$ DBDrainMana | SpellDescription$ Target player activates a mana ability of each land he or she controls. Then that player loses all unspent mana and you add the mana lost this way.
+A:SP$ ActivateAbility | Cost$ U U | ValidTgts$ Player | Type$ Land | ManaAbility$ True | SubAbility$ DBDrainMana | SpellDescription$ Target player activates a mana ability of each land they control. Then that player loses all unspent mana and you add the mana lost this way.
 SVar:DBDrainMana:DB$ DrainMana | Defined$ Targeted | DrainMana$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/drain_power.jpg
-Oracle:Target player activates a mana ability of each land he or she controls. Then that player loses all unspent mana and you add the mana lost this way.
+Oracle:Target player activates a mana ability of each land they control. Then that player loses all unspent mana and you add the mana lost this way.
diff --git a/forge-gui/res/cardsfolder/d/dream_tides.txt b/forge-gui/res/cardsfolder/d/dream_tides.txt
index 9c60058b794..3dd8e1c623a 100644
--- a/forge-gui/res/cardsfolder/d/dream_tides.txt
+++ b/forge-gui/res/cardsfolder/d/dream_tides.txt
@@ -2,7 +2,7 @@ Name:Dream Tides
 ManaCost:2 U U
 Types:Enchantment
 S:Mode$ Continuous | Affected$ Creature | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Creatures don't untap during their controllers' untap steps.
-T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ At the beginning of each player's upkeep, that player may choose any number of tapped nongreen creatures he or she controls and pay {2} for each creature chosen this way. If the player does, untap those creatures.
+T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ At the beginning of each player's upkeep, that player may choose any number of tapped nongreen creatures they control and pay {2} for each creature chosen this way. If the player does, untap those creatures.
 SVar:TrigChoose:DB$ ChooseCard | Defined$ TriggeredPlayer | Amount$ X | References$ X | Choices$ Creature.tapped+nonGreen | TargetControls$ True | ChoiceTitle$ Choose any number of tapped nongreen creatures you control | ChoiceZone$ Battlefield | SubAbility$ DBUntap
 SVar:DBUntap:DB$ RepeatEach | DefinedCards$ ChosenCard | RepeatSubAbility$ UntapEach
 SVar:UntapEach:DB$ Untap | Defined$ Remembered | UnlessCost$ 2 | UnlessPayer$ RememberedController | UnlessSwitched$ True | ShowCurrentCard$ Remembered | SubAbility$ DBCleanup
@@ -11,4 +11,4 @@ SVar:X:Count$Valid Creature.tapped+nonGreen+ActivePlayerCtrl
 SVar:RemRandomDeck:True
 SVar:NonStackingEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dream_tides.jpg
-Oracle:Creatures don't untap during their controllers' untap steps.\nAt the beginning of each player's upkeep, that player may choose any number of tapped nongreen creatures he or she controls and pay {2} for each creature chosen this way. If the player does, untap those creatures.
+Oracle:Creatures don't untap during their controllers' untap steps.\nAt the beginning of each player's upkeep, that player may choose any number of tapped nongreen creatures they control and pay {2} for each creature chosen this way. If the player does, untap those creatures.
diff --git a/forge-gui/res/cardsfolder/e/early_harvest.txt b/forge-gui/res/cardsfolder/e/early_harvest.txt
index badefb2525b..cdea8daf89e 100644
--- a/forge-gui/res/cardsfolder/e/early_harvest.txt
+++ b/forge-gui/res/cardsfolder/e/early_harvest.txt
@@ -1,7 +1,7 @@
 Name:Early Harvest
 ManaCost:1 G G
 Types:Instant
-A:SP$ UntapAll | Cost$ 1 G G | ValidTgts$ Player | TgtPrompt$ Select target player | ValidCards$ Land.Basic | SpellDescription$ Target player untaps all basic lands he or she controls.
+A:SP$ UntapAll | Cost$ 1 G G | ValidTgts$ Player | TgtPrompt$ Select target player | ValidCards$ Land.Basic | SpellDescription$ Target player untaps all basic lands they control.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/early_harvest.jpg
-Oracle:Target player untaps all basic lands he or she controls.
+Oracle:Target player untaps all basic lands they control.
diff --git a/forge-gui/res/cardsfolder/e/echo_chamber.txt b/forge-gui/res/cardsfolder/e/echo_chamber.txt
index 6aa84f1439b..ff562a1a461 100644
--- a/forge-gui/res/cardsfolder/e/echo_chamber.txt
+++ b/forge-gui/res/cardsfolder/e/echo_chamber.txt
@@ -1,9 +1,9 @@
 Name:Echo Chamber
 ManaCost:4
 Types:Artifact
-A:AB$ CopyPermanent | Cost$ 4 T | ValidTgts$ Creature | TargetingPlayer$ Player.Opponent | TargetingPlayerControls$ True | TgtPrompt$ Select target creature you control | RememberCopied$ True | AtEOT$ Exile | SorcerySpeed$ True | SubAbility$ DBPump | SpellDescription$ An opponent chooses target creature he or she controls. Create a token that's a copy of that creature. That token gains haste until end of turn. Exile the token at the beginning of the next end step. Activate this ability only any time you could cast a sorcery.
+A:AB$ CopyPermanent | Cost$ 4 T | ValidTgts$ Creature | TargetingPlayer$ Player.Opponent | TargetingPlayerControls$ True | TgtPrompt$ Select target creature you control | RememberCopied$ True | AtEOT$ Exile | SorcerySpeed$ True | SubAbility$ DBPump | SpellDescription$ An opponent chooses target creature they control. Create a token that's a copy of that creature. That token gains haste until end of turn. Exile the token at the beginning of the next end step. Activate this ability only any time you could cast a sorcery.
 SVar:DBPump:DB$ Animate | Keywords$ Haste | sVars$ SneakAttackEOT | Defined$ Remembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:SneakAttackEOT:SVar:EndOfTurnLeavePlay:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/echo_chamber.jpg
-Oracle:{4}, {T}: An opponent chooses target creature he or she controls. Create a token that's a copy of that creature. That token gains haste until end of turn. Exile the token at the beginning of the next end step. Activate this ability only any time you could cast a sorcery.
+Oracle:{4}, {T}: An opponent chooses target creature they control. Create a token that's a copy of that creature. That token gains haste until end of turn. Exile the token at the beginning of the next end step. Activate this ability only any time you could cast a sorcery.
diff --git a/forge-gui/res/cardsfolder/e/elephant_grass.txt b/forge-gui/res/cardsfolder/e/elephant_grass.txt
index 3dfbcf7862e..468c5112355 100644
--- a/forge-gui/res/cardsfolder/e/elephant_grass.txt
+++ b/forge-gui/res/cardsfolder/e/elephant_grass.txt
@@ -3,6 +3,6 @@ ManaCost:G
 Types:Enchantment
 K:Cumulative upkeep:1
 S:Mode$ CantAttack | ValidCard$ Creature.Black | Target$ You | Description$ Black creatures can't attack you.
-S:Mode$ CantAttackUnless | ValidCard$ Creature.nonBlack | Target$ You | Cost$ 2 | Description$ Nonblack creatures can't attack you unless their controller pays {2} for each creature he or she controls that's attacking you.
+S:Mode$ CantAttackUnless | ValidCard$ Creature.nonBlack | Target$ You | Cost$ 2 | Description$ Nonblack creatures can't attack you unless their controller pays {2} for each creature they control that's attacking you.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elephant_grass.jpg
-Oracle:Cumulative upkeep {1} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)\nBlack creatures can't attack you.\nNonblack creatures can't attack you unless their controller pays {2} for each creature he or she controls that's attacking you.
+Oracle:Cumulative upkeep {1} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)\nBlack creatures can't attack you.\nNonblack creatures can't attack you unless their controller pays {2} for each creature they control that's attacking you.
diff --git a/forge-gui/res/cardsfolder/e/emissary_of_despair.txt b/forge-gui/res/cardsfolder/e/emissary_of_despair.txt
index 499cd11f8f6..dbb0de875ab 100644
--- a/forge-gui/res/cardsfolder/e/emissary_of_despair.txt
+++ b/forge-gui/res/cardsfolder/e/emissary_of_despair.txt
@@ -3,8 +3,8 @@ ManaCost:1 B B
 Types:Creature Spirit
 PT:2/1
 K:Flying
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player loses 1 life for each artifact he or she controls.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player loses 1 life for each artifact they control.
 SVar:TrigLoseLife:DB$LoseLife | Defined$ TriggeredTarget | LifeAmount$ X | References$ X
 SVar:X:Count$Valid Artifact.DefenderCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/emissary_of_despair.jpg
-Oracle:Flying\nWhenever Emissary of Despair deals combat damage to a player, that player loses 1 life for each artifact he or she controls.
+Oracle:Flying\nWhenever Emissary of Despair deals combat damage to a player, that player loses 1 life for each artifact they control.
diff --git a/forge-gui/res/cardsfolder/e/epicenter.txt b/forge-gui/res/cardsfolder/e/epicenter.txt
index 3ab2e6be7f3..975124f4acf 100644
--- a/forge-gui/res/cardsfolder/e/epicenter.txt
+++ b/forge-gui/res/cardsfolder/e/epicenter.txt
@@ -1,8 +1,8 @@
 Name:Epicenter
 ManaCost:4 R
 Types:Sorcery
-A:SP$ Sacrifice | Cost$ 4 R | ConditionCheckSVar$ X | ConditionSVarCompare$ LE6 | ValidTgts$ Player | SacValid$ Land | SacMessage$ Land | SubAbility$ DBWasteLand | SpellDescription$ Target player sacrifices a Land. Threshold — Each player sacrifices all lands he or she controls instead if seven or more cards are in your graveyard
+A:SP$ Sacrifice | Cost$ 4 R | ConditionCheckSVar$ X | ConditionSVarCompare$ LE6 | ValidTgts$ Player | SacValid$ Land | SacMessage$ Land | SubAbility$ DBWasteLand | SpellDescription$ Target player sacrifices a Land. Threshold — Each player sacrifices all lands they control instead if seven or more cards are in your graveyard
 SVar:DBWasteLand:DB$ SacrificeAll | Condition$ Threshold | ValidCards$ Land
 SVar:X:Count$InYourYard
 SVar:Picture:http://www.wizards.com/global/images/magic/general/epicenter.jpg
-Oracle:Target player sacrifices a land.\nThreshold — Each player sacrifices all lands he or she controls instead if seven or more cards are in your graveyard.
+Oracle:Target player sacrifices a land.\nThreshold — Each player sacrifices all lands they control instead if seven or more cards are in your graveyard.
diff --git a/forge-gui/res/cardsfolder/e/equipoise.txt b/forge-gui/res/cardsfolder/e/equipoise.txt
index d3101201269..df7775413cd 100644
--- a/forge-gui/res/cardsfolder/e/equipoise.txt
+++ b/forge-gui/res/cardsfolder/e/equipoise.txt
@@ -1,7 +1,7 @@
 Name:Equipoise
 ManaCost:2 W
 Types:Enchantment
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigEquipoise | TriggerDescription$ At the beginning of your upkeep, for each land target player controls in excess of the number you control, choose a land he or she controls, then the chosen permanents phase out. Repeat this process for artifacts and creatures. (While they're phased out, they're treated as though they don't exist. They phase in before that player untaps during his or her next untap step.)
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigEquipoise | TriggerDescription$ At the beginning of your upkeep, for each land target player controls in excess of the number you control, choose a land they control, then the chosen permanents phase out. Repeat this process for artifacts and creatures. (While they're phased out, they're treated as though they don't exist. They phase in before that player untaps during his or her next untap step.)
 SVar:TrigEquipoise:DB$ Pump | ValidTgts$ Player | IsCurse$ True | RememberTargets$ True | SubAbility$ ChooseLand
 SVar:ChooseLand:DB$ ChooseCard | Choices$ Land.TargetedPlayerCtrl | Mandatory$ True | Amount$ LandX | ChoiceTitle$ Choose a land that player controls | SubAbility$ PhasesLand | References$ LandX,OppLand,YourLand,ExcessLand
 SVar:PhasesLand:DB$ Phases | Defined$ ChosenCard | SubAbility$ ChooseArtifact
@@ -24,4 +24,4 @@ SVar:YourCreature:Count$Valid Creature.YouCtrl
 SVar:ExcessCreature:SVar$OppCreature/Minus.YourCreature
 SVar:NonStackingEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/equipoise.jpg
-Oracle:At the beginning of your upkeep, for each land target player controls in excess of the number you control, choose a land he or she controls, then the chosen permanents phase out. Repeat this process for artifacts and creatures. (While they're phased out, they're treated as though they don't exist. They phase in before that player untaps during his or her next untap step.)
+Oracle:At the beginning of your upkeep, for each land target player controls in excess of the number you control, choose a land they control, then the chosen permanents phase out. Repeat this process for artifacts and creatures. (While they're phased out, they're treated as though they don't exist. They phase in before that player untaps during his or her next untap step.)
diff --git a/forge-gui/res/cardsfolder/e/eunuchs_intrigues.txt b/forge-gui/res/cardsfolder/e/eunuchs_intrigues.txt
index d20d18f116a..8ea18164dd5 100644
--- a/forge-gui/res/cardsfolder/e/eunuchs_intrigues.txt
+++ b/forge-gui/res/cardsfolder/e/eunuchs_intrigues.txt
@@ -1,9 +1,9 @@
 Name:Eunuchs' Intrigues
 ManaCost:2 R
 Types:Sorcery
-A:SP$ ChooseCard | Cost$ 2 R | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | Amount$ 1 | Choices$ Creature.TargetedPlayerCtrl | SubAbility$ DBPumpAll | RememberChosen$ True | AILogic$ BestBlocker | SpellDescription$ Target opponent chooses a creature he or she controls. Other creatures he or she controls can't block this turn.
+A:SP$ ChooseCard | Cost$ 2 R | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | Amount$ 1 | Choices$ Creature.TargetedPlayerCtrl | SubAbility$ DBPumpAll | RememberChosen$ True | AILogic$ BestBlocker | SpellDescription$ Target opponent chooses a creature they control. Other creatures they control can't block this turn.
 SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.IsNotRemembered+TargetedPlayerCtrl | KW$ HIDDEN CARDNAME can't block. | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/eunuchs_intrigues.jpg
-Oracle:Target opponent chooses a creature he or she controls. Other creatures he or she controls can't block this turn.
+Oracle:Target opponent chooses a creature they control. Other creatures they control can't block this turn.
diff --git a/forge-gui/res/cardsfolder/e/evangelize.txt b/forge-gui/res/cardsfolder/e/evangelize.txt
index 688cb53a7e8..0cbd1b144c3 100644
--- a/forge-gui/res/cardsfolder/e/evangelize.txt
+++ b/forge-gui/res/cardsfolder/e/evangelize.txt
@@ -2,6 +2,6 @@ Name:Evangelize
 ManaCost:4 W
 Types:Sorcery
 K:Buyback:2 W W
-A:SP$ GainControl | Cost$ 4 W | ValidTgts$ Creature | TargetingPlayer$ Player.Opponent | TargetingPlayerControls$ True | SpellDescription$ Gain control of target creature of an opponent's choice he or she controls.
+A:SP$ GainControl | Cost$ 4 W | ValidTgts$ Creature | TargetingPlayer$ Player.Opponent | TargetingPlayerControls$ True | SpellDescription$ Gain control of target creature of an opponent's choice they control.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/evangelize.jpg
-Oracle:Buyback {2}{W}{W} (You may pay an additional {2}{W}{W} as you cast this spell. If you do, put this card into your hand as it resolves.)\nGain control of target creature of an opponent's choice he or she controls.
+Oracle:Buyback {2}{W}{W} (You may pay an additional {2}{W}{W} as you cast this spell. If you do, put this card into your hand as it resolves.)\nGain control of target creature of an opponent's choice they control.
diff --git a/forge-gui/res/cardsfolder/f/flame_wave.txt b/forge-gui/res/cardsfolder/f/flame_wave.txt
index 2fa92ef5fa5..826817c60c1 100644
--- a/forge-gui/res/cardsfolder/f/flame_wave.txt
+++ b/forge-gui/res/cardsfolder/f/flame_wave.txt
@@ -1,6 +1,6 @@
 Name:Flame Wave
 ManaCost:3 R R R R
 Types:Sorcery
-A:SP$ DamageAll | Cost$ 3 R R R R | NumDmg$ 4 | ValidTgts$ Player | TgtPrompt$ Select a player | ValidCards$ Creature | ValidPlayers$ Targeted | ValidDescription$ target player and each creature he or she controls. | SpellDescription$ CARDNAME deals 4 damage to target player and each creature he or she controls.
+A:SP$ DamageAll | Cost$ 3 R R R R | NumDmg$ 4 | ValidTgts$ Player | TgtPrompt$ Select a player | ValidCards$ Creature | ValidPlayers$ Targeted | ValidDescription$ target player and each creature they control. | SpellDescription$ CARDNAME deals 4 damage to target player and each creature they control.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flame_wave.jpg
-Oracle:Flame Wave deals 4 damage to target player and each creature he or she controls.
+Oracle:Flame Wave deals 4 damage to target player and each creature they control.
diff --git a/forge-gui/res/cardsfolder/f/flaming_gambit.txt b/forge-gui/res/cardsfolder/f/flaming_gambit.txt
index 3f064da95fd..7dd6849fd6a 100644
--- a/forge-gui/res/cardsfolder/f/flaming_gambit.txt
+++ b/forge-gui/res/cardsfolder/f/flaming_gambit.txt
@@ -2,11 +2,11 @@ Name:Flaming Gambit
 ManaCost:X R
 Types:Instant
 K:Flashback X R R
-A:SP$ Pump | Cost$ X R | IsCurse$ True | ValidTgts$ Player | TgtPrompt$ Select target player | References$ X | SubAbility$ DBChooseCard | StackDescription$ SpellDescription | SpellDescription$ CARDNAME deals X damage to target player. That player may choose a creature he or she controls and have CARDNAME deal that damage to it instead.
+A:SP$ Pump | Cost$ X R | IsCurse$ True | ValidTgts$ Player | TgtPrompt$ Select target player | References$ X | SubAbility$ DBChooseCard | StackDescription$ SpellDescription | SpellDescription$ CARDNAME deals X damage to target player. That player may choose a creature they control and have CARDNAME deal that damage to it instead.
 SVar:DBChooseCard:DB$ ChooseCard | Choices$ Card.Creature | Defined$ ParentTarget | MinAmount$ 0 | TargetControls$ True | AILogic$ WorstCard | SubAbility$ DBDamagePlayer
 SVar:DBDamagePlayer:DB$ DealDamage | Defined$ ParentTarget | NumDmg$ X | References$ X | ConditionDefined$ ChosenCard | ConditionPresent$ Card | ConditionCompare$ EQ0 | SubAbility$ DBDamageCreature
 SVar:DBDamageCreature:DB$ DealDamage | Defined$ ChosenCard | NumDmg$ X | References$ X | ConditionDefined$ ChosenCard | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearChosenCard$ True
 SVar:X:Count$xPaid
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flaming_gambit.jpg
-Oracle:Flaming Gambit deals X damage to target player. That player may choose a creature he or she controls and have Flaming Gambit deal that damage to it instead.\nFlashback {X}{R}{R} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
\ No newline at end of file
+Oracle:Flaming Gambit deals X damage to target player. That player may choose a creature they control and have Flaming Gambit deal that damage to it instead.\nFlashback {X}{R}{R} (You may cast this card from your graveyard for its flashback cost. Then exile it.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/f/flooded_woodlands.txt b/forge-gui/res/cardsfolder/f/flooded_woodlands.txt
index 31f4cc83541..448bed12381 100644
--- a/forge-gui/res/cardsfolder/f/flooded_woodlands.txt
+++ b/forge-gui/res/cardsfolder/f/flooded_woodlands.txt
@@ -1,7 +1,7 @@
 Name:Flooded Woodlands
 ManaCost:2 U B
 Types:Enchantment
-S:Mode$ CantAttackUnless | ValidCard$ Creature.Green | Target$ Player,Planeswalker | Cost$ Sac<1/Land> | Description$ Green creatures can't attack unless their controller sacrifices a land for each green creature he or she controls that's attacking. (This cost is paid as attackers are declared.)
+S:Mode$ CantAttackUnless | ValidCard$ Creature.Green | Target$ Player,Planeswalker | Cost$ Sac<1/Land> | Description$ Green creatures can't attack unless their controller sacrifices a land for each green creature they control that's attacking. (This cost is paid as attackers are declared.)
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/flooded_woodlands.jpg
-Oracle:Green creatures can't attack unless their controller sacrifices a land for each green creature he or she controls that's attacking. (This cost is paid as attackers are declared.)
+Oracle:Green creatures can't attack unless their controller sacrifices a land for each green creature they control that's attacking. (This cost is paid as attackers are declared.)
diff --git a/forge-gui/res/cardsfolder/g/ghostly_prison.txt b/forge-gui/res/cardsfolder/g/ghostly_prison.txt
index 31f5a683fc7..bd068c23c6f 100644
--- a/forge-gui/res/cardsfolder/g/ghostly_prison.txt
+++ b/forge-gui/res/cardsfolder/g/ghostly_prison.txt
@@ -1,6 +1,6 @@
 Name:Ghostly Prison
 ManaCost:2 W
 Types:Enchantment
-S:Mode$ CantAttackUnless | ValidCard$ Creature | Target$ You | Cost$ 2 | Description$ Creatures can't attack you unless their controller pays {2} for each creature he or she controls that's attacking you.
+S:Mode$ CantAttackUnless | ValidCard$ Creature | Target$ You | Cost$ 2 | Description$ Creatures can't attack you unless their controller pays {2} for each creature they control that's attacking you.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ghostly_prison.jpg
-Oracle:Creatures can't attack you unless their controller pays {2} for each creature he or she controls that's attacking you.
+Oracle:Creatures can't attack you unless their controller pays {2} for each creature they control that's attacking you.
diff --git a/forge-gui/res/cardsfolder/g/global_ruin.txt b/forge-gui/res/cardsfolder/g/global_ruin.txt
index 5ef24ea9872..0f198b9d23b 100644
--- a/forge-gui/res/cardsfolder/g/global_ruin.txt
+++ b/forge-gui/res/cardsfolder/g/global_ruin.txt
@@ -1,8 +1,8 @@
 Name:Global Ruin
 ManaCost:4 W
 Types:Sorcery
-A:SP$ ChooseCard | Cost$ 4 W | Defined$ Player | EachBasicType$ Controlled | SubAbility$ DBDestroy | SpellDescription$ Each player chooses from the lands he or she controls a land of each basic land type, then sacrifices the rest. | StackDescription$ SpellDescription
+A:SP$ ChooseCard | Cost$ 4 W | Defined$ Player | EachBasicType$ Controlled | SubAbility$ DBDestroy | SpellDescription$ Each player chooses from the lands they control a land of each basic land type, then sacrifices the rest. | StackDescription$ SpellDescription
 SVar:DBDestroy:DB$ SacrificeAll | ValidCards$ Land.nonChosenCard | StackDescription$ None
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/global_ruin.jpg
-Oracle:Each player chooses from the lands he or she controls a land of each basic land type, then sacrifices the rest.
+Oracle:Each player chooses from the lands they control a land of each basic land type, then sacrifices the rest.
diff --git a/forge-gui/res/cardsfolder/g/goblin_war_cry.txt b/forge-gui/res/cardsfolder/g/goblin_war_cry.txt
index 1d9ab40f78f..12960d8a35f 100644
--- a/forge-gui/res/cardsfolder/g/goblin_war_cry.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_war_cry.txt
@@ -1,9 +1,9 @@
 Name:Goblin War Cry
 ManaCost:2 R
 Types:Sorcery
-A:SP$ ChooseCard | Cost$ 2 R | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | Amount$ 1 | Choices$ Creature.TargetedPlayerCtrl | SubAbility$ DBPumpAll | RememberChosen$ True | AILogic$ BestBlocker | SpellDescription$ Target opponent chooses a creature he or she controls. Other creatures he or she controls can't block this turn.
+A:SP$ ChooseCard | Cost$ 2 R | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | Amount$ 1 | Choices$ Creature.TargetedPlayerCtrl | SubAbility$ DBPumpAll | RememberChosen$ True | AILogic$ BestBlocker | SpellDescription$ Target opponent chooses a creature they control. Other creatures they control can't block this turn.
 SVar:DBPumpAll:DB$ PumpAll | ValidCards$ Creature.IsNotRemembered+TargetedPlayerCtrl | KW$ HIDDEN CARDNAME can't block. | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_war_cry.jpg
-Oracle:Target opponent chooses a creature he or she controls. Other creatures he or she controls can't block this turn.
+Oracle:Target opponent chooses a creature they control. Other creatures they control can't block this turn.
diff --git a/forge-gui/res/cardsfolder/g/grand_ossuary.txt b/forge-gui/res/cardsfolder/g/grand_ossuary.txt
index 78f4ca3fd95..30115f24f33 100644
--- a/forge-gui/res/cardsfolder/g/grand_ossuary.txt
+++ b/forge-gui/res/cardsfolder/g/grand_ossuary.txt
@@ -1,11 +1,11 @@
 Name:Grand Ossuary
 ManaCost:no cost
 Types:Plane Ravnica
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature | TriggerZones$ Command | Execute$ OssuaryCounters | TriggerDescription$ Whenever a creature dies, its controller distributes a number of +1/+1 counters equal to its power among any number of target creatures he or she controls.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature | TriggerZones$ Command | Execute$ OssuaryCounters | TriggerDescription$ Whenever a creature dies, its controller distributes a number of +1/+1 counters equal to its power among any number of target creatures they control.
 SVar:OssuaryCounters:DB$ PutCounter | ValidTgts$ Creature | TargetsWithDefinedController$ TriggeredCardController | TargetingPlayer$ TriggeredCardController | TgtPrompt$ Select target creature you control to distribute counters to | CounterType$ P1P1 | CounterNum$ OssuaryX | TargetMin$ 1 | TargetMax$ MaxTgts | DividedAsYouChoose$ OssuaryX | References$ OssuaryX,MaxTgts
 SVar:OssuaryX:TriggeredCard$CardPower
 SVar:MaxTgts:TriggeredCardController$Valid Creature.YouCtrl
-T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, each player exiles all creatures he or she controls and creates X 1/1 green Saproling creature tokens, where X is the total power of the creatures he or she exiled this way. Then planeswalk.
+T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, each player exiles all creatures they control and creates X 1/1 green Saproling creature tokens, where X is the total power of the creatures he or she exiled this way. Then planeswalk.
 SVar:RolledChaos:DB$ ChangeZoneAll | ChangeType$ Creature | Imprint$ True | Origin$ Battlefield | Destination$ Exile | SubAbility$ OssuaryRepeat
 SVar:OssuaryRepeat:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ OssuaryTokens | SubAbility$ WalkAway
 SVar:OssuaryTokens:DB$ Token | TokenAmount$ OsX | References$ OsX | TokenName$ Saproling | TokenTypes$ Creature,Saproling | TokenOwner$ Player.IsRemembered | TokenColors$ Green | TokenPower$ 1 | TokenToughness$ 1
@@ -14,4 +14,4 @@ SVar:ClearImprinted:DB$ Cleanup | ClearImprinted$ True
 SVar:OsX:ImprintedLKI$FilterControlledByRemembered_CardPower
 SVar:AIRollPlanarDieParams:Mode$ Random | MinTurn$ 5
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grand_ossuary.jpg
-Oracle:Whenever a creature dies, its controller distributes a number of +1/+1 counters equal to its power among any number of target creatures he or she controls.\nWhenever you roll {CHAOS}, each player exiles all creatures he or she controls and creates X 1/1 green Saproling creature tokens, where X is the total power of the creatures he or she exiled this way. Then planeswalk.
+Oracle:Whenever a creature dies, its controller distributes a number of +1/+1 counters equal to its power among any number of target creatures they control.\nWhenever you roll {CHAOS}, each player exiles all creatures they control and creates X 1/1 green Saproling creature tokens, where X is the total power of the creatures he or she exiled this way. Then planeswalk.
diff --git a/forge-gui/res/cardsfolder/h/heart_of_bogardan.txt b/forge-gui/res/cardsfolder/h/heart_of_bogardan.txt
index b3e4b7e5e62..46a5c90b2c8 100644
--- a/forge-gui/res/cardsfolder/h/heart_of_bogardan.txt
+++ b/forge-gui/res/cardsfolder/h/heart_of_bogardan.txt
@@ -2,9 +2,9 @@ Name:Heart of Bogardan
 ManaCost:2 R R
 Types:Enchantment
 K:Cumulative upkeep:2
-T:Mode$ PayCumulativeUpkeep | ValidCard$ Card.Self | Paid$ False | Execute$ TrigDmg | TriggerDescription$ When a player doesn't pay CARDNAME's cumulative upkeep, CARDNAME deals X damage to target player and each creature he or she controls, where X is twice the number of age counters on CARDNAME minus 2.
-SVar:TrigDmg:DB$ DamageAll | NumDmg$ Y | ValidTgts$ Player | TgtPrompt$ Select a player | ValidCards$ Creature | ValidPlayers$ Targeted | ValidDescription$ target player and each creature he or she controls. | References$ X,Y | SpellDescription$ CARDNAME deals X damage to target player and each creature he or she controls.
+T:Mode$ PayCumulativeUpkeep | ValidCard$ Card.Self | Paid$ False | Execute$ TrigDmg | TriggerDescription$ When a player doesn't pay CARDNAME's cumulative upkeep, CARDNAME deals X damage to target player and each creature they control, where X is twice the number of age counters on CARDNAME minus 2.
+SVar:TrigDmg:DB$ DamageAll | NumDmg$ Y | ValidTgts$ Player | TgtPrompt$ Select a player | ValidCards$ Creature | ValidPlayers$ Targeted | ValidDescription$ target player and each creature they control. | References$ X,Y | SpellDescription$ CARDNAME deals X damage to target player and each creature they control.
 SVar:X:TriggeredCard$CardCounters.AGE/Twice
 SVar:Y:SVar$X/Minus.2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/heart_of_bogardan.jpg
-Oracle:Cumulative upkeep {2} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)\nWhen a player doesn't pay Heart of Bogardan's cumulative upkeep, Heart of Bogardan deals X damage to target player and each creature he or she controls, where X is twice the number of age counters on Heart of Bogardan minus 2.
+Oracle:Cumulative upkeep {2} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)\nWhen a player doesn't pay Heart of Bogardan's cumulative upkeep, Heart of Bogardan deals X damage to target player and each creature they control, where X is twice the number of age counters on Heart of Bogardan minus 2.
diff --git a/forge-gui/res/cardsfolder/h/heat_wave.txt b/forge-gui/res/cardsfolder/h/heat_wave.txt
index 4de1d9c4486..d4d7ddb338f 100644
--- a/forge-gui/res/cardsfolder/h/heat_wave.txt
+++ b/forge-gui/res/cardsfolder/h/heat_wave.txt
@@ -3,7 +3,7 @@ ManaCost:2 R
 Types:Enchantment
 K:Cumulative upkeep:R
 S:Mode$ CantBlockBy | ValidAttacker$ Creature.YouCtrl | ValidBlocker$ Creature.Blue | Description$ Blue creatures can't block creatures you control.
-S:Mode$ CantBlockUnless | ValidCard$ Creature.nonBlue | Attacker$ Creature.YouCtrl | Cost$ PayLife<1> | Description$ Nonblue creatures can't block creatures you control unless their controller pays 1 life for each blocking creature he or she controls.
+S:Mode$ CantBlockUnless | ValidCard$ Creature.nonBlue | Attacker$ Creature.YouCtrl | Cost$ PayLife<1> | Description$ Nonblue creatures can't block creatures you control unless their controller pays 1 life for each blocking creature they control.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/heat_wave.jpg
-Oracle:Cumulative upkeep {R} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)\nBlue creatures can't block creatures you control.\nNonblue creatures can't block creatures you control unless their controller pays 1 life for each blocking creature he or she controls.
+Oracle:Cumulative upkeep {R} (At the beginning of your upkeep, put an age counter on this permanent, then sacrifice it unless you pay its upkeep cost for each age counter on it.)\nBlue creatures can't block creatures you control.\nNonblue creatures can't block creatures you control unless their controller pays 1 life for each blocking creature they control.
diff --git a/forge-gui/res/cardsfolder/h/herald_of_the_host.txt b/forge-gui/res/cardsfolder/h/herald_of_the_host.txt
index 7ef5dc4a94c..8c0c8b5536b 100644
--- a/forge-gui/res/cardsfolder/h/herald_of_the_host.txt
+++ b/forge-gui/res/cardsfolder/h/herald_of_the_host.txt
@@ -7,4 +7,4 @@ K:Vigilance
 K:Myriad
 DeckHas:Ability$Token
 SVar:Picture:http://www.wizards.com/global/images/magic/general/herald_of_the_host.jpg
-Oracle:Flying, vigilance\nMyriad (Whenever this creature attacks, for each opponent other than defending player, you may create a token that's a copy of this creature that's tapped and attacking that player or a planeswalker he or she controls. If one or more tokens are created this way, exile the tokens at end of combat.)
+Oracle:Flying, vigilance\nMyriad (Whenever this creature attacks, for each opponent other than defending player, you may create a token that's a copy of this creature that's tapped and attacking that player or a planeswalker they control. If one or more tokens are created this way, exile the tokens at end of combat.)
diff --git a/forge-gui/res/cardsfolder/h/hokori_dust_drinker.txt b/forge-gui/res/cardsfolder/h/hokori_dust_drinker.txt
index 13a0146bfc3..9cf41bf5697 100644
--- a/forge-gui/res/cardsfolder/h/hokori_dust_drinker.txt
+++ b/forge-gui/res/cardsfolder/h/hokori_dust_drinker.txt
@@ -3,8 +3,8 @@ ManaCost:2 W W
 Types:Legendary Creature Spirit
 PT:2/2
 S:Mode$ Continuous | Affected$ Land | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Lands don't untap during their controller's untap steps.
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | IsPresent$ Card.Self | Execute$ TrigUntap | TriggerDescription$ At the beginning of each player's upkeep, that player untaps a land he or she controls.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | IsPresent$ Card.Self | Execute$ TrigUntap | TriggerDescription$ At the beginning of each player's upkeep, that player untaps a land they control.
 SVar:TrigUntap:DB$ Untap | UntapExactly$ True | UntapType$ Land.ActivePlayerCtrl | Amount$ 1 | Defined$ TriggeredPlayer
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hokori_dust_drinker.jpg
-Oracle:Lands don't untap during their controllers' untap steps.\nAt the beginning of each player's upkeep, that player untaps a land he or she controls.
+Oracle:Lands don't untap during their controllers' untap steps.\nAt the beginning of each player's upkeep, that player untaps a land they control.
diff --git a/forge-gui/res/cardsfolder/i/imaginary_threats.txt b/forge-gui/res/cardsfolder/i/imaginary_threats.txt
index 8c00b699e68..65c9e5097ce 100644
--- a/forge-gui/res/cardsfolder/i/imaginary_threats.txt
+++ b/forge-gui/res/cardsfolder/i/imaginary_threats.txt
@@ -3,11 +3,11 @@ ManaCost:2 U U
 Types:Instant
 A:SP$ Effect | Cost$ 2 U U | Name$ Imaginary Threats Effect 1 | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | StaticAbilities$ MustAttack | References$ MustAttack | RememberObjects$ Targeted | SubAbility$ DBEffect | SpellDescription$ Creatures target player controls attack this turn if able.
 SVar:MustAttack:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.RememberedPlayerCtrl | AddHiddenKeyword$ CARDNAME attacks each combat if able. | Description$ Creatures target opponent controls attack this turn if able.
-SVar:DBEffect:DB$ Effect | IsCurse$ True | StaticAbilities$ DontUntap | Triggers$ RemoveEffect | SVars$ ExileEffect | Duration$ Permanent | RememberObjects$ Targeted | Name$ Imaginary Threats Effect 2 | SubAbility$ DBCleanup | SpellDescription$ During that player's next untap step, creatures he or she controls don't untap.
+SVar:DBEffect:DB$ Effect | IsCurse$ True | StaticAbilities$ DontUntap | Triggers$ RemoveEffect | SVars$ ExileEffect | Duration$ Permanent | RememberObjects$ Targeted | Name$ Imaginary Threats Effect 2 | SubAbility$ DBCleanup | SpellDescription$ During that player's next untap step, creatures they control don't untap.
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.RememberedPlayerCtrl | AddHiddenKeyword$ This card doesn't untap during your next untap step. | Description$ Creatures target opponent controls don't untap during his or her next untap step.
 SVar:RemoveEffect:Mode$ Phase | Phase$ Untap | ValidPlayer$ Player.IsRemembered | TriggerZones$ Command | Static$ True | Execute$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 K:Cycling:2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/imaginary_threats.jpg
-Oracle:Creatures target opponent controls attack this turn if able. During that player's next untap step, creatures he or she controls don't untap.\nCycling {2} ({2}, Discard this card: Draw a card.)
\ No newline at end of file
+Oracle:Creatures target opponent controls attack this turn if able. During that player's next untap step, creatures they control don't untap.\nCycling {2} ({2}, Discard this card: Draw a card.)
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/i/imperial_edict.txt b/forge-gui/res/cardsfolder/i/imperial_edict.txt
index 456158725c5..df023f2ab98 100644
--- a/forge-gui/res/cardsfolder/i/imperial_edict.txt
+++ b/forge-gui/res/cardsfolder/i/imperial_edict.txt
@@ -1,6 +1,6 @@
 Name:Imperial Edict
 ManaCost:1 B
 Types:Sorcery
-A:SP$ Sacrifice | Cost$ 1 B | ValidTgts$ Opponent | SacValid$ Creature | SacMessage$ Creature | Destroy$ True | SpellDescription$ Target opponent chooses a creature he or she controls. Destroy it.
+A:SP$ Sacrifice | Cost$ 1 B | ValidTgts$ Opponent | SacValid$ Creature | SacMessage$ Creature | Destroy$ True | SpellDescription$ Target opponent chooses a creature they control. Destroy it.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/imperial_edict.jpg
-Oracle:Target opponent chooses a creature he or she controls. Destroy it.
+Oracle:Target opponent chooses a creature they control. Destroy it.
diff --git a/forge-gui/res/cardsfolder/i/incite_rebellion.txt b/forge-gui/res/cardsfolder/i/incite_rebellion.txt
index 1471ecfc29e..60c2cec655a 100644
--- a/forge-gui/res/cardsfolder/i/incite_rebellion.txt
+++ b/forge-gui/res/cardsfolder/i/incite_rebellion.txt
@@ -1,9 +1,9 @@
 Name:Incite Rebellion
 ManaCost:4 R R
 Types:Sorcery
-A:SP$ RepeatEach | Cost$ 4 R R | RepeatPlayers$ Player | RepeatSubAbility$ DmgEach | DamageMap$ True | SpellDescription$ For each player, CARDNAME deals damage to that player and each creature that player controls equal to the number of creatures he or she controls.
+A:SP$ RepeatEach | Cost$ 4 R R | RepeatPlayers$ Player | RepeatSubAbility$ DmgEach | DamageMap$ True | SpellDescription$ For each player, CARDNAME deals damage to that player and each creature that player controls equal to the number of creatures they control.
 SVar:DmgEach:DB$ DamageAll | ValidPlayers$ Remembered | ValidCards$ Creature.RememberedPlayerCtrl | NumDmg$ X | References$ X
 SVar:X:Count$Valid Creature.RememberedPlayerCtrl
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/incite_rebellion.jpg
-Oracle:For each player, Incite Rebellion deals damage to that player and each creature that player controls equal to the number of creatures he or she controls.
+Oracle:For each player, Incite Rebellion deals damage to that player and each creature that player controls equal to the number of creatures they control.
diff --git a/forge-gui/res/cardsfolder/k/karma.txt b/forge-gui/res/cardsfolder/k/karma.txt
index 5eeea91be7d..6e3a9082c64 100644
--- a/forge-gui/res/cardsfolder/k/karma.txt
+++ b/forge-gui/res/cardsfolder/k/karma.txt
@@ -1,9 +1,9 @@
 Name:Karma
 ManaCost:2 W W
 Types:Enchantment
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of each player's upkeep, CARDNAME deals damage to that player equal to the number of Swamps he or she controls.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of each player's upkeep, CARDNAME deals damage to that player equal to the number of Swamps they control.
 SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ X | References$ X
 SVar:X:Count$Valid Swamp.ActivePlayerCtrl
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/karma.jpg
-Oracle:At the beginning of each player's upkeep, Karma deals damage to that player equal to the number of Swamps he or she controls.
+Oracle:At the beginning of each player's upkeep, Karma deals damage to that player equal to the number of Swamps they control.
diff --git a/forge-gui/res/cardsfolder/k/keeper_of_the_dead.txt b/forge-gui/res/cardsfolder/k/keeper_of_the_dead.txt
index d6a3e91c1da..656c7807afb 100644
--- a/forge-gui/res/cardsfolder/k/keeper_of_the_dead.txt
+++ b/forge-gui/res/cardsfolder/k/keeper_of_the_dead.txt
@@ -2,10 +2,10 @@ Name:Keeper of the Dead
 ManaCost:B B
 Types:Creature Human Wizard
 PT:1/2
-A:AB$ Pump | Cost$ B T | ValidTgts$ Opponent | TgtPrompt$ Choose target opponent with at least two fewer creature cards in his or her graveyard than you | CheckSVar$ X | SVarCompare$ GEY | SubAbility$ DeadKeepersDestroy | StackDescription$ None | References$ X,Y | SpellDescription$ Choose target opponent who had at least two fewer creature cards in his or her graveyard than you did as you activated this ability. Destroy target nonblack creature he or she controls.
+A:AB$ Pump | Cost$ B T | ValidTgts$ Opponent | TgtPrompt$ Choose target opponent with at least two fewer creature cards in his or her graveyard than you | CheckSVar$ X | SVarCompare$ GEY | SubAbility$ DeadKeepersDestroy | StackDescription$ None | References$ X,Y | SpellDescription$ Choose target opponent who had at least two fewer creature cards in his or her graveyard than you did as you activated this ability. Destroy target nonblack creature they control.
 SVar:DeadKeepersDestroy:DB$ Destroy | ValidTgts$ Creature.nonBlack+TargetedPlayerCtrl | TgtPrompt$ Select target nonblack creature targeted player controls
 SVar:X:Count$TypeInYourYard.Creature/Minus.2
 SVar:Y:Count$TypeInOppYard.Creature
 SVar:Z:Remembered$Amount
 SVar:Picture:http://www.wizards.com/global/images/magic/general/keeper_of_the_dead.jpg
-Oracle:{B}, {T}: Choose target opponent who had at least two fewer creature cards in his or her graveyard than you did as you activated this ability. Destroy target nonblack creature he or she controls.
+Oracle:{B}, {T}: Choose target opponent who had at least two fewer creature cards in his or her graveyard than you did as you activated this ability. Destroy target nonblack creature they control.
diff --git a/forge-gui/res/cardsfolder/k/keldon_firebombers.txt b/forge-gui/res/cardsfolder/k/keldon_firebombers.txt
index 0b422989a7a..a5e7033b524 100644
--- a/forge-gui/res/cardsfolder/k/keldon_firebombers.txt
+++ b/forge-gui/res/cardsfolder/k/keldon_firebombers.txt
@@ -2,10 +2,10 @@ Name:Keldon Firebombers
 ManaCost:3 R R
 Types:Creature Human Soldier
 PT:3/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChooseThree | TriggerDescription$ When CARDNAME enters the battlefield, each player sacrifices all lands he or she controls except for three.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChooseThree | TriggerDescription$ When CARDNAME enters the battlefield, each player sacrifices all lands they control except for three.
 SVar:TrigChooseThree:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBChoose | SubAbility$ DBSacrificeAll
 SVar:DBChoose:DB$ ChooseCard | Amount$ 3 | Defined$ Remembered | Choices$ Land.RememberedPlayerCtrl | ChoiceZone$ Battlefield | RememberChosen$ True | ChoiceTitle$ Choose three lands that would not be sacrificed
 SVar:DBSacrificeAll:DB$ SacrificeAll | ValidCards$ Land.IsNotRemembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/keldon_firebombers.jpg
-Oracle:When Keldon Firebombers enters the battlefield, each player sacrifices all lands he or she controls except for three.
+Oracle:When Keldon Firebombers enters the battlefield, each player sacrifices all lands they control except for three.
diff --git a/forge-gui/res/cardsfolder/k/koskun_falls.txt b/forge-gui/res/cardsfolder/k/koskun_falls.txt
index 3cd54151afc..0ae82f000a8 100644
--- a/forge-gui/res/cardsfolder/k/koskun_falls.txt
+++ b/forge-gui/res/cardsfolder/k/koskun_falls.txt
@@ -2,8 +2,8 @@ Name:Koskun Falls
 ManaCost:2 B B
 Types:World Enchantment
 K:UpkeepCost:tapXType<1/Creature>
-S:Mode$ CantAttackUnless | ValidCard$ Creature | Target$ You | Cost$ 2 | Description$ Creatures can't attack you unless their controller pays {2} for each creature he or she controls that's attacking you.
+S:Mode$ CantAttackUnless | ValidCard$ Creature | Target$ You | Cost$ 2 | Description$ Creatures can't attack you unless their controller pays {2} for each creature they control that's attacking you.
 SVar:NeedsToPlayVar:Y GE1
 SVar:Y:Count$Valid Creature.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/koskun_falls.jpg
-Oracle:At the beginning of your upkeep, sacrifice Koskun Falls unless you tap an untapped creature you control.\nCreatures can't attack you unless their controller pays {2} for each creature he or she controls that's attacking you.
+Oracle:At the beginning of your upkeep, sacrifice Koskun Falls unless you tap an untapped creature you control.\nCreatures can't attack you unless their controller pays {2} for each creature they control that's attacking you.
diff --git a/forge-gui/res/cardsfolder/l/lavalanche.txt b/forge-gui/res/cardsfolder/l/lavalanche.txt
index d1fd0468962..04ddb903d85 100644
--- a/forge-gui/res/cardsfolder/l/lavalanche.txt
+++ b/forge-gui/res/cardsfolder/l/lavalanche.txt
@@ -1,7 +1,7 @@
 Name:Lavalanche
 ManaCost:X B R G
 Types:Sorcery
-A:SP$ DamageAll | Cost$ X B R G | NumDmg$ X | ValidTgts$ Player | TgtPrompt$ Select a player | ValidCards$ Creature | ValidPlayers$ Targeted | ValidDescription$ target player and each creature he or she controls. | References$ X | SpellDescription$ CARDNAME deals X damage to target player and each creature he or she controls.
+A:SP$ DamageAll | Cost$ X B R G | NumDmg$ X | ValidTgts$ Player | TgtPrompt$ Select a player | ValidCards$ Creature | ValidPlayers$ Targeted | ValidDescription$ target player and each creature they control. | References$ X | SpellDescription$ CARDNAME deals X damage to target player and each creature they control.
 SVar:X:Count$xPaid
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lavalanche.jpg
-Oracle:Lavalanche deals X damage to target player and each creature he or she controls.
+Oracle:Lavalanche deals X damage to target player and each creature they control.
diff --git a/forge-gui/res/cardsfolder/l/limited_resources.txt b/forge-gui/res/cardsfolder/l/limited_resources.txt
index e5dab782be3..d2e2671f5eb 100644
--- a/forge-gui/res/cardsfolder/l/limited_resources.txt
+++ b/forge-gui/res/cardsfolder/l/limited_resources.txt
@@ -1,7 +1,7 @@
 Name:Limited Resources
 ManaCost:W
 Types:Enchantment
-T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ DBRepeatResources | TriggerDescription$ When CARDNAME enters the battlefield, each player chooses five lands he or she controls and sacrifices the rest.
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ DBRepeatResources | TriggerDescription$ When CARDNAME enters the battlefield, each player chooses five lands they control and sacrifices the rest.
 SVar:DBRepeatResources:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ CardChoice
 SVar:CardChoice:DB$ ChooseCard | Defined$ Remembered | Amount$ 5 | Choices$ Land.RememberedPlayerCtrl | ChoiceTitle$ Choose a land | RememberChosen$ True | SubAbility$ SacRest
 SVar:SacRest:DB$ SacrificeAll | ValidCards$ Land.RememberedPlayerCtrl+IsNotRemembered | SubAbility$ DBCleanup
@@ -12,4 +12,4 @@ SVar:NonStackingEffect:True
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/limited_resources.jpg
-Oracle:When Limited Resources enters the battlefield, each player chooses five lands he or she controls and sacrifices the rest.\nPlayers can't play lands as long as ten or more lands are on the battlefield.
+Oracle:When Limited Resources enters the battlefield, each player chooses five lands they control and sacrifices the rest.\nPlayers can't play lands as long as ten or more lands are on the battlefield.
diff --git a/forge-gui/res/cardsfolder/l/linessa_zephyr_mage.txt b/forge-gui/res/cardsfolder/l/linessa_zephyr_mage.txt
index 636e0f6fba8..c1a48fa5715 100644
--- a/forge-gui/res/cardsfolder/l/linessa_zephyr_mage.txt
+++ b/forge-gui/res/cardsfolder/l/linessa_zephyr_mage.txt
@@ -4,10 +4,10 @@ Types:Legendary Creature Human Wizard
 PT:3/3
 A:AB$ ChangeZone | Cost$ X U U T | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Creature | ChangeNum$ 1 | References$ X | SpellDescription$ Return target creature with converted mana cost X to its owner's hand.
 SVar:X:Targeted$CardManaCost
-A:AB$ ChangeZone | Cost$ Discard<1/Card.namedLinessa, Zephyr Mage> | CostDesc$ Grandeur — Discard another card named CARDNAME:| ValidTgts$ Player | TgtPrompt$ Select target player | RememberTargets$ True | ForgetOtherTargets$ True | Chooser$ Targeted | Mandatory$ True | Hidden$ True | Origin$ Battlefield | Destination$ Hand | ChangeType$ Creature.TargetedPlayerCtrl | SubAbility$ DBArtifact | SpellDescription$ Target player returns a creature he or she controls to its owner's hand, then repeats this process for an artifact, an enchantment, and a land.
+A:AB$ ChangeZone | Cost$ Discard<1/Card.namedLinessa, Zephyr Mage> | CostDesc$ Grandeur — Discard another card named CARDNAME:| ValidTgts$ Player | TgtPrompt$ Select target player | RememberTargets$ True | ForgetOtherTargets$ True | Chooser$ Targeted | Mandatory$ True | Hidden$ True | Origin$ Battlefield | Destination$ Hand | ChangeType$ Creature.TargetedPlayerCtrl | SubAbility$ DBArtifact | SpellDescription$ Target player returns a creature they control to its owner's hand, then repeats this process for an artifact, an enchantment, and a land.
 SVar:DBArtifact:DB$ ChangeZone | DefinedPlayer$ Remembered | ChangeType$ Artifact | Origin$ Battlefield | Destination$ Hand | Chooser$ Remembered | Mandatory$ True | Hidden$ True | SubAbility$ DBEnchant
 SVar:DBEnchant:DB$ ChangeZone | DefinedPlayer$ Remembered | ChangeType$ Enchantment | Origin$ Battlefield | Destination$ Hand | Chooser$ Remembered | Mandatory$ True | Hidden$ True | SubAbility$ DBLand
 SVar:DBLand:DB$ ChangeZone | DefinedPlayer$ Remembered | ChangeType$ Land | Origin$ Battlefield | Destination$ Hand | Chooser$ Remembered | Mandatory$ True | Hidden$ True
 DeckHints:Linessa, Zephyr Mage
 SVar:Picture:http://www.wizards.com/global/images/magic/general/linessa_zephyr_mage.jpg
-Oracle:{X}{U}{U}, {T}: Return target creature with converted mana cost X to its owner's hand.\nGrandeur — Discard another card named Linessa, Zephyr Mage: Target player returns a creature he or she controls to its owner's hand, then repeats this process for an artifact, an enchantment, and a land.
+Oracle:{X}{U}{U}, {T}: Return target creature with converted mana cost X to its owner's hand.\nGrandeur — Discard another card named Linessa, Zephyr Mage: Target player returns a creature they control to its owner's hand, then repeats this process for an artifact, an enchantment, and a land.
diff --git a/forge-gui/res/cardsfolder/l/living_death.txt b/forge-gui/res/cardsfolder/l/living_death.txt
index 1bdd1758680..d442d3930a8 100644
--- a/forge-gui/res/cardsfolder/l/living_death.txt
+++ b/forge-gui/res/cardsfolder/l/living_death.txt
@@ -1,11 +1,11 @@
 Name:Living Death
 ManaCost:3 B B
 Types:Sorcery
-A:SP$ ChangeZoneAll | Cost$ 3 B B | ChangeType$ Creature | Origin$ Graveyard | Destination$ Exile | RememberChanged$ True | ForgetOtherRemembered$ True | SubAbility$ DBSacrifice | AILogic$ LivingDeath | SpellDescription$ Each player exiles all creature cards from his or her graveyard, then sacrifices all creatures he or she controls, then puts all cards he or she exiled this way onto the battlefield.
+A:SP$ ChangeZoneAll | Cost$ 3 B B | ChangeType$ Creature | Origin$ Graveyard | Destination$ Exile | RememberChanged$ True | ForgetOtherRemembered$ True | SubAbility$ DBSacrifice | AILogic$ LivingDeath | SpellDescription$ Each player exiles all creature cards from his or her graveyard, then sacrifices all creatures they control, then puts all cards he or she exiled this way onto the battlefield.
 SVar:DBSacrifice:DB$SacrificeAll | ValidCards$ Creature | SubAbility$ DBReturn
 SVar:DBReturn:DB$ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 SVar:RemRandomDeck:True
 SVar:IsReanimatorCard:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/living_death.jpg
-Oracle:Each player exiles all creature cards from his or her graveyard, then sacrifices all creatures he or she controls, then puts all cards he or she exiled this way onto the battlefield.
+Oracle:Each player exiles all creature cards from his or her graveyard, then sacrifices all creatures they control, then puts all cards he or she exiled this way onto the battlefield.
diff --git a/forge-gui/res/cardsfolder/l/living_end.txt b/forge-gui/res/cardsfolder/l/living_end.txt
index e3524fdd56b..4ddf2f6ee69 100644
--- a/forge-gui/res/cardsfolder/l/living_end.txt
+++ b/forge-gui/res/cardsfolder/l/living_end.txt
@@ -3,11 +3,11 @@ ManaCost:no cost
 Types:Sorcery
 Colors:black
 K:Suspend:3:2 B B
-A:SP$ ChangeZoneAll | Cost$ 0 | ChangeType$ Creature | Origin$ Graveyard | Destination$ Exile | RememberChanged$ True | AILogic$ LivingDeath | SubAbility$ SacAll | SpellDescription$ Each player exiles all creature cards from his or her graveyard, then sacrifices all creatures he or she controls, then puts all cards he or she exiled this way onto the battlefield.
+A:SP$ ChangeZoneAll | Cost$ 0 | ChangeType$ Creature | Origin$ Graveyard | Destination$ Exile | RememberChanged$ True | AILogic$ LivingDeath | SubAbility$ SacAll | SpellDescription$ Each player exiles all creature cards from his or her graveyard, then sacrifices all creatures they control, then puts all cards he or she exiled this way onto the battlefield.
 SVar:SacAll:DB$ SacrificeAll | ValidCards$ Creature | SubAbility$ ReturnAll
 SVar:ReturnAll:DB$ ChangeZoneAll | Origin$ Exile | Destination$ Battlefield | ChangeType$ Card.IsRemembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemRandomDeck:True
 SVar:IsReanimatorCard:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/living_end.jpg
-Oracle:Suspend 3—{2}{B}{B} (Rather than cast this card from your hand, pay {2}{B}{B} and exile it with three time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost.)\nEach player exiles all creature cards from his or her graveyard, then sacrifices all creatures he or she controls, then puts all cards he or she exiled this way onto the battlefield.
+Oracle:Suspend 3—{2}{B}{B} (Rather than cast this card from your hand, pay {2}{B}{B} and exile it with three time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost.)\nEach player exiles all creature cards from his or her graveyard, then sacrifices all creatures they control, then puts all cards he or she exiled this way onto the battlefield.
diff --git a/forge-gui/res/cardsfolder/m/magnetic_mountain.txt b/forge-gui/res/cardsfolder/m/magnetic_mountain.txt
index 45a8c1bb147..36e1ec120b4 100644
--- a/forge-gui/res/cardsfolder/m/magnetic_mountain.txt
+++ b/forge-gui/res/cardsfolder/m/magnetic_mountain.txt
@@ -2,7 +2,7 @@ Name:Magnetic Mountain
 ManaCost:1 R R
 Types:Enchantment
 S:Mode$ Continuous | Affected$ Creature.Blue | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Blue creatures don't untap during their controllers' untap steps.
-T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ At the beginning of each player's upkeep, that player may choose any number of tapped blue creatures he or she controls and pay {4} for each creature chosen this way. If the player does, untap those creatures.
+T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ At the beginning of each player's upkeep, that player may choose any number of tapped blue creatures they control and pay {4} for each creature chosen this way. If the player does, untap those creatures.
 SVar:TrigChoose:DB$ ChooseCard | Defined$ TriggeredPlayer | Amount$ X | References$ X | Choices$ Creature.tapped+Blue | TargetControls$ True | ChoiceTitle$ Choose any number of tapped blue creatures you control | ChoiceZone$ Battlefield | SubAbility$ DBUntap
 SVar:DBUntap:DB$ RepeatEach | DefinedCards$ ChosenCard | RepeatSubAbility$ UntapEach
 SVar:UntapEach:DB$ Untap | Defined$ Remembered | UnlessCost$ 4 | UnlessPayer$ RememberedController | UnlessSwitched$ True | ShowCurrentCard$ Remembered
@@ -10,4 +10,4 @@ SVar:X:Count$Valid Creature.tapped+Blue+ActivePlayerCtrl
 SVar:RemRandomDeck:True
 SVar:NonStackingEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/magnetic_mountain.jpg
-Oracle:Blue creatures don't untap during their controllers' untap steps.\nAt the beginning of each player's upkeep, that player may choose any number of tapped blue creatures he or she controls and pay {4} for each creature chosen this way. If the player does, untap those creatures.
+Oracle:Blue creatures don't untap during their controllers' untap steps.\nAt the beginning of each player's upkeep, that player may choose any number of tapped blue creatures they control and pay {4} for each creature chosen this way. If the player does, untap those creatures.
diff --git a/forge-gui/res/cardsfolder/m/magus_of_the_arena.txt b/forge-gui/res/cardsfolder/m/magus_of_the_arena.txt
index b9d918b1e62..7fa4b37c5b1 100644
--- a/forge-gui/res/cardsfolder/m/magus_of_the_arena.txt
+++ b/forge-gui/res/cardsfolder/m/magus_of_the_arena.txt
@@ -2,10 +2,10 @@ Name:Magus of the Arena
 ManaCost:4 R R
 Types:Creature Human Wizard
 PT:5/5
-A:AB$ Tap | Cost$ 3 T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SubAbility$ DBTap | AlwaysRemember$ True | SpellDescription$ Tap target creature you control and target creature of an opponent's choice he or she controls. Those creatures fight each other. (Each deals damage equal to its power to the other.)
+A:AB$ Tap | Cost$ 3 T | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SubAbility$ DBTap | AlwaysRemember$ True | SpellDescription$ Tap target creature you control and target creature of an opponent's choice they control. Those creatures fight each other. (Each deals damage equal to its power to the other.)
 SVar:DBTap:DB$ Tap | TargetingPlayer$ Player.Opponent | TargetingPlayerControls$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature you control | SubAbility$ DBFight | AlwaysRemember$ True
 SVar:DBFight:DB$ Fight | Defined$ Remembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/magus_of_the_arena.jpg
-Oracle:{3}, {T}: Tap target creature you control and target creature of an opponent's choice he or she controls. Those creatures fight each other. (Each deals damage equal to its power to the other.)
+Oracle:{3}, {T}: Tap target creature you control and target creature of an opponent's choice they control. Those creatures fight each other. (Each deals damage equal to its power to the other.)
diff --git a/forge-gui/res/cardsfolder/m/mana_breach.txt b/forge-gui/res/cardsfolder/m/mana_breach.txt
index 274c5bb0d3f..fb400d1a02e 100644
--- a/forge-gui/res/cardsfolder/m/mana_breach.txt
+++ b/forge-gui/res/cardsfolder/m/mana_breach.txt
@@ -1,8 +1,8 @@
 Name:Mana Breach
 ManaCost:2 U
 Types:Enchantment
-T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigBounce | TriggerDescription$ Whenever a player casts a spell, that player returns a land he or she controls to its owner's hand.
+T:Mode$ SpellCast | ValidCard$ Card | ValidActivatingPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigBounce | TriggerDescription$ Whenever a player casts a spell, that player returns a land they control to its owner's hand.
 SVar:TrigBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ChangeNum$ 1 | ChangeType$ Land | Mandatory$ True | DefinedPlayer$ TriggeredActivator | Chooser$ TriggeredActivator | Hidden$ True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_breach.jpg
-Oracle:Whenever a player casts a spell, that player returns a land he or she controls to its owner's hand.
+Oracle:Whenever a player casts a spell, that player returns a land they control to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/m/merseine.txt b/forge-gui/res/cardsfolder/m/merseine.txt
index 06153283062..c910269e334 100644
--- a/forge-gui/res/cardsfolder/m/merseine.txt
+++ b/forge-gui/res/cardsfolder/m/merseine.txt
@@ -5,7 +5,7 @@ K:Enchant creature
 A:SP$ Attach | Cost$ 2 U U | ValidTgts$ Creature | AILogic$ KeepTapped | AITgts$ Card.cmcGE2
 K:etbCounter:NET:3
 S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | CheckSVar$ X | Description$ Enchanted creature doesn't untap during its controller's untap step if Merseine has a net counter on it.
-A:AB$ RemoveCounter | EnchantedControllerActivator$ True | Cost$ Mana<1\EnchantedCost> | CostDesc$ Pay enchanted creature's mana cost: | CounterType$ NET | CounterNum$ 1 | SpellDescription$ Remove a net counter from CARDNAME. Any player may activate this ability, but only if he or she controls the enchanted creature.
+A:AB$ RemoveCounter | EnchantedControllerActivator$ True | Cost$ Mana<1\EnchantedCost> | CostDesc$ Pay enchanted creature's mana cost: | CounterType$ NET | CounterNum$ 1 | SpellDescription$ Remove a net counter from CARDNAME. Any player may activate this ability, but only if they control the enchanted creature.
 SVar:X:Count$CardCounters.NET
 SVar:Picture:http://www.wizards.com/global/images/magic/general/Merseine.jpg
-Oracle:Enchant creature\nMerseine enters the battlefield with three net counters on it.\nEnchanted creature doesn't untap during its controller's untap step if Merseine has a net counter on it.\nPay enchanted creature's mana cost: Remove a net counter from Merseine. Any player may activate this ability, but only if he or she controls the enchanted creature.
+Oracle:Enchant creature\nMerseine enters the battlefield with three net counters on it.\nEnchanted creature doesn't untap during its controller's untap step if Merseine has a net counter on it.\nPay enchanted creature's mana cost: Remove a net counter from Merseine. Any player may activate this ability, but only if they control the enchanted creature.
diff --git a/forge-gui/res/cardsfolder/m/mirrorwing_dragon.txt b/forge-gui/res/cardsfolder/m/mirrorwing_dragon.txt
index 71f469b5350..7a26ee1ff50 100644
--- a/forge-gui/res/cardsfolder/m/mirrorwing_dragon.txt
+++ b/forge-gui/res/cardsfolder/m/mirrorwing_dragon.txt
@@ -3,7 +3,7 @@ ManaCost:3 R R
 Types:Creature Dragon
 PT:4/5
 K:Flying
-T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | IsSingleTarget$ True | TargetsValid$ Card.Self | Execute$ TrigCopy | TriggerZones$ Battlefield | TriggerDescription$ Whenever a player casts an instant or sorcery spell that targets only CARDNAME, that player copies that spell for each other creature he or she controls that the spell could target. Each copy targts a different one of those creatures.
+T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | IsSingleTarget$ True | TargetsValid$ Card.Self | Execute$ TrigCopy | TriggerZones$ Battlefield | TriggerDescription$ Whenever a player casts an instant or sorcery spell that targets only CARDNAME, that player copies that spell for each other creature they control that the spell could target. Each copy targts a different one of those creatures.
 SVar:TrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | Controller$ TriggeredActivator | CopyForEachCanTarget$ Creature.YouCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mirrorwing_dragon.jpg
-Oracle:Flying\nWhenever a player casts an instant or sorcery spell that targets only Mirrorwing Dragon, that player copies that spell for each other creature he or she controls that the spell could target. Each copy targts a different one of those creatures.
+Oracle:Flying\nWhenever a player casts an instant or sorcery spell that targets only Mirrorwing Dragon, that player copies that spell for each other creature they control that the spell could target. Each copy targts a different one of those creatures.
diff --git a/forge-gui/res/cardsfolder/m/mudslide.txt b/forge-gui/res/cardsfolder/m/mudslide.txt
index 440785f8c99..752d1868fde 100644
--- a/forge-gui/res/cardsfolder/m/mudslide.txt
+++ b/forge-gui/res/cardsfolder/m/mudslide.txt
@@ -2,7 +2,7 @@ Name:Mudslide
 ManaCost:2 R
 Types:Enchantment
 S:Mode$ Continuous | Affected$ Creature.withoutFlying | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Creatures without flying don't untap during their controllers' untap steps.
-T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ At the beginning of each player's upkeep, that player may choose any number of tapped creatures without flying he or she controls and pay {2} for each creature chosen this way. If the player does, untap those creatures.
+T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ At the beginning of each player's upkeep, that player may choose any number of tapped creatures without flying they control and pay {2} for each creature chosen this way. If the player does, untap those creatures.
 SVar:TrigChoose:DB$ ChooseCard | Defined$ TriggeredPlayer | Amount$ X | References$ X | Choices$ Creature.tapped+withoutFlying | TargetControls$ True | ChoiceTitle$ Choose any number of tapped nongreen creatures you control | ChoiceZone$ Battlefield | SubAbility$ DBUntap
 SVar:DBUntap:DB$ RepeatEach | DefinedCards$ ChosenCard | RepeatSubAbility$ UntapEach
 SVar:UntapEach:DB$ Untap | Defined$ Remembered | UnlessCost$ 2 | UnlessPayer$ RememberedController | UnlessSwitched$ True | ShowCurrentCard$ Remembered
@@ -10,4 +10,4 @@ SVar:X:Count$Valid Creature.tapped+withoutFlying+ActivePlayerCtrl
 SVar:RemRandomDeck:True
 SVar:NonStackingEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mudslide.jpg
-Oracle:Creatures without flying don't untap during their controllers' untap steps.\nAt the beginning of each player's upkeep, that player may choose any number of tapped creatures without flying he or she controls and pay {2} for each creature chosen this way. If the player does, untap those creatures.
+Oracle:Creatures without flying don't untap during their controllers' untap steps.\nAt the beginning of each player's upkeep, that player may choose any number of tapped creatures without flying they control and pay {2} for each creature chosen this way. If the player does, untap those creatures.
diff --git a/forge-gui/res/cardsfolder/n/natural_balance.txt b/forge-gui/res/cardsfolder/n/natural_balance.txt
index 7d830dc205f..4a3da2f5742 100644
--- a/forge-gui/res/cardsfolder/n/natural_balance.txt
+++ b/forge-gui/res/cardsfolder/n/natural_balance.txt
@@ -1,11 +1,11 @@
 Name:Natural Balance
 ManaCost:2 G G
 Types:Sorcery
-A:SP$ RepeatEach | Cost$ 2 G G | RepeatPlayers$ Player | RepeatSubAbility$ BalanceLands | AILogic$ BalanceLands | SpellDescription$ Each player who controls six or more lands chooses five lands he or she controls and sacrifices the rest. Each player who controls four or fewer lands may search their library for up to X basic land cards and put them onto the battlefield, where X is five minus the number of lands he or she controls. Then each player who searched their library this way shuffles it.
+A:SP$ RepeatEach | Cost$ 2 G G | RepeatPlayers$ Player | RepeatSubAbility$ BalanceLands | AILogic$ BalanceLands | SpellDescription$ Each player who controls six or more lands chooses five lands they control and sacrifices the rest. Each player who controls four or fewer lands may search their library for up to X basic land cards and put them onto the battlefield, where X is five minus the number of lands they control. Then each player who searched their library this way shuffles it.
 SVar:BalanceLands:DB$ Sacrifice | SacValid$ Land | Amount$ SacX | Defined$ Remembered | ConditionCheckSVar$ SacX | ConditionSVarCompare$ GT0 | SubAbility$ FetchLands
 SVar:FetchLands:DB$ ChangeZone | Optional$ True | Origin$ Library | Destination$ Battlefield | ChangeType$ Land.Basic | ChangeNum$ FetchX | DefinedPlayer$ Remembered | ConditionCheckSVar$ FetchX | ConditionSVarCompare$ GT0 | ShuffleNonMandatory$ True
 SVar:LandsControlled:Count$Valid Land.RememberedPlayerCtrl
 SVar:SacX:SVar$LandsControlled/Minus.5
 SVar:FetchX:Number$5/Minus.LandsControlled
 SVar:Picture:http://www.wizards.com/global/images/magic/general/natural_balance.jpg
-Oracle:Each player who controls six or more lands chooses five lands he or she controls and sacrifices the rest. Each player who controls four or fewer lands may search their library for up to X basic land cards and put them onto the battlefield, where X is five minus the number of lands he or she controls. Then each player who searched their library this way shuffles it.
+Oracle:Each player who controls six or more lands chooses five lands they control and sacrifices the rest. Each player who controls four or fewer lands may search their library for up to X basic land cards and put them onto the battlefield, where X is five minus the number of lands they control. Then each player who searched their library this way shuffles it.
diff --git a/forge-gui/res/cardsfolder/n/netherborn_phalanx.txt b/forge-gui/res/cardsfolder/n/netherborn_phalanx.txt
index e2f1d96b8f1..2aa517e40ec 100644
--- a/forge-gui/res/cardsfolder/n/netherborn_phalanx.txt
+++ b/forge-gui/res/cardsfolder/n/netherborn_phalanx.txt
@@ -3,10 +3,10 @@ ManaCost:5 B
 Types:Creature Horror
 PT:2/4
 K:Transmute:1 B B
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEachOpp | TriggerDescription$ When CARDNAME enters the battlefield, each opponent loses 1 life for each creature he or she controls.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigEachOpp | TriggerDescription$ When CARDNAME enters the battlefield, each opponent loses 1 life for each creature they control.
 SVar:TrigEachOpp:DB$ RepeatEach | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ TrigLoseLife
 SVar:TrigLoseLife:DB$ LoseLife | Defined$ Player.IsRemembered | LifeAmount$ X | References$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$Valid Creature.RememberedPlayerCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/netherborn_phalanx.jpg
-Oracle:When Netherborn Phalanx enters the battlefield, each opponent loses 1 life for each creature he or she controls.\nTransmute {1}{B}{B} ({1}{B}{B}, Discard this card: Search your library for a card with the same converted mana cost as this card, reveal it, and put it into your hand. Then shuffle your library. Transmute only as a sorcery.)
+Oracle:When Netherborn Phalanx enters the battlefield, each opponent loses 1 life for each creature they control.\nTransmute {1}{B}{B} ({1}{B}{B}, Discard this card: Search your library for a card with the same converted mana cost as this card, reveal it, and put it into your hand. Then shuffle your library. Transmute only as a sorcery.)
diff --git a/forge-gui/res/cardsfolder/n/no_one_will_hear_your_cries.txt b/forge-gui/res/cardsfolder/n/no_one_will_hear_your_cries.txt
index 89546733996..65928fccc37 100644
--- a/forge-gui/res/cardsfolder/n/no_one_will_hear_your_cries.txt
+++ b/forge-gui/res/cardsfolder/n/no_one_will_hear_your_cries.txt
@@ -1,10 +1,10 @@
 Name:No One Will Hear Your Cries
 ManaCost:no cost
 Types:Scheme
-T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, each opponent chooses a creature he or she controls, then sacrifices the rest.
+T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, each opponent chooses a creature they control, then sacrifices the rest.
 SVar:TrigChoose:DB$ RepeatEach | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ ChooseCreature | SubAbility$ DBSacrificeAll
 SVar:ChooseCreature:DB$ ChooseCard | Defined$ Remembered | Amount$ 1 | Choices$ Creature.RememberedPlayerCtrl | ChoiceTitle$ Choose a creature | RememberChosen$ True | Mandatory$ True
 SVar:DBSacrificeAll:DB$ SacrificeAll | ValidCards$ Creature.IsNotRemembered+OppCtrl | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:https://downloads.cardforge.org/images/cards/ARC/No One Will Hear Your Cries.full.jpg
-Oracle:When you set this scheme in motion, each opponent chooses a creature he or she controls, then sacrifices the rest.
\ No newline at end of file
+Oracle:When you set this scheme in motion, each opponent chooses a creature they control, then sacrifices the rest.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/o/omen_of_fire.txt b/forge-gui/res/cardsfolder/o/omen_of_fire.txt
index f3721541f51..91df7c10b37 100644
--- a/forge-gui/res/cardsfolder/o/omen_of_fire.txt
+++ b/forge-gui/res/cardsfolder/o/omen_of_fire.txt
@@ -1,10 +1,10 @@
 Name:Omen of Fire
 ManaCost:3 R R
 Types:Instant
-A:SP$ ChangeZoneAll | Cost$ 3 R R | ChangeType$ Island | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return all Islands to their owners' hands. Each player sacrifices a Plains or a white permanent for each white permanent he or she controls. | SubAbility$ DBSac
+A:SP$ ChangeZoneAll | Cost$ 3 R R | ChangeType$ Island | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return all Islands to their owners' hands. Each player sacrifices a Plains or a white permanent for each white permanent they control. | SubAbility$ DBSac
 SVar:DBSac:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBSacEach
 SVar:DBSacEach:DB$ Sacrifice | Defined$ Player.IsRemembered | Amount$ OppX | SacValid$ Plains,Permanent.White | References$ OppX
 SVar:OppX:Count$Valid Permanent.White+RememberedPlayerCtrl
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/omen_of_fire.jpg
-Oracle:Return all Islands to their owners' hands.\nEach player sacrifices a Plains or a white permanent for each white permanent he or she controls.
+Oracle:Return all Islands to their owners' hands.\nEach player sacrifices a Plains or a white permanent for each white permanent they control.
diff --git a/forge-gui/res/cardsfolder/o/orzhov_advokist.txt b/forge-gui/res/cardsfolder/o/orzhov_advokist.txt
index fd0c83c4b95..e303409e072 100644
--- a/forge-gui/res/cardsfolder/o/orzhov_advokist.txt
+++ b/forge-gui/res/cardsfolder/o/orzhov_advokist.txt
@@ -2,7 +2,7 @@ Name:Orzhov Advokist
 ManaCost:2 W
 Types:Creature Human Advisor
 PT:1/4
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ At the beginning of your upkeep, each player may put two +1/+1 counters on a creature he or she controls. If a player does, creatures that player controls can't attack you or a planeswalker you control until your next turn.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ At the beginning of your upkeep, each player may put two +1/+1 counters on a creature they control. If a player does, creatures that player controls can't attack you or a planeswalker you control until your next turn.
 SVar:TrigChoose:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBChoice | SubAbility$ DBPutCounter
 SVar:DBChoice:DB$ ChooseCard | Defined$ Player.IsRemembered | Amount$ 1 | MinAmount$ 0 | Choices$ Creature.RememberedPlayerCtrl | RememberChosen$ True | AILogic$ OrzhovAdvokist
 SVar:DBPutCounter:DB$ PutCounterAll | ValidCards$ Creature.IsRemembered | CounterType$ P1P1 | CounterNum$ 2 | SubAbility$ DBClearChosen
@@ -12,4 +12,4 @@ SVar:DBEffect:DB$ Effect | RememberObjects$ Player.IsRemembered | StaticAbilitie
 SVar:STCantAttack:Mode$ CantAttack | EffectZone$ Command | ValidCard$ Creature.RememberedPlayerCtrl | Target$ You,Planeswalker.YouCtrl | Description$ Creatures that player controls can't attack you or a planeswalker you control until your next turn.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/orzhov_advokist.jpg
-Oracle:At the beginning of your upkeep, each player may put two +1/+1 counters on a creature he or she controls. If a player does, creatures that player controls can't attack you or a planeswalker you control until your next turn.
\ No newline at end of file
+Oracle:At the beginning of your upkeep, each player may put two +1/+1 counters on a creature they control. If a player does, creatures that player controls can't attack you or a planeswalker you control until your next turn.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/o/overburden.txt b/forge-gui/res/cardsfolder/o/overburden.txt
index 095192dd19d..528495dee48 100644
--- a/forge-gui/res/cardsfolder/o/overburden.txt
+++ b/forge-gui/res/cardsfolder/o/overburden.txt
@@ -1,8 +1,8 @@
 Name:Overburden
 ManaCost:1 U
 Types:Enchantment
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.nonToken | TriggerZones$ Battlefield | Execute$ TrigBounce | TriggerDescription$ Whenever a player puts a nontoken creature onto the battlefield, that player returns a land he or she controls to its owner's hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.nonToken | TriggerZones$ Battlefield | Execute$ TrigBounce | TriggerDescription$ Whenever a player puts a nontoken creature onto the battlefield, that player returns a land they control to its owner's hand.
 SVar:TrigBounce:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | ChangeType$ Land | ChangeNum$ 1 | Mandatory$ True | DefinedPlayer$ TriggeredCardController | Chooser$ TriggeredCardController | Hidden$ True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/overburden.jpg
-Oracle:Whenever a player puts a nontoken creature onto the battlefield, that player returns a land he or she controls to its owner's hand.
+Oracle:Whenever a player puts a nontoken creature onto the battlefield, that player returns a land they control to its owner's hand.
diff --git a/forge-gui/res/cardsfolder/p/planar_overlay.txt b/forge-gui/res/cardsfolder/p/planar_overlay.txt
index 378e98cc126..ffdbfe9d341 100644
--- a/forge-gui/res/cardsfolder/p/planar_overlay.txt
+++ b/forge-gui/res/cardsfolder/p/planar_overlay.txt
@@ -1,7 +1,7 @@
 Name:Planar Overlay
 ManaCost:2 U
 Types:Sorcery
-A:SP$ RepeatEach | Cost$ 2 U | RepeatPlayers$ Player | RepeatSubAbility$ ChooseMountain | StackDescription$ SpellDescription | SubAbility$ DBChangeZone | SpellDescription$ Each player chooses a land he or she controls of each basic land type. Return those lands to their owners' hands.
+A:SP$ RepeatEach | Cost$ 2 U | RepeatPlayers$ Player | RepeatSubAbility$ ChooseMountain | StackDescription$ SpellDescription | SubAbility$ DBChangeZone | SpellDescription$ Each player chooses a land they control of each basic land type. Return those lands to their owners' hands.
 SVar:ChooseMountain:DB$ ChooseCard | Defined$ Player.IsRemembered | Choices$ Mountain.RememberedPlayerCtrl | Mandatory$ True | RememberChosen$ True | SubAbility$ ChooseSwamp | AILogic$ WorstCard
 SVar:ChooseSwamp:DB$ ChooseCard | Defined$ Player.IsRemembered | Choices$ Swamp.RememberedPlayerCtrl | Mandatory$ True | RememberChosen$ True | SubAbility$ ChooseIsland | AILogic$ WorstCard
 SVar:ChooseIsland:DB$ ChooseCard | Defined$ Player.IsRemembered | Choices$ Island.RememberedPlayerCtrl | Mandatory$ True | RememberChosen$ True | SubAbility$ ChoosePlains | AILogic$ WorstCard
@@ -12,4 +12,4 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/planar_overlay.jpg
-Oracle:Each player chooses a land he or she controls of each basic land type. Return those lands to their owners' hands.
+Oracle:Each player chooses a land they control of each basic land type. Return those lands to their owners' hands.
diff --git a/forge-gui/res/cardsfolder/p/power_sink.txt b/forge-gui/res/cardsfolder/p/power_sink.txt
index 0e708ce39bd..eedc7bf9495 100644
--- a/forge-gui/res/cardsfolder/p/power_sink.txt
+++ b/forge-gui/res/cardsfolder/p/power_sink.txt
@@ -2,7 +2,7 @@ Name:Power Sink
 ManaCost:X U
 Types:Instant
 A:SP$ Counter | Cost$ X U | References$ X | UnlessCost$ X | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card | SubAbility$ TapLands | UnlessResolveSubs$ WhenNotPaid | SpellDescription$ Counter target spell unless its controller pays {X}. If that player doesn't, they tap all lands with mana abilities they control and lose all unspent mana. | StackDescription$ Countering [{s:Targeted}] unless {p:TargetedController} pays X.
-SVar:TapLands:DB$ TapAll | ValidCards$ Land.hasManaAbility | Defined$ TargetedController | SubAbility$ ManaLose | StackDescription$ If {p:TargetedController} doesn't, that player taps all lands with mana abilities he or she controls and
+SVar:TapLands:DB$ TapAll | ValidCards$ Land.hasManaAbility | Defined$ TargetedController | SubAbility$ ManaLose | StackDescription$ If {p:TargetedController} doesn't, that player taps all lands with mana abilities they control and
 SVar:ManaLose:DB$ DrainMana | Defined$ TargetedController
 SVar:X:Count$xPaid
 SVar:Picture:http://www.wizards.com/global/images/magic/general/power_sink.jpg
diff --git a/forge-gui/res/cardsfolder/p/pox.txt b/forge-gui/res/cardsfolder/p/pox.txt
index 4f29dae1724..2e7c56b5d04 100644
--- a/forge-gui/res/cardsfolder/p/pox.txt
+++ b/forge-gui/res/cardsfolder/p/pox.txt
@@ -1,7 +1,7 @@
 Name:Pox
 ManaCost:B B B
 Types:Sorcery
-A:SP$ RepeatEach | Cost$ B B B | RepeatPlayers$ Player | RepeatSubAbility$ DBLoseLife | AILifeThreshold$ 1 | SpellDescription$ Each player loses a third of his or her life, then discards a third of the cards in his or her hand, then sacrifices a third of the creatures he or she controls, then sacrifices a third of the lands he or she controls. Round up each time.
+A:SP$ RepeatEach | Cost$ B B B | RepeatPlayers$ Player | RepeatSubAbility$ DBLoseLife | AILifeThreshold$ 1 | SpellDescription$ Each player loses a third of his or her life, then discards a third of the cards in his or her hand, then sacrifices a third of the creatures they control, then sacrifices a third of the lands they control. Round up each time.
 SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ A | References$ A | Defined$ Player.IsRemembered | SubAbility$ DBDiscard
 SVar:DBDiscard:DB$ Discard | NumCards$ C | References$ C | Defined$ Player.IsRemembered | Mode$ TgtChoose | SubAbility$ DBCreature
 SVar:DBCreature:DB$ Sacrifice | SacValid$ Creature | Amount$ E | References$ E | Defined$ Player.IsRemembered | SubAbility$ DBLand
@@ -12,4 +12,4 @@ SVar:E:PlayerCountRemembered$Valid Creature.RememberedPlayerCtrl/ThirdUp
 SVar:G:PlayerCountRemembered$Valid Land.RememberedPlayerCtrl/ThirdUp
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pox.jpg
-Oracle:Each player loses a third of his or her life, then discards a third of the cards in his or her hand, then sacrifices a third of the creatures he or she controls, then sacrifices a third of the lands he or she controls. Round up each time.
+Oracle:Each player loses a third of his or her life, then discards a third of the cards in his or her hand, then sacrifices a third of the creatures they control, then sacrifices a third of the lands they control. Round up each time.
diff --git a/forge-gui/res/cardsfolder/p/preacher.txt b/forge-gui/res/cardsfolder/p/preacher.txt
index 04b2ed01cdb..ff3297705d9 100644
--- a/forge-gui/res/cardsfolder/p/preacher.txt
+++ b/forge-gui/res/cardsfolder/p/preacher.txt
@@ -3,6 +3,6 @@ ManaCost:1 W W
 Types:Creature Human Cleric
 PT:1/1
 K:You may choose not to untap CARDNAME during your untap step.
-A:AB$ GainControl | Cost$ T | ValidTgts$ Creature | TargetingPlayer$ Player.Opponent | TargetingPlayerControls$ True | TgtPrompt$ Select target creature you control | LoseControl$ Untap,LeavesPlay | SpellDescription$ For as long as CARDNAME remains tapped, gain control of target creature of an opponent's choice he or she controls.
+A:AB$ GainControl | Cost$ T | ValidTgts$ Creature | TargetingPlayer$ Player.Opponent | TargetingPlayerControls$ True | TgtPrompt$ Select target creature you control | LoseControl$ Untap,LeavesPlay | SpellDescription$ For as long as CARDNAME remains tapped, gain control of target creature of an opponent's choice they control.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/preacher.jpg
-Oracle:You may choose not to untap Preacher during your untap step.\n{T}: For as long as Preacher remains tapped, gain control of target creature of an opponent's choice he or she controls.
+Oracle:You may choose not to untap Preacher during your untap step.\n{T}: For as long as Preacher remains tapped, gain control of target creature of an opponent's choice they control.
diff --git a/forge-gui/res/cardsfolder/p/price_of_progress.txt b/forge-gui/res/cardsfolder/p/price_of_progress.txt
index 6d73eda5c24..ef1b26d3892 100644
--- a/forge-gui/res/cardsfolder/p/price_of_progress.txt
+++ b/forge-gui/res/cardsfolder/p/price_of_progress.txt
@@ -1,7 +1,7 @@
 Name:Price of Progress
 ManaCost:1 R
 Types:Instant
-A:SP$ RepeatEach | Cost$ 1 R | RepeatPlayers$ Player | RepeatSubAbility$ DBDamage | DamageMap$ True | AILogic$ PriceOfProgress | SpellDescription$ CARDNAME deals 2 damage to each player for each nonbasic land he or she controls.
+A:SP$ RepeatEach | Cost$ 1 R | RepeatPlayers$ Player | RepeatSubAbility$ DBDamage | DamageMap$ True | AILogic$ PriceOfProgress | SpellDescription$ CARDNAME deals 2 damage to each player for each nonbasic land they control.
 SVar:DBDamage:DB$ DealDamage | Defined$ Remembered | NumDmg$ X | References$ X
 SVar:X:Count$Valid Land.nonBasic+RememberedPlayerCtrl/Times.2
 SVar:RemRandomDeck:True
diff --git a/forge-gui/res/cardsfolder/p/primal_order.txt b/forge-gui/res/cardsfolder/p/primal_order.txt
index 95ccf614f57..8cd21383fce 100644
--- a/forge-gui/res/cardsfolder/p/primal_order.txt
+++ b/forge-gui/res/cardsfolder/p/primal_order.txt
@@ -1,9 +1,9 @@
 Name:Primal Order
 ManaCost:2 G G
 Types:Enchantment
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of each player's upkeep, CARDNAME deals damage to that player equal to the number of nonbasic lands he or she controls.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of each player's upkeep, CARDNAME deals damage to that player equal to the number of nonbasic lands they control.
 SVar:TrigDamage:DB$DealDamage | Defined$ TriggeredPlayer | NumDmg$ X | References$ X
 SVar:X:Count$Valid Land.nonBasic+ActivePlayerCtrl
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/primal_order.jpg
-Oracle:At the beginning of each player's upkeep, Primal Order deals damage to that player equal to the number of nonbasic lands he or she controls.
+Oracle:At the beginning of each player's upkeep, Primal Order deals damage to that player equal to the number of nonbasic lands they control.
diff --git a/forge-gui/res/cardsfolder/p/propaganda.txt b/forge-gui/res/cardsfolder/p/propaganda.txt
index 08ec5648b46..6001e9e7119 100644
--- a/forge-gui/res/cardsfolder/p/propaganda.txt
+++ b/forge-gui/res/cardsfolder/p/propaganda.txt
@@ -1,6 +1,6 @@
 Name:Propaganda
 ManaCost:2 U
 Types:Enchantment
-S:Mode$ CantAttackUnless | ValidCard$ Creature | Target$ You | Cost$ 2 | Description$ Creatures can't attack you unless their controller pays {2} for each creature he or she controls that's attacking you.
+S:Mode$ CantAttackUnless | ValidCard$ Creature | Target$ You | Cost$ 2 | Description$ Creatures can't attack you unless their controller pays {2} for each creature they control that's attacking you.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/propaganda.jpg
-Oracle:Creatures can't attack you unless their controller pays {2} for each creature he or she controls that's attacking you.
+Oracle:Creatures can't attack you unless their controller pays {2} for each creature they control that's attacking you.
diff --git a/forge-gui/res/cardsfolder/p/psychic_allergy.txt b/forge-gui/res/cardsfolder/p/psychic_allergy.txt
index a276c0bca1d..2c3c073c703 100644
--- a/forge-gui/res/cardsfolder/p/psychic_allergy.txt
+++ b/forge-gui/res/cardsfolder/p/psychic_allergy.txt
@@ -3,11 +3,11 @@ ManaCost:3 U U
 Types:Enchantment
 K:ETBReplacement:Other:ChooseColor
 SVar:ChooseColor:DB$ ChooseColor | Defined$ You | SpellDescription$ As CARDNAME enters the battlefield, choose a color. | AILogic$ MostProminentInHumanDeck
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDamageOpp | TriggerDescription$ At the beginning of each opponent's upkeep, CARDNAME deals X damage to that player, where X is the number of nontoken permanents of the chosen color he or she controls
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDamageOpp | TriggerDescription$ At the beginning of each opponent's upkeep, CARDNAME deals X damage to that player, where X is the number of nontoken permanents of the chosen color they control
 SVar:TrigDamageOpp:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ X | References$ X
 SVar:X:Count$Valid Permanent.ActivePlayerCtrl+ChosenColor+nonToken
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ At the beginning of your upkeep, destroy CARDNAME unless you sacrifice two Islands.
 SVar:TrigDestroy:DB$ Destroy | Defined$ Self | UnlessPayer$ You | UnlessCost$ Sac<2/Island>
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/psychic_allergy.jpg
-Oracle:As Psychic Allergy enters the battlefield, choose a color.\nAt the beginning of each opponent's upkeep, Psychic Allergy deals X damage to that player, where X is the number of nontoken permanents of the chosen color he or she controls.\nAt the beginning of your upkeep, destroy Psychic Allergy unless you sacrifice two Islands.
+Oracle:As Psychic Allergy enters the battlefield, choose a color.\nAt the beginning of each opponent's upkeep, Psychic Allergy deals X damage to that player, where X is the number of nontoken permanents of the chosen color they control.\nAt the beginning of your upkeep, destroy Psychic Allergy unless you sacrifice two Islands.
diff --git a/forge-gui/res/cardsfolder/q/quicksilver_fountain.txt b/forge-gui/res/cardsfolder/q/quicksilver_fountain.txt
index 82f1d3b15b2..ce14b38d378 100644
--- a/forge-gui/res/cardsfolder/q/quicksilver_fountain.txt
+++ b/forge-gui/res/cardsfolder/q/quicksilver_fountain.txt
@@ -1,7 +1,7 @@
 Name:Quicksilver Fountain
 ManaCost:3
 Types:Artifact
-T:Mode$ Phase | Phase$ Upkeep | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's upkeep, that player puts a flood counter on target non-Island land he or she controls of his or her choice. That land is an Island for as long as it has a flood counter on it.
+T:Mode$ Phase | Phase$ Upkeep | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's upkeep, that player puts a flood counter on target non-Island land they control of his or her choice. That land is an Island for as long as it has a flood counter on it.
 SVar:TrigPutCounter:DB$ PutCounter | TargetingPlayer$ TriggeredPlayer | ValidTgts$ Land.nonIsland+ActivePlayerCtrl | TgtPrompt$ Select target non-Island land you control | CounterType$ FLOOD | CounterNum$ 1 | SubAbility$ DBAnimate
 SVar:DBAnimate:DB$ Animate | Defined$ Targeted | staticAbilities$ STFlood | Permanent$ True
 SVar:STFlood:Mode$ Continuous | EffectZone$ Battlefield | Affected$ Card.Self+counters_GE1_FLOOD | AddType$ Island | RemoveSubTypes$ True | RemoveAllAbilities$ True
@@ -10,4 +10,4 @@ SVar:TrigRemoveAll:DB$ RemoveCounterAll | ValidCards$ Land | CounterType$ FLOOD
 SVar:X:Count$Valid Land.nonIsland
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/quicksilver_fountain.jpg
-Oracle:At the beginning of each player's upkeep, that player puts a flood counter on target non-Island land he or she controls of his or her choice. That land is an Island for as long as it has a flood counter on it.\nAt the beginning of each end step, if all lands on the battlefield are Islands, remove all flood counters from them.
+Oracle:At the beginning of each player's upkeep, that player puts a flood counter on target non-Island land they control of his or her choice. That land is an Island for as long as it has a flood counter on it.\nAt the beginning of each end step, if all lands on the battlefield are Islands, remove all flood counters from them.
diff --git a/forge-gui/res/cardsfolder/r/rags_riches.txt b/forge-gui/res/cardsfolder/r/rags_riches.txt
index 26b32e17df6..0aa5c66f0fa 100644
--- a/forge-gui/res/cardsfolder/r/rags_riches.txt
+++ b/forge-gui/res/cardsfolder/r/rags_riches.txt
@@ -11,8 +11,8 @@ Name:Riches
 ManaCost:5 U U
 Types:Sorcery
 K:Aftermath
-A:SP$ RepeatEach | Cost$ 5 U U | AILogic$ OpponentHasCreatures | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ ChooseCreature | SubAbility$ StealChosen | SpellDescription$ Each opponent chooses a creature he or she controls. You gain control of those creatures.
+A:SP$ RepeatEach | Cost$ 5 U U | AILogic$ OpponentHasCreatures | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ ChooseCreature | SubAbility$ StealChosen | SpellDescription$ Each opponent chooses a creature they control. You gain control of those creatures.
 SVar:ChooseCreature:DB$ ChooseCard | Defined$ Remembered | Amount$ 1 | Choices$ Creature.RememberedPlayerCtrl | ChoiceTitle$ Choose a creature to be stolen | AILogic$ WorstCard | RememberChosen$ True | Mandatory$ True
 SVar:StealChosen:DB$ GainControl | AllValid$ Permanent.IsRemembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosen$ True
-Oracle:Aftermath (Cast this spell only from your graveyard, then exile it.)\nEach opponent chooses a creature he or she controls. You gain control of those creatures.
+Oracle:Aftermath (Cast this spell only from your graveyard, then exile it.)\nEach opponent chooses a creature they control. You gain control of those creatures.
diff --git a/forge-gui/res/cardsfolder/r/rakdos_the_defiler.txt b/forge-gui/res/cardsfolder/r/rakdos_the_defiler.txt
index 5dcb7dec8a6..941df6e3378 100644
--- a/forge-gui/res/cardsfolder/r/rakdos_the_defiler.txt
+++ b/forge-gui/res/cardsfolder/r/rakdos_the_defiler.txt
@@ -5,11 +5,11 @@ PT:7/6
 K:Flying
 K:Trample
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ Whenever CARDNAME attacks, sacrifice half the non-Demon permanents you control, rounded up.
-T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigSac2 | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player sacrifices half the non-Demon permanents he or she controls, rounded up.
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigSac2 | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, that player sacrifices half the non-Demon permanents they control, rounded up.
 SVar:TrigSac:DB$ Sacrifice | Defined$ You | Amount$ X | References$ X | SacValid$ Permanent.nonDemon | SacMessage$ non-Demon Permanent
 SVar:TrigSac2:DB$ Sacrifice | Defined$ TriggeredTarget | Amount$ Y | References$ Y | SacValid$ Permanent.nonDemon | SacMessage$ non-Demon Permanent
 SVar:X:Count$Valid Permanent.nonDemon+YouCtrl/HalfUp
 SVar:Y:TriggeredTarget$Valid Permanent.nonDemon+YouCtrl/HalfUp
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rakdos_the_defiler.jpg
-Oracle:Flying, trample\nWhenever Rakdos the Defiler attacks, sacrifice half the non-Demon permanents you control, rounded up.\nWhenever Rakdos deals combat damage to a player, that player sacrifices half the non-Demon permanents he or she controls, rounded up.
+Oracle:Flying, trample\nWhenever Rakdos the Defiler attacks, sacrifice half the non-Demon permanents you control, rounded up.\nWhenever Rakdos deals combat damage to a player, that player sacrifices half the non-Demon permanents they control, rounded up.
diff --git a/forge-gui/res/cardsfolder/r/razias_purification.txt b/forge-gui/res/cardsfolder/r/razias_purification.txt
index bff11bc3712..cb2d148138f 100644
--- a/forge-gui/res/cardsfolder/r/razias_purification.txt
+++ b/forge-gui/res/cardsfolder/r/razias_purification.txt
@@ -1,10 +1,10 @@
 Name:Razia's Purification
 ManaCost:4 R W
 Types:Sorcery
-A:SP$ RepeatEach | Cost$ 4 R W | RepeatPlayers$ Player | RepeatSubAbility$ DBChooseSac | SubAbility$ DBSac | SpellDescription$ Each player chooses three permanents he or she controls, then sacrifices the rest.
+A:SP$ RepeatEach | Cost$ 4 R W | RepeatPlayers$ Player | RepeatSubAbility$ DBChooseSac | SubAbility$ DBSac | SpellDescription$ Each player chooses three permanents they control, then sacrifices the rest.
 SVar:DBChooseSac:DB$ ChooseCard | Defined$ Remembered | Choices$ Permanent.RememberedPlayerCtrl | Amount$ 3 | ChoiceTitle$ Choose three cards not to be sacrificed | RememberChosen$ True | Mandatory$ True
 SVar:DBSac:DB$ SacrificeAll | ValidCards$ Permanent.IsNotRemembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/razias_purification.jpg
-Oracle:Each player chooses three permanents he or she controls, then sacrifices the rest.
+Oracle:Each player chooses three permanents they control, then sacrifices the rest.
diff --git a/forge-gui/res/cardsfolder/r/reclamation.txt b/forge-gui/res/cardsfolder/r/reclamation.txt
index 7cd78421cbf..e04db6e2ea8 100644
--- a/forge-gui/res/cardsfolder/r/reclamation.txt
+++ b/forge-gui/res/cardsfolder/r/reclamation.txt
@@ -1,7 +1,7 @@
 Name:Reclamation
 ManaCost:2 G W
 Types:Enchantment
-S:Mode$ CantAttackUnless | ValidCard$ Creature.Black | Target$ Player,Planeswalker | Cost$ Sac<1/Land> | Description$ Black creatures can't attack unless their controller sacrifices a land for each black creature he or she controls that's attacking. (This cost is paid as attackers are declared.)
+S:Mode$ CantAttackUnless | ValidCard$ Creature.Black | Target$ Player,Planeswalker | Cost$ Sac<1/Land> | Description$ Black creatures can't attack unless their controller sacrifices a land for each black creature they control that's attacking. (This cost is paid as attackers are declared.)
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/reclamation.jpg
-Oracle:Black creatures can't attack unless their controller sacrifices a land for each black creature he or she controls that's attacking. (This cost is paid as attackers are declared.)
+Oracle:Black creatures can't attack unless their controller sacrifices a land for each black creature they control that's attacking. (This cost is paid as attackers are declared.)
diff --git a/forge-gui/res/cardsfolder/r/restore_balance.txt b/forge-gui/res/cardsfolder/r/restore_balance.txt
index 0055dc81b6d..0ddc148dfd3 100644
--- a/forge-gui/res/cardsfolder/r/restore_balance.txt
+++ b/forge-gui/res/cardsfolder/r/restore_balance.txt
@@ -3,9 +3,9 @@ ManaCost:no cost
 Types:Sorcery
 Colors:white
 K:Suspend:6:W
-A:SP$ Balance | Cost$ 1 W | Valid$ Land | AILogic$ BalanceCreaturesAndLands | SubAbility$ BalanceCreatures | SpellDescription$ Each player chooses a number of lands he or she controls equal to the number of lands controlled by the player who controls the fewest, then sacrifices the rest. Players discard cards and sacrifice creatures the same way. | ActivationLimit$ 0
+A:SP$ Balance | Cost$ 1 W | Valid$ Land | AILogic$ BalanceCreaturesAndLands | SubAbility$ BalanceCreatures | SpellDescription$ Each player chooses a number of lands they control equal to the number of lands controlled by the player who controls the fewest, then sacrifices the rest. Players discard cards and sacrifice creatures the same way. | ActivationLimit$ 0
 SVar:BalanceCreatures:DB$ Balance | Valid$ Creature | SubAbility$ BalanceHands
 SVar:BalanceHands:DB$ Balance | Zone$ Hand
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/restore_balance.jpg
-Oracle:Suspend 6—{W} (Rather than cast this card from your hand, pay {W} and exile it with six time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost.)\nEach player chooses a number of lands he or she controls equal to the number of lands controlled by the player who controls the fewest, then sacrifices the rest. Players sacrifice creatures and discard cards the same way.
+Oracle:Suspend 6—{W} (Rather than cast this card from your hand, pay {W} and exile it with six time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost.)\nEach player chooses a number of lands they control equal to the number of lands controlled by the player who controls the fewest, then sacrifices the rest. Players sacrifice creatures and discard cards the same way.
diff --git a/forge-gui/res/cardsfolder/r/rising_waters.txt b/forge-gui/res/cardsfolder/r/rising_waters.txt
index 912016c0479..641b55607b9 100644
--- a/forge-gui/res/cardsfolder/r/rising_waters.txt
+++ b/forge-gui/res/cardsfolder/r/rising_waters.txt
@@ -2,9 +2,9 @@ Name:Rising Waters
 ManaCost:3 U
 Types:Enchantment
 S:Mode$ Continuous | Affected$ Land | AddHiddenKeyword$ CARDNAME doesn't untap during your untap step. | Description$ Lands don't untap during their controller's untap steps.
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | IsPresent$ Card.Self | Execute$ TrigUntap | TriggerDescription$ At the beginning of each player's upkeep, that player untaps a land he or she controls.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | IsPresent$ Card.Self | Execute$ TrigUntap | TriggerDescription$ At the beginning of each player's upkeep, that player untaps a land they control.
 SVar:TrigUntap:DB$ Untap | UntapUpTo$ True | UntapType$ Land.ActivePlayerCtrl | Amount$ 1 | Defined$ TriggeredPlayer
 SVar:RemRandomDeck:True
 SVar:NonStackingEffect:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rising_waters.jpg
-Oracle:Lands don't untap during their controllers' untap steps.\nAt the beginning of each player's upkeep, that player untaps a land he or she controls.
+Oracle:Lands don't untap during their controllers' untap steps.\nAt the beginning of each player's upkeep, that player untaps a land they control.
diff --git a/forge-gui/res/cardsfolder/s/sands_of_time.txt b/forge-gui/res/cardsfolder/s/sands_of_time.txt
index dcf6d29e3bb..d64e16f1db5 100644
--- a/forge-gui/res/cardsfolder/s/sands_of_time.txt
+++ b/forge-gui/res/cardsfolder/s/sands_of_time.txt
@@ -2,10 +2,10 @@ Name:Sands of Time
 ManaCost:4
 Types:Artifact
 S:Mode$ Continuous | Affected$ Player | AddKeyword$ Skip your untap step. | Description$ Each player skips his or her untap step.
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigSands | TriggerDescription$ At the beginning of each player's upkeep, that player simultaneously untaps each tapped artifact, creature, and land he or she controls and taps each untapped artifact, creature, and land he or she controls.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigSands | TriggerDescription$ At the beginning of each player's upkeep, that player simultaneously untaps each tapped artifact, creature, and land they control and taps each untapped artifact, creature, and land they control.
 SVar:TrigSands:DB$ UntapAll | Defined$ TriggeredPlayer | ValidCards$ Artifact.tapped,Creature.tapped,Land.tapped | RememberUntapped$ True | SubAbility$ DBTap
 SVar:DBTap:DB$ TapAll | Defined$ TriggeredPlayer | ValidCards$ Artifact.untapped+IsNotRemembered,Creature.untapped+IsNotRemembered,Land.untapped+IsNotRemembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sands_of_time.jpg
-Oracle:Each player skips his or her untap step.\nAt the beginning of each player's upkeep, that player simultaneously untaps each tapped artifact, creature, and land he or she controls and taps each untapped artifact, creature, and land he or she controls.
+Oracle:Each player skips his or her untap step.\nAt the beginning of each player's upkeep, that player simultaneously untaps each tapped artifact, creature, and land they control and taps each untapped artifact, creature, and land they control.
diff --git a/forge-gui/res/cardsfolder/s/scrap_mastery.txt b/forge-gui/res/cardsfolder/s/scrap_mastery.txt
index b738f93be17..8069e200242 100644
--- a/forge-gui/res/cardsfolder/s/scrap_mastery.txt
+++ b/forge-gui/res/cardsfolder/s/scrap_mastery.txt
@@ -1,10 +1,10 @@
 Name:Scrap Mastery
 ManaCost:3 R R
 Types:Sorcery
-A:SP$ ChangeZoneAll | Cost$ 3 R R | ChangeType$ Artifact | Origin$ Graveyard | Destination$ Exile | RememberChanged$ True | ForgetOtherRemembered$ True | SubAbility$ DBSacrifice | SpellDescription$ Each player exiles all artifact cards from their graveyard, then sacrifices all artifacts he or she controls, then puts all cards he or she exiled this way onto the battlefield.
+A:SP$ ChangeZoneAll | Cost$ 3 R R | ChangeType$ Artifact | Origin$ Graveyard | Destination$ Exile | RememberChanged$ True | ForgetOtherRemembered$ True | SubAbility$ DBSacrifice | SpellDescription$ Each player exiles all artifact cards from their graveyard, then sacrifices all artifacts they control, then puts all cards he or she exiled this way onto the battlefield.
 SVar:DBSacrifice:DB$ SacrificeAll | ValidCards$ Artifact | SubAbility$ DBReturn
 SVar:DBReturn:DB$ ChangeZone | Defined$ Remembered | Origin$ Exile | Destination$ Battlefield | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/scrap_mastery.jpg
-Oracle:Each player exiles all artifact cards from their graveyard, then sacrifices all artifacts he or she controls, then puts all cards he or she exiled this way onto the battlefield.
+Oracle:Each player exiles all artifact cards from their graveyard, then sacrifices all artifacts they control, then puts all cards he or she exiled this way onto the battlefield.
diff --git a/forge-gui/res/cardsfolder/s/shaman_of_forgotten_ways.txt b/forge-gui/res/cardsfolder/s/shaman_of_forgotten_ways.txt
index 1842cef34a7..0a7991b5429 100644
--- a/forge-gui/res/cardsfolder/s/shaman_of_forgotten_ways.txt
+++ b/forge-gui/res/cardsfolder/s/shaman_of_forgotten_ways.txt
@@ -3,9 +3,9 @@ ManaCost:2 G
 Types:Creature Human Shaman
 PT:2/3
 A:AB$ Mana | Cost$ T | Produced$ Combo Any | Amount$ 2 | RestrictValid$ Card.Creature | SpellDescription$ Add two mana in any combination of colors. Spend this mana only to cast creature spells.
-A:AB$ RepeatEach | Cost$ 9 G G T | PrecostDesc$ Formidable — | CheckSVar$ FormidableTest | SVarCompare$ GE8 | References$ FormidableTest | RepeatPlayers$ Player | RepeatSubAbility$ DBSetLife | SpellDescription$ Each player's life total becomes the number of creatures he or she controls. Activate this ability only if creatures you control have total power 8 or greater.
+A:AB$ RepeatEach | Cost$ 9 G G T | PrecostDesc$ Formidable — | CheckSVar$ FormidableTest | SVarCompare$ GE8 | References$ FormidableTest | RepeatPlayers$ Player | RepeatSubAbility$ DBSetLife | SpellDescription$ Each player's life total becomes the number of creatures they control. Activate this ability only if creatures you control have total power 8 or greater.
 SVar:FormidableTest:Count$SumPower_Creature.YouCtrl
 SVar:DBSetLife:DB$ SetLife | Defined$ Player.IsRemembered | LifeAmount$ X | References$ X
 SVar:X:Count$Valid Creature.RememberedPlayerCtrl
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shaman_of_forgotten_ways.jpg
-Oracle:{T}: Add two mana in any combination of colors. Spend this mana only to cast creature spells.\nFormidable — {9}{G}{G}, {T}: Each player's life total becomes the number of creatures he or she controls. Activate this ability only if creatures you control have total power 8 or greater.
+Oracle:{T}: Add two mana in any combination of colors. Spend this mana only to cast creature spells.\nFormidable — {9}{G}{G}, {T}: Each player's life total becomes the number of creatures they control. Activate this ability only if creatures you control have total power 8 or greater.
diff --git a/forge-gui/res/cardsfolder/s/slaughter_the_strong.txt b/forge-gui/res/cardsfolder/s/slaughter_the_strong.txt
index 4022eaae51e..5358956e2d6 100644
--- a/forge-gui/res/cardsfolder/s/slaughter_the_strong.txt
+++ b/forge-gui/res/cardsfolder/s/slaughter_the_strong.txt
@@ -1,10 +1,10 @@
 Name:Slaughter the Strong
 ManaCost:1 W W
 Types:Sorcery
-A:SP$ RepeatEach | Cost$ 1 W W | RepeatPlayers$ Player | RepeatSubAbility$ ChooseCrtr | SubAbility$ SacAllOthers | SpellDescription$ Each player chooses any number of creatures he or she controls with total power 4 or less, then sacrifices all other creatures he or she controls.
+A:SP$ RepeatEach | Cost$ 1 W W | RepeatPlayers$ Player | RepeatSubAbility$ ChooseCrtr | SubAbility$ SacAllOthers | SpellDescription$ Each player chooses any number of creatures they control with total power 4 or less, then sacrifices all other creatures they control.
 SVar:ChooseCrtr:DB$ ChooseCard | Defined$ Player.IsRemembered | Choices$ Creature.RememberedPlayerCtrl | WithTotalPower$ 4 | RememberChosen$ True | AILogic$ NegativePowerFirst
 SVar:SacAllOthers:DB$ SacrificeAll | ValidCards$ Creature.IsNotRemembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/slaughter_the_strong.jpg
-Oracle:Each player chooses any number of creatures he or she controls with total power 4 or less, then sacrifices all other creatures he or she controls.
\ No newline at end of file
+Oracle:Each player chooses any number of creatures they control with total power 4 or less, then sacrifices all other creatures they control.
\ No newline at end of file
diff --git a/forge-gui/res/cardsfolder/s/spy_network.txt b/forge-gui/res/cardsfolder/s/spy_network.txt
index e72143e588f..0fdf6a0b91f 100644
--- a/forge-gui/res/cardsfolder/s/spy_network.txt
+++ b/forge-gui/res/cardsfolder/s/spy_network.txt
@@ -1,11 +1,11 @@
 Name:Spy Network
 ManaCost:U
 Types:Instant
-A:SP$ Pump | Cost$ U | ValidTgts$ Player | TgtPrompt$ Select target player. | SubAbility$ DBHand | StackDescription$ SpellDescription | SpellDescription$ Look at target player's hand, the top card of that player's library, and any face-down creatures he or she controls.
+A:SP$ Pump | Cost$ U | ValidTgts$ Player | TgtPrompt$ Select target player. | SubAbility$ DBHand | StackDescription$ SpellDescription | SpellDescription$ Look at target player's hand, the top card of that player's library, and any face-down creatures they control.
 SVar:DBHand:DB$ LookAt | Defined$ ValidHand Card.TargetedPlayerCtrl | SubAbility$ DBTopLibrary | StackDescription$ None
 SVar:DBTopLibrary:DB$ LookAt | Defined$ ValidAll Card.TopLibrary+TargetedPlayerCtrl | SubAbility$ DBFaceDown | StackDescription$ None
 SVar:DBFaceDown:DB$ LookAt | Defined$ Valid Creature.faceDown+TargetedPlayerCtrl | SubAbility$ DBRearrange | StackDescription$ None
 SVar:DBRearrange:DB$ RearrangeTopOfLibrary | Defined$ You | NumCards$ 4
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/spy_network.jpg
-Oracle:Look at target player's hand, the top card of that player's library, and any face-down creatures he or she controls. Look at the top four cards of your library, then put them back in any order.
+Oracle:Look at target player's hand, the top card of that player's library, and any face-down creatures they control. Look at the top four cards of your library, then put them back in any order.
diff --git a/forge-gui/res/cardsfolder/s/stern_judge.txt b/forge-gui/res/cardsfolder/s/stern_judge.txt
index b64d3387fbf..4234cfd4193 100644
--- a/forge-gui/res/cardsfolder/s/stern_judge.txt
+++ b/forge-gui/res/cardsfolder/s/stern_judge.txt
@@ -2,10 +2,10 @@ Name:Stern Judge
 ManaCost:2 W
 Types:Creature Human Cleric
 PT:2/2
-A:AB$ RepeatEach | Cost$ T | RepeatPlayers$ Player | RepeatSubAbility$ DBLoseLife | AILogic$ AllPlayerLoseLife | SpellDescription$ Each player loses 1 life for each Swamp he or she controls.
+A:AB$ RepeatEach | Cost$ T | RepeatPlayers$ Player | RepeatSubAbility$ DBLoseLife | AILogic$ AllPlayerLoseLife | SpellDescription$ Each player loses 1 life for each Swamp they control.
 SVar:DBLoseLife:DB$ LoseLife | Defined$ Remembered | LifeAmount$ X | References$ X | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Count$Valid Swamp.RememberedPlayerCtrl
 SVar:RemRandomDeck:True
 SVar:Picture:http://resources.wizards.com/magic/cards/tor/en-us/card35082.jpg
-Oracle:{T}: Each player loses 1 life for each Swamp he or she controls.
+Oracle:{T}: Each player loses 1 life for each Swamp they control.
diff --git a/forge-gui/res/cardsfolder/s/stronghold_discipline.txt b/forge-gui/res/cardsfolder/s/stronghold_discipline.txt
index 90cda16146b..f5af173c23e 100644
--- a/forge-gui/res/cardsfolder/s/stronghold_discipline.txt
+++ b/forge-gui/res/cardsfolder/s/stronghold_discipline.txt
@@ -1,10 +1,10 @@
 Name:Stronghold Discipline
 ManaCost:2 B B
 Types:Sorcery
-A:SP$ RepeatEach | Cost$ 2 B B | RepeatPlayers$ Player | RepeatSubAbility$ DBLoseLife | AILogic$ AllPlayerLoseLife | SpellDescription$ Each player loses 1 life for each creature he or she controls.
+A:SP$ RepeatEach | Cost$ 2 B B | RepeatPlayers$ Player | RepeatSubAbility$ DBLoseLife | AILogic$ AllPlayerLoseLife | SpellDescription$ Each player loses 1 life for each creature they control.
 SVar:DBLoseLife:DB$ LoseLife | Defined$ Player.IsRemembered | LifeAmount$ X | References$ X
 SVar:X:Count$Valid Creature.RememberedPlayerCtrl
 SVar:AIPlayForSub:True
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stronghold_discipline.jpg
-Oracle:Each player loses 1 life for each creature he or she controls.
+Oracle:Each player loses 1 life for each creature they control.
diff --git a/forge-gui/res/cardsfolder/s/sunken_hope.txt b/forge-gui/res/cardsfolder/s/sunken_hope.txt
index 2f8ea7607e4..13828578a61 100644
--- a/forge-gui/res/cardsfolder/s/sunken_hope.txt
+++ b/forge-gui/res/cardsfolder/s/sunken_hope.txt
@@ -1,8 +1,8 @@
 Name:Sunken Hope
 ManaCost:3 U U
 Types:Enchantment
-T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigChangeZoneYou | TriggerDescription$ At the beginning of each player's upkeep, that player returns a creature he or she controls to its owner's hand.
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigChangeZoneYou | TriggerDescription$ At the beginning of each player's upkeep, that player returns a creature they control to its owner's hand.
 SVar:TrigChangeZoneYou:DB$ ChangeZone | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Creature | DefinedPlayer$ TriggeredPlayer | ChangeNum$ 1
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sunken_hope.jpg
-Oracle:At the beginning of each player's upkeep, that player returns a creature he or she controls to its owner's hand.
+Oracle:At the beginning of each player's upkeep, that player returns a creature they control to its owner's hand.