diff --git a/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java b/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java
index 56a70a81860..9b59121999c 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/NewTableDialog.java
@@ -142,7 +142,7 @@ public class NewTableDialog extends MageDialog {
         lbDeckType.setText("Deck Type:");
 
         lbTimeLimit.setText("Time Limit:");
-        lbTimeLimit.setToolTipText("The active time a player may use to finish the match. If his or her time runs out, the player looses the current game.");
+        lbTimeLimit.setToolTipText("The active time a player may use to finish the match. If their time runs out, the player looses the current game.");
 
         lblGameType.setText("Game Type:");
 
diff --git a/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java b/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java
index 63eb36ac265..0a24ab015e6 100644
--- a/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java
+++ b/Mage.Server/src/main/java/mage/server/tournament/TournamentController.java
@@ -344,7 +344,7 @@ public class TournamentController {
             TournamentPlayer player = tournament.getPlayer(playerId);
             if (player != null && !player.hasQuit()) {
                 tournamentSessions.get(playerId).submitDeck(deck);
-                ChatManager.instance.broadcast(chatId, "", player.getPlayer().getLogName() + " has submitted his or her tournament deck", MessageColor.BLACK, true, MessageType.STATUS, SoundToPlay.PlayerSubmittedDeck);
+                ChatManager.instance.broadcast(chatId, "", player.getPlayer().getLogName() + " has submitted their tournament deck", MessageColor.BLACK, true, MessageType.STATUS, SoundToPlay.PlayerSubmittedDeck);
             }
         }
     }
diff --git a/Mage.Sets/src/mage/cards/a/Acquire.java b/Mage.Sets/src/mage/cards/a/Acquire.java
index 9e60b967309..ee30d97e125 100644
--- a/Mage.Sets/src/mage/cards/a/Acquire.java
+++ b/Mage.Sets/src/mage/cards/a/Acquire.java
@@ -25,7 +25,7 @@ public class Acquire extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{U}{U}");
 
         // Search target opponent's library for an artifact card and put that card onto the battlefield under your control.
-        // Then that player shuffles his or her library.
+        // Then that player shuffles their library.
         this.getSpellAbility().addEffect(new AcquireEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
     }
@@ -50,7 +50,7 @@ class AcquireEffect extends OneShotEffect {
 
     public AcquireEffect() {
         super(Outcome.PutCardInPlay);
-        staticText = "Search target opponent's library for an artifact card and put that card onto the battlefield under your control. Then that player shuffles his or her library";
+        staticText = "Search target opponent's library for an artifact card and put that card onto the battlefield under your control. Then that player shuffles their library";
     }
 
     public AcquireEffect(final AcquireEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/a/Addle.java b/Mage.Sets/src/mage/cards/a/Addle.java
index 359dbe4c1bc..ddbe51e299b 100644
--- a/Mage.Sets/src/mage/cards/a/Addle.java
+++ b/Mage.Sets/src/mage/cards/a/Addle.java
@@ -53,7 +53,7 @@ public class Addle extends CardImpl {
     public Addle(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{B}");
 
-        // Choose a color. Target player reveals his or her hand and you choose a card of that color from it. That player discards that card.
+        // Choose a color. Target player reveals their hand and you choose a card of that color from it. That player discards that card.
         this.getSpellAbility().addEffect(new AddleEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
@@ -72,7 +72,7 @@ class AddleEffect extends OneShotEffect {
 
     AddleEffect() {
         super(Outcome.Discard);
-        staticText = "Choose a color. Target player reveals his or her hand and you choose a card of that color from it. That player discards that card.";
+        staticText = "Choose a color. Target player reveals their hand and you choose a card of that color from it. That player discards that card.";
     }
 
     AddleEffect(final AddleEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/a/Aetherspouts.java b/Mage.Sets/src/mage/cards/a/Aetherspouts.java
index 3e8466c2064..22e83e20f16 100644
--- a/Mage.Sets/src/mage/cards/a/Aetherspouts.java
+++ b/Mage.Sets/src/mage/cards/a/Aetherspouts.java
@@ -56,7 +56,7 @@ public class Aetherspouts extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{U}{U}");
 
 
-        // For each attacking creature, its owner puts it on the top or bottom of his or her library.
+        // For each attacking creature, its owner puts it on the top or bottom of their library.
         this.getSpellAbility().addEffect(new AetherspoutsEffect());
     }
 
@@ -72,17 +72,17 @@ public class Aetherspouts extends CardImpl {
 
 /*
 7/18/2014 	The owner of each attacking creature chooses whether to put it on the top or bottom
-            of his or her library. The active player (the player whose turn it is) makes all of
-            his or her choices first, followed by each other player in turn order.
+            of their library. The active player (the player whose turn it is) makes all of
+            their choices first, followed by each other player in turn order.
 7/18/2014 	If an effect puts two or more cards on the top or bottom of a library at the same time,
             the owner of those cards may arrange them in any order. That library’s owner doesn’t reveal
-            the order in which the cards go into his or her library.
+            the order in which the cards go into their library.
 */
 class AetherspoutsEffect extends OneShotEffect {
 
     public AetherspoutsEffect() {
         super(Outcome.Benefit);
-        this.staticText = "For each attacking creature, its owner puts it on the top or bottom of his or her library";
+        this.staticText = "For each attacking creature, its owner puts it on the top or bottom of their library";
     }
 
     public AetherspoutsEffect(final AetherspoutsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/a/AlhammarretHighArbiter.java b/Mage.Sets/src/mage/cards/a/AlhammarretHighArbiter.java
index 5b16fa0ef08..131f83059e0 100644
--- a/Mage.Sets/src/mage/cards/a/AlhammarretHighArbiter.java
+++ b/Mage.Sets/src/mage/cards/a/AlhammarretHighArbiter.java
@@ -63,7 +63,7 @@ public class AlhammarretHighArbiter extends CardImpl {
 
         // Flying
         this.addAbility(FlyingAbility.getInstance());
-        // As Alhammarret, High Arbiter enters the battlefield, each opponent reveals his or her hand. You choose the name of a nonland card revealed this way.
+        // As Alhammarret, High Arbiter enters the battlefield, each opponent reveals their hand. You choose the name of a nonland card revealed this way.
         // Your opponents can't cast spells with the chosen name.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EntersBattlefieldEffect(new AlhammarretHighArbiterEffect(), "")));
     }
@@ -82,7 +82,7 @@ class AlhammarretHighArbiterEffect extends OneShotEffect {
 
     public AlhammarretHighArbiterEffect() {
         super(Outcome.Benefit);
-        this.staticText = "As {this} enters the battlefield, each opponent reveals his or her hand. You choose the name of a nonland card revealed this way."
+        this.staticText = "As {this} enters the battlefield, each opponent reveals their hand. You choose the name of a nonland card revealed this way."
                 + "<br>Your opponents can't cast spells with the chosen name";
     }
 
diff --git a/Mage.Sets/src/mage/cards/a/AllHallowsEve.java b/Mage.Sets/src/mage/cards/a/AllHallowsEve.java
index cff8b58a6ca..ea588cba6ba 100644
--- a/Mage.Sets/src/mage/cards/a/AllHallowsEve.java
+++ b/Mage.Sets/src/mage/cards/a/AllHallowsEve.java
@@ -60,7 +60,7 @@ public class AllHallowsEve extends CardImpl {
         effect.setText("with 2 scream counters on it");
         this.getSpellAbility().addEffect(effect);
 
-        // At the beginning of your upkeep, if All Hallow's Eve is exiled with a scream counter on it, remove a scream counter from it. If there are no more scream counters on it, put it into your graveyard and each player returns all creature cards from his or her graveyard to the battlefield.
+        // At the beginning of your upkeep, if All Hallow's Eve is exiled with a scream counter on it, remove a scream counter from it. If there are no more scream counters on it, put it into your graveyard and each player returns all creature cards from their graveyard to the battlefield.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.EXILED, new AllHallowsEveEffect(), TargetController.YOU, false));
 
     }
@@ -79,7 +79,7 @@ class AllHallowsEveEffect extends OneShotEffect {
 
     public AllHallowsEveEffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "if {this} is exiled with a scream counter on it, remove a scream counter from it. If there are no more scream counters on it, put it into your graveyard and each player returns all creature cards from his or her graveyard to the battlefield";
+        this.staticText = "if {this} is exiled with a scream counter on it, remove a scream counter from it. If there are no more scream counters on it, put it into your graveyard and each player returns all creature cards from their graveyard to the battlefield";
     }
 
     public AllHallowsEveEffect(final AllHallowsEveEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/a/AltarOfDementia.java b/Mage.Sets/src/mage/cards/a/AltarOfDementia.java
index 44a8dfc255a..e1f504e2cbc 100644
--- a/Mage.Sets/src/mage/cards/a/AltarOfDementia.java
+++ b/Mage.Sets/src/mage/cards/a/AltarOfDementia.java
@@ -53,7 +53,7 @@ public class AltarOfDementia extends CardImpl {
     public AltarOfDementia(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}");
 
-        // Sacrifice a creature: Target player puts a number of cards equal to the sacrificed creature's power from the top of his or her library into his or her graveyard.
+        // Sacrifice a creature: Target player puts a number of cards equal to the sacrificed creature's power from the top of their library into their graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AltarOfDementiaEffect(), new SacrificeTargetCost(new TargetControlledPermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT)));
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
@@ -74,7 +74,7 @@ class AltarOfDementiaEffect extends OneShotEffect {
 
     public AltarOfDementiaEffect() {
         super(Outcome.Damage);
-        staticText = "Target player puts a number of cards equal to the sacrificed creature's power from the top of his or her library into his or her graveyard";
+        staticText = "Target player puts a number of cards equal to the sacrificed creature's power from the top of their library into their graveyard";
     }
 
     public AltarOfDementiaEffect(final AltarOfDementiaEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/a/AltarOfTheBrood.java b/Mage.Sets/src/mage/cards/a/AltarOfTheBrood.java
index 4a517c27df9..97ca89358a0 100644
--- a/Mage.Sets/src/mage/cards/a/AltarOfTheBrood.java
+++ b/Mage.Sets/src/mage/cards/a/AltarOfTheBrood.java
@@ -53,7 +53,7 @@ public class AltarOfTheBrood extends CardImpl {
     public AltarOfTheBrood(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}");
 
-        // Whenever another permanent enters the battlefield under your control, each opponent puts the top card of his or her library into his or her graveyard.
+        // Whenever another permanent enters the battlefield under your control, each opponent puts the top card of their library into their graveyard.
         this.addAbility(new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD,
                 new PutTopCardOfLibraryIntoGraveEachPlayerEffect(1, TargetController.OPPONENT), filter, false, null, true));
     }
diff --git a/Mage.Sets/src/mage/cards/a/AmbassadorLaquatus.java b/Mage.Sets/src/mage/cards/a/AmbassadorLaquatus.java
index d4858464ede..64b420a47b2 100644
--- a/Mage.Sets/src/mage/cards/a/AmbassadorLaquatus.java
+++ b/Mage.Sets/src/mage/cards/a/AmbassadorLaquatus.java
@@ -56,7 +56,7 @@ public class AmbassadorLaquatus extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(3);
 
-        // {3}: Target player puts the top three cards of his or her library into his or her graveyard.
+        // {3}: Target player puts the top three cards of their library into their graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(3), new GenericManaCost(3));
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/a/Amnesia.java b/Mage.Sets/src/mage/cards/a/Amnesia.java
index 70e53153fde..27b880fbbab 100644
--- a/Mage.Sets/src/mage/cards/a/Amnesia.java
+++ b/Mage.Sets/src/mage/cards/a/Amnesia.java
@@ -50,7 +50,7 @@ public class Amnesia extends CardImpl {
     public Amnesia(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{U}{U}{U}");
 
-        // Target player reveals his or her hand and discards all nonland cards.
+        // Target player reveals their hand and discards all nonland cards.
         this.getSpellAbility().addEffect(new AmnesiaEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
@@ -69,7 +69,7 @@ class AmnesiaEffect extends OneShotEffect {
 
     public AmnesiaEffect() {
         super(Outcome.Discard);
-        this.staticText = "Target player reveals his or her hand and discards all nonland cards";
+        this.staticText = "Target player reveals their hand and discards all nonland cards";
     }
 
     public AmnesiaEffect(final AmnesiaEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/a/AngrathTheFlameChained.java b/Mage.Sets/src/mage/cards/a/AngrathTheFlameChained.java
index 9d4decc3883..fa3e8534bfa 100644
--- a/Mage.Sets/src/mage/cards/a/AngrathTheFlameChained.java
+++ b/Mage.Sets/src/mage/cards/a/AngrathTheFlameChained.java
@@ -82,7 +82,7 @@ public class AngrathTheFlameChained extends CardImpl {
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
 
-        // -8: Each opponent loses life equal to the number of cards in his or her graveyard.
+        // -8: Each opponent loses life equal to the number of cards in their graveyard.
         this.addAbility(new LoyaltyAbility(new AngrathTheFlameUltimateEffect(), -8));
 
     }
@@ -101,7 +101,7 @@ class AngrathTheFlameUltimateEffect extends OneShotEffect {
 
     public AngrathTheFlameUltimateEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Each opponent loses life equal to the number of cards in his or her graveyard";
+        this.staticText = "Each opponent loses life equal to the number of cards in their graveyard";
     }
 
     public AngrathTheFlameUltimateEffect(final AngrathTheFlameUltimateEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java b/Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java
index 345d8bca712..7408df5db82 100644
--- a/Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java
+++ b/Mage.Sets/src/mage/cards/a/AnyaMercilessAngel.java
@@ -62,17 +62,17 @@ public class AnyaMercilessAngel extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
         
-        // Anya, Merciless Angel gets +3/+3 for each opponent whose life total is less than half his or her starting life total.
+        // Anya, Merciless Angel gets +3/+3 for each opponent whose life total is less than half their starting life total.
         DynamicValue dValue = new MultipliedValue(new AnyaMercilessAngelDynamicValue(), 3);
         Effect effect = new BoostSourceEffect(dValue, dValue, Duration.WhileOnBattlefield);
-        effect.setText("{this} gets +3/+3 for each opponent whose life total is less than half his or her starting life total");
+        effect.setText("{this} gets +3/+3 for each opponent whose life total is less than half their starting life total");
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostSourceEffect(dValue, dValue, Duration.WhileOnBattlefield)));
         
-        // As long as an opponent's life total is less than half his or her starting life total, Anya has indestructible.
+        // As long as an opponent's life total is less than half their starting life total, Anya has indestructible.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
                 new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield),
                         AnyaMercilessAngelCondition.instance,
-                        "As long as an opponent's life total is less than half his or her starting life total, {this} has indestructible")));
+                        "As long as an opponent's life total is less than half their starting life total, {this} has indestructible")));
     }
 
     public AnyaMercilessAngel(final AnyaMercilessAngel card) {
@@ -110,7 +110,7 @@ class AnyaMercilessAngelDynamicValue implements DynamicValue {
 
     @Override
     public String getMessage() {
-        return "number of opponents whose life total is less than half his or her starting life total";
+        return "number of opponents whose life total is less than half their starting life total";
     }
 
     @Override
@@ -129,6 +129,6 @@ enum AnyaMercilessAngelCondition implements Condition {
 
     @Override
     public String toString() {
-        return "an opponent's life total is less than half his or her starting life total";
+        return "an opponent's life total is less than half their starting life total";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/a/AppetiteForBrains.java b/Mage.Sets/src/mage/cards/a/AppetiteForBrains.java
index 23ef976e2ae..afc023af52c 100644
--- a/Mage.Sets/src/mage/cards/a/AppetiteForBrains.java
+++ b/Mage.Sets/src/mage/cards/a/AppetiteForBrains.java
@@ -53,7 +53,7 @@ public class AppetiteForBrains extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}");
 
 
-        // Target opponent reveals his or her hand. You choose a card from it with converted mana cost 4 or greater and exile that card.
+        // Target opponent reveals their hand. You choose a card from it with converted mana cost 4 or greater and exile that card.
         this.getSpellAbility().addEffect(new ExileCardYouChooseTargetOpponentEffect(filter));
         this.getSpellAbility().addTarget(new TargetOpponent());
     }
diff --git a/Mage.Sets/src/mage/cards/a/ApproachOfTheSecondSun.java b/Mage.Sets/src/mage/cards/a/ApproachOfTheSecondSun.java
index bc0e06d6546..c2f38a1fa3a 100644
--- a/Mage.Sets/src/mage/cards/a/ApproachOfTheSecondSun.java
+++ b/Mage.Sets/src/mage/cards/a/ApproachOfTheSecondSun.java
@@ -98,9 +98,9 @@ class ApproachOfTheSecondSunEffect extends OneShotEffect {
 
                     // Inform the players
                     if (isOnBottom) {
-                        game.informPlayers(controller.getLogName() + " puts " + spell.getLogName() + " on the bottom of his or her library.");
+                        game.informPlayers(controller.getLogName() + " puts " + spell.getLogName() + " on the bottom of their library.");
                     } else {
-                        game.informPlayers(controller.getLogName() + " puts " + spell.getLogName() + " into his or her library 7th from the top.");
+                        game.informPlayers(controller.getLogName() + " puts " + spell.getLogName() + " into their library 7th from the top.");
                     }
                 }
             }
diff --git a/Mage.Sets/src/mage/cards/a/Arboria.java b/Mage.Sets/src/mage/cards/a/Arboria.java
index 31111aa155d..e3e2846027d 100644
--- a/Mage.Sets/src/mage/cards/a/Arboria.java
+++ b/Mage.Sets/src/mage/cards/a/Arboria.java
@@ -54,7 +54,7 @@ public class Arboria extends CardImpl {
 
         addSuperType(SuperType.WORLD);
 
-        // Creatures can't attack a player unless that player cast a spell or put a nontoken permanent onto the battlefield during his or her last turn.
+        // Creatures can't attack a player unless that player cast a spell or put a nontoken permanent onto the battlefield during their last turn.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ArboriaEffect()), new PermanentsEnteredBattlefieldYourLastTurnWatcher());
     }
 
@@ -72,7 +72,7 @@ class ArboriaEffect extends RestrictionEffect {
 
     public ArboriaEffect() {
         super(Duration.WhileOnBattlefield);
-        staticText = "Creatures can't attack a player unless that player cast a spell or put a nontoken permanent onto the battlefield during his or her last turn";
+        staticText = "Creatures can't attack a player unless that player cast a spell or put a nontoken permanent onto the battlefield during their last turn";
     }
 
     public ArboriaEffect(final ArboriaEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/a/ArchiveTrap.java b/Mage.Sets/src/mage/cards/a/ArchiveTrap.java
index ed987759f0a..1d331eecf54 100644
--- a/Mage.Sets/src/mage/cards/a/ArchiveTrap.java
+++ b/Mage.Sets/src/mage/cards/a/ArchiveTrap.java
@@ -57,10 +57,10 @@ public class ArchiveTrap extends CardImpl {
 
         this.subtype.add(SubType.TRAP);
 
-        // If an opponent searched his or her library this turn, you may pay {0} rather than pay Archive Trap's mana cost.
+        // If an opponent searched their library this turn, you may pay {0} rather than pay Archive Trap's mana cost.
         this.addAbility(new AlternativeCostSourceAbility(new GenericManaCost(0), OpponentSearchesLibCondition.instance), new ArchiveTrapWatcher());
 
-        // Target opponent puts the top thirteen cards of his or her library into his or her graveyard.
+        // Target opponent puts the top thirteen cards of their library into their graveyard.
         this.getSpellAbility().addTarget(new TargetOpponent());
         this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(13));
     }
@@ -132,7 +132,7 @@ enum OpponentSearchesLibCondition implements Condition {
 
     @Override
     public String toString() {
-        return "If an opponent searched his or her library this turn";
+        return "If an opponent searched their library this turn";
     }
 
 }
diff --git a/Mage.Sets/src/mage/cards/a/ArcumDagsson.java b/Mage.Sets/src/mage/cards/a/ArcumDagsson.java
index 189c9fddd06..b98c5f1db49 100644
--- a/Mage.Sets/src/mage/cards/a/ArcumDagsson.java
+++ b/Mage.Sets/src/mage/cards/a/ArcumDagsson.java
@@ -69,7 +69,7 @@ public class ArcumDagsson extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        // {tap}: Target artifact creature's controller sacrifices it. That player may search his or her library for a noncreature artifact card, put it onto the battlefield, then shuffle his or her library.
+        // {tap}: Target artifact creature's controller sacrifices it. That player may search their library for a noncreature artifact card, put it onto the battlefield, then shuffle their library.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ArcumDagssonEffect(), new TapSourceCost());
         ability.addTarget(new TargetPermanent(filter));
         this.addAbility(ability);
@@ -95,7 +95,7 @@ class ArcumDagssonEffect extends OneShotEffect {
 
     ArcumDagssonEffect() {
         super(Outcome.Removal);
-        this.staticText = "Target artifact creature's controller sacrifices it. That player may search his or her library for a noncreature artifact card, put it onto the battlefield, then shuffle his or her library";
+        this.staticText = "Target artifact creature's controller sacrifices it. That player may search their library for a noncreature artifact card, put it onto the battlefield, then shuffle their library";
     }
 
     ArcumDagssonEffect(final ArcumDagssonEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/a/AshnodsCylix.java b/Mage.Sets/src/mage/cards/a/AshnodsCylix.java
index fd11615bf38..0615ee96b47 100644
--- a/Mage.Sets/src/mage/cards/a/AshnodsCylix.java
+++ b/Mage.Sets/src/mage/cards/a/AshnodsCylix.java
@@ -59,7 +59,7 @@ public class AshnodsCylix extends CardImpl {
     public AshnodsCylix(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}");
 
-        // {3}, {T}: Target player looks at the top three cards of his or her library, puts one of them back on top of his or her library, then exiles the rest.
+        // {3}, {T}: Target player looks at the top three cards of their library, puts one of them back on top of their library, then exiles the rest.
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AshnodsCylixEffect(), new GenericManaCost(3));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetPlayer());
@@ -80,7 +80,7 @@ class AshnodsCylixEffect extends OneShotEffect {
     
     AshnodsCylixEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Target player looks at the top three cards of his or her library, puts one of them back on top of his or her library, then exiles the rest";
+        this.staticText = "Target player looks at the top three cards of their library, puts one of them back on top of their library, then exiles the rest";
     }
     
     AshnodsCylixEffect(final AshnodsCylixEffect effect) {
@@ -113,7 +113,7 @@ class AshnodsCylixEffect extends OneShotEffect {
             if (card != null) {
                 cards.remove(card);
                 player.getLibrary().putOnTop(card, game);
-                game.informPlayers(source.getSourceObject(game).getIdName() + ": " + player.getLogName() + " puts a card on top of his or her library");
+                game.informPlayers(source.getSourceObject(game).getIdName() + ": " + player.getLogName() + " puts a card on top of their library");
             }
         }
         for (UUID cardId : cards) {
diff --git a/Mage.Sets/src/mage/cards/a/AurraSingBaneOfJedi.java b/Mage.Sets/src/mage/cards/a/AurraSingBaneOfJedi.java
index 1544c7f7047..721cbbaeb86 100644
--- a/Mage.Sets/src/mage/cards/a/AurraSingBaneOfJedi.java
+++ b/Mage.Sets/src/mage/cards/a/AurraSingBaneOfJedi.java
@@ -75,7 +75,7 @@ public class AurraSingBaneOfJedi extends CardImpl {
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
 
-        // -6:Each player discards his or her hand and sacrificies all creatures he or she controls. Each player's life total becomes 1."
+        // -6:Each player discards their hand and sacrificies all creatures he or she controls. Each player's life total becomes 1."
         ability = new LoyaltyAbility(new DiscardHandAllEffect(), -6);
         ability.addEffect(new SacrificeAllEffect());
         Effect effect = new SetPlayerLifeAllEffect(1, TargetController.ANY);
diff --git a/Mage.Sets/src/mage/cards/a/AvenWindreader.java b/Mage.Sets/src/mage/cards/a/AvenWindreader.java
index 6c3e7b3add7..094ae180185 100644
--- a/Mage.Sets/src/mage/cards/a/AvenWindreader.java
+++ b/Mage.Sets/src/mage/cards/a/AvenWindreader.java
@@ -59,7 +59,7 @@ public class AvenWindreader extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
 
-        // {1}{U}: Target player reveals the top card of his or her library.
+        // {1}{U}: Target player reveals the top card of their library.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RevealTargetPlayerLibraryEffect(1), new ManaCostsImpl("{1}{U}"));
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/b/BalaGedThief.java b/Mage.Sets/src/mage/cards/b/BalaGedThief.java
index 7bae674a196..06899fd69a4 100644
--- a/Mage.Sets/src/mage/cards/b/BalaGedThief.java
+++ b/Mage.Sets/src/mage/cards/b/BalaGedThief.java
@@ -59,7 +59,7 @@ public class BalaGedThief extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        // Whenever Bala Ged Thief or another Ally enters the battlefield under your control, target player reveals a number of cards from his or her hand equal to the number of Allies you control. You choose one of them. That player discards that card.
+        // Whenever Bala Ged Thief or another Ally enters the battlefield under your control, target player reveals a number of cards from their hand equal to the number of Allies you control. You choose one of them. That player discards that card.
         Ability ability = new AllyEntersBattlefieldTriggeredAbility(new BalaGedThiefEffect(), false);
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
@@ -79,7 +79,7 @@ class BalaGedThiefEffect extends OneShotEffect {
 
     public BalaGedThiefEffect() {
         super(Outcome.Discard);
-        this.staticText = "target player reveals a number of cards from his or her hand equal to the number of Allies you control. You choose one of them. That player discards that card";
+        this.staticText = "target player reveals a number of cards from their hand equal to the number of Allies you control. You choose one of them. That player discards that card";
     }
 
     public BalaGedThiefEffect(final BalaGedThiefEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/b/BalefulStare.java b/Mage.Sets/src/mage/cards/b/BalefulStare.java
index d0244093ba6..9dccf2b5e18 100644
--- a/Mage.Sets/src/mage/cards/b/BalefulStare.java
+++ b/Mage.Sets/src/mage/cards/b/BalefulStare.java
@@ -56,7 +56,7 @@ public class BalefulStare extends CardImpl {
     public BalefulStare(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{U}");
 
-        // Target opponent reveals his or her hand. You draw a card for each Mountain and red card in it.
+        // Target opponent reveals their hand. You draw a card for each Mountain and red card in it.
         this.getSpellAbility().addEffect(new RevealHandTargetEffect());
         this.getSpellAbility().addEffect(new BalefulStareEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
diff --git a/Mage.Sets/src/mage/cards/b/BalothCageTrap.java b/Mage.Sets/src/mage/cards/b/BalothCageTrap.java
index e33adb64fc5..3277f69e2ac 100644
--- a/Mage.Sets/src/mage/cards/b/BalothCageTrap.java
+++ b/Mage.Sets/src/mage/cards/b/BalothCageTrap.java
@@ -53,7 +53,7 @@ public class BalothCageTrap extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{G}{G}");
         this.subtype.add(SubType.TRAP);
 
-        // If an opponent had an artifact enter the battlefield under his or her control this turn, you may pay {1}{G} rather than pay Baloth Cage Trap's mana cost.
+        // If an opponent had an artifact enter the battlefield under their control this turn, you may pay {1}{G} rather than pay Baloth Cage Trap's mana cost.
         this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{1}{G}"), BalothCageTrapCondition.instance), new PermanentsEnteredBattlefieldWatcher());
 
         // Create a 4/4 green Beast creature token.
@@ -94,6 +94,6 @@ enum BalothCageTrapCondition implements Condition {
 
     @Override
     public String toString() {
-        return "If an opponent had an artifact enter the battlefield under his or her control this turn";
+        return "If an opponent had an artifact enter the battlefield under their control this turn";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/b/BalshanBeguiler.java b/Mage.Sets/src/mage/cards/b/BalshanBeguiler.java
index cae426bbed0..d80d1f49a4b 100644
--- a/Mage.Sets/src/mage/cards/b/BalshanBeguiler.java
+++ b/Mage.Sets/src/mage/cards/b/BalshanBeguiler.java
@@ -58,7 +58,7 @@ public class BalshanBeguiler extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        // Whenever Balshan Beguiler deals combat damage to a player, that player reveals the top two cards of his or her library. You choose one of those cards and put it into his or her graveyard.
+        // Whenever Balshan Beguiler deals combat damage to a player, that player reveals the top two cards of their library. You choose one of those cards and put it into their graveyard.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new BalshanBeguilerEffect(), false, true));
     }
 
@@ -76,7 +76,7 @@ class BalshanBeguilerEffect extends OneShotEffect {
     
     public BalshanBeguilerEffect() {
         super(Outcome.Benefit);
-        this.staticText = " that player reveals the top two cards of his or her library. You choose one of those cards and put it into his or her graveyard.";
+        this.staticText = " that player reveals the top two cards of their library. You choose one of those cards and put it into their graveyard.";
     }
     
     public BalshanBeguilerEffect(final BalshanBeguilerEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java b/Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java
index 2f47acc6803..49019ba0ccf 100644
--- a/Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java
+++ b/Mage.Sets/src/mage/cards/b/BalthorTheDefiled.java
@@ -66,7 +66,7 @@ public class BalthorTheDefiled extends CardImpl {
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield,
                 new FilterCreaturePermanent(SubType.MINION, "Minion creatures"), false)));
 
-        // {B}{B}{B}, Exile Balthor the Defiled: Each player returns all black and all red creature cards from his or her graveyard to the battlefield.
+        // {B}{B}{B}, Exile Balthor the Defiled: Each player returns all black and all red creature cards from their graveyard to the battlefield.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BalthorTheDefiledEffect(), new ManaCostsImpl("{B}{B}{B}"));
         ability.addCost(new ExileSourceCost());
         this.addAbility(ability);
@@ -95,7 +95,7 @@ class BalthorTheDefiledEffect extends OneShotEffect {
 
     public BalthorTheDefiledEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Each player returns all black and all red creature cards from his or her graveyard to the battlefield";
+        this.staticText = "Each player returns all black and all red creature cards from their graveyard to the battlefield";
     }
 
     public BalthorTheDefiledEffect(final BalthorTheDefiledEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/b/BalustradeSpy.java b/Mage.Sets/src/mage/cards/b/BalustradeSpy.java
index 4a5e85ef6b8..3b9f2725573 100644
--- a/Mage.Sets/src/mage/cards/b/BalustradeSpy.java
+++ b/Mage.Sets/src/mage/cards/b/BalustradeSpy.java
@@ -62,7 +62,7 @@ public class BalustradeSpy extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
 
-        // When Balustrade Spy enters the battlefield, target player reveals cards from the top of his or her library until he or she reveals a land card, then puts those cards into his or her graveyard.
+        // When Balustrade Spy enters the battlefield, target player reveals cards from the top of their library until he or she reveals a land card, then puts those cards into their graveyard.
         Ability ability = new EntersBattlefieldTriggeredAbility(new BalustradeSpyEffect(), false);
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
@@ -82,7 +82,7 @@ class BalustradeSpyEffect extends OneShotEffect {
 
     public BalustradeSpyEffect() {
         super(Outcome.Discard);
-        this.staticText = "target player reveals cards from the top of his or her library until he or she reveals a land card, then puts those cards into his or her graveyard";
+        this.staticText = "target player reveals cards from the top of their library until he or she reveals a land card, then puts those cards into their graveyard";
     }
 
     public BalustradeSpyEffect(final BalustradeSpyEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/b/Bamboozle.java b/Mage.Sets/src/mage/cards/b/Bamboozle.java
index dbdde7e1d6c..40580449a71 100644
--- a/Mage.Sets/src/mage/cards/b/Bamboozle.java
+++ b/Mage.Sets/src/mage/cards/b/Bamboozle.java
@@ -54,7 +54,7 @@ public class Bamboozle extends CardImpl {
     public Bamboozle(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{U}");
 
-        // Target player reveals the top four cards of his or her library. You choose two of those cards and put them into his or her graveyard. Put the rest on top of his or her library in any order.
+        // Target player reveals the top four cards of their library. You choose two of those cards and put them into their graveyard. Put the rest on top of their library in any order.
         this.getSpellAbility().addEffect(new BamboozleEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
 
@@ -74,7 +74,7 @@ class BamboozleEffect extends OneShotEffect {
 
     BamboozleEffect() {
         super(Outcome.Discard);
-        staticText = "Target player reveals the top four cards of his or her library. You choose two of those cards and put them into his or her graveyard. Put the rest on top of his or her library in any order";
+        staticText = "Target player reveals the top four cards of their library. You choose two of those cards and put them into their graveyard. Put the rest on top of their library in any order";
     }
 
     BamboozleEffect(final BamboozleEffect effect) {
@@ -94,7 +94,7 @@ class BamboozleEffect extends OneShotEffect {
                 putOnTopLibrary.add(card);
             }
             targetPlayer.revealCards("Bamboozle Reveal", putOnTopLibrary, game);
-            TargetCard target = new TargetCard(2, Zone.LIBRARY, new FilterCard("2 cards out of this stack to put into his or her graveyard"));
+            TargetCard target = new TargetCard(2, Zone.LIBRARY, new FilterCard("2 cards out of this stack to put into their graveyard"));
             if (controller.choose(Outcome.Discard, putOnTopLibrary, target, game)) {
                 for (UUID cardId : target.getTargets()) {
                     putInGraveyard.add(game.getCard(cardId));
diff --git a/Mage.Sets/src/mage/cards/b/BarbedShocker.java b/Mage.Sets/src/mage/cards/b/BarbedShocker.java
index 3da83b69c51..ac9094ac6e3 100644
--- a/Mage.Sets/src/mage/cards/b/BarbedShocker.java
+++ b/Mage.Sets/src/mage/cards/b/BarbedShocker.java
@@ -59,7 +59,7 @@ public class BarbedShocker extends CardImpl {
         this.addAbility(TrampleAbility.getInstance());
         // Haste
         this.addAbility(HasteAbility.getInstance());
-        // Whenever Barbed Shocker deals damage to a player, that player discards all the cards in his or her hand, then draws that many cards.
+        // Whenever Barbed Shocker deals damage to a player, that player discards all the cards in their hand, then draws that many cards.
         this.addAbility(new DealsDamageToAPlayerTriggeredAbility(new BarbedShockerEffect(), false, true));
     }
 
@@ -76,7 +76,7 @@ class BarbedShockerEffect extends OneShotEffect {
 
     public BarbedShockerEffect() {
         super(Outcome.Discard);
-        this.staticText = " that player discards all the cards in his or her hand, then draws that many cards";
+        this.staticText = " that player discards all the cards in their hand, then draws that many cards";
     }
 
     public BarbedShockerEffect(final BarbedShockerEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/b/BelltowerSphinx.java b/Mage.Sets/src/mage/cards/b/BelltowerSphinx.java
index d20327e6199..362bed3db15 100644
--- a/Mage.Sets/src/mage/cards/b/BelltowerSphinx.java
+++ b/Mage.Sets/src/mage/cards/b/BelltowerSphinx.java
@@ -57,7 +57,7 @@ public class BelltowerSphinx extends CardImpl {
         this.toughness = new MageInt(5);
 
         this.addAbility(FlyingAbility.getInstance());
-        // Whenever a source deals damage to Belltower Sphinx, that source's controller puts that many cards from the top of his or her library into his or her graveyard.
+        // Whenever a source deals damage to Belltower Sphinx, that source's controller puts that many cards from the top of their library into their graveyard.
         this.addAbility(new BelltowerSphinxEffect());
     }
 
@@ -109,6 +109,6 @@ class BelltowerSphinxEffect extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "Whenever a source deals damage to {this}, that source's controller puts that many cards from the top of his or her library into his or her graveyard.";
+        return "Whenever a source deals damage to {this}, that source's controller puts that many cards from the top of their library into their graveyard.";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/b/BitterOrdeal.java b/Mage.Sets/src/mage/cards/b/BitterOrdeal.java
index 4ec58216d76..b03a699cb86 100644
--- a/Mage.Sets/src/mage/cards/b/BitterOrdeal.java
+++ b/Mage.Sets/src/mage/cards/b/BitterOrdeal.java
@@ -52,7 +52,7 @@ public class BitterOrdeal extends CardImpl {
     public BitterOrdeal(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}");
 
-        // Search target player's library for a card and exile it. Then that player shuffles his or her library.
+        // Search target player's library for a card and exile it. Then that player shuffles their library.
         this.getSpellAbility().addEffect(new BitterOrdealEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
         
@@ -74,7 +74,7 @@ class BitterOrdealEffect extends OneShotEffect {
 
     BitterOrdealEffect() {
         super(Outcome.Exile);
-        staticText = "Search target player's library for a card and exile it. Then that player shuffles his or her library.";
+        staticText = "Search target player's library for a card and exile it. Then that player shuffles their library.";
     }
 
     BitterOrdealEffect(final BitterOrdealEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/b/BlackVise.java b/Mage.Sets/src/mage/cards/b/BlackVise.java
index b7610204d97..52c49857318 100644
--- a/Mage.Sets/src/mage/cards/b/BlackVise.java
+++ b/Mage.Sets/src/mage/cards/b/BlackVise.java
@@ -54,7 +54,7 @@ public class BlackVise extends CardImpl {
 
         // As Black Vise enters the battlefield, choose an opponent.
         this.addAbility(new AsEntersBattlefieldAbility(new ChooseOpponentEffect(Outcome.Detriment)));
-        // At the beginning of the chosen player's upkeep, Black Vise deals X damage to that player, where X is the number of cards in his or her hand minus 4.
+        // At the beginning of the chosen player's upkeep, Black Vise deals X damage to that player, where X is the number of cards in their hand minus 4.
         this.addAbility(new BlackViseTriggeredAbility());
     }
 
@@ -103,7 +103,7 @@ class BlackViseEffect extends OneShotEffect {
 
     public BlackViseEffect() {
         super(Outcome.Detriment);
-        this.staticText = "{this} deals X damage to that player, where X is the number of cards in his or her hand minus 4";
+        this.staticText = "{this} deals X damage to that player, where X is the number of cards in their hand minus 4";
     }
 
     public BlackViseEffect(final BlackViseEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/b/Blackmail.java b/Mage.Sets/src/mage/cards/b/Blackmail.java
index ffe9f9b4573..42fd1ced0ae 100644
--- a/Mage.Sets/src/mage/cards/b/Blackmail.java
+++ b/Mage.Sets/src/mage/cards/b/Blackmail.java
@@ -45,7 +45,7 @@ public class Blackmail extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}");
 
 
-        // Target player reveals three cards from his or her hand and you choose one of them. That player discards that card.
+        // Target player reveals three cards from their hand and you choose one of them. That player discards that card.
         this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(TargetController.ANY, 3));
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
diff --git a/Mage.Sets/src/mage/cards/b/BlessedReincarnation.java b/Mage.Sets/src/mage/cards/b/BlessedReincarnation.java
index 6230421a84f..b7bea59d2ad 100644
--- a/Mage.Sets/src/mage/cards/b/BlessedReincarnation.java
+++ b/Mage.Sets/src/mage/cards/b/BlessedReincarnation.java
@@ -65,8 +65,8 @@ public class BlessedReincarnation extends CardImpl {
         this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
         this.getSpellAbility().addEffect(new ExileTargetEffect());
         
-        // That player reveals cards from the top of his or her library until a creature card is revealed. 
-        // The player puts that card onto the battlefield, then shuffles the rest into his or her library.
+        // That player reveals cards from the top of their library until a creature card is revealed.
+        // The player puts that card onto the battlefield, then shuffles the rest into their library.
         this.getSpellAbility().addEffect(new BlessedReincarnationEffect());
         
         // Rebound
@@ -87,7 +87,7 @@ class BlessedReincarnationEffect extends OneShotEffect {
 
     public BlessedReincarnationEffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "That player reveals cards from the top of his or her library until a creature card is revealed. The player puts that card onto the battlefield, then shuffles the rest into his or her library";
+        this.staticText = "That player reveals cards from the top of their library until a creature card is revealed. The player puts that card onto the battlefield, then shuffles the rest into their library";
     }
 
     public BlessedReincarnationEffect(final BlessedReincarnationEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/b/BlindingAngel.java b/Mage.Sets/src/mage/cards/b/BlindingAngel.java
index 904806da5f6..a8c7fc8a4b8 100644
--- a/Mage.Sets/src/mage/cards/b/BlindingAngel.java
+++ b/Mage.Sets/src/mage/cards/b/BlindingAngel.java
@@ -52,7 +52,7 @@ public class BlindingAngel extends CardImpl {
 
         // Flying
         this.addAbility(FlyingAbility.getInstance());
-        // Whenever Blinding Angel deals combat damage to a player, that player skips his or her next combat phase.
+        // Whenever Blinding Angel deals combat damage to a player, that player skips their next combat phase.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new SkipNextCombatEffect(), false, true));
     }
 
diff --git a/Mage.Sets/src/mage/cards/b/BlinkmothUrn.java b/Mage.Sets/src/mage/cards/b/BlinkmothUrn.java
index 8113d514b21..607832d265e 100644
--- a/Mage.Sets/src/mage/cards/b/BlinkmothUrn.java
+++ b/Mage.Sets/src/mage/cards/b/BlinkmothUrn.java
@@ -31,7 +31,7 @@ public class BlinkmothUrn extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}");
 
         // At the beginning of each player's precombat main phase, if
-        // Blinkmoth Urn is untapped, that player adds {1} to his or her
+        // Blinkmoth Urn is untapped, that player adds {1} to their
         // mana pool for each artifact he or she controls.
         this.addAbility(new BeginningOfPreCombatMainTriggeredAbility(new BlinkmothUrnEffect(), TargetController.ANY, false));
     }
@@ -51,7 +51,7 @@ class BlinkmothUrnEffect extends OneShotEffect {
 
     public BlinkmothUrnEffect() {
         super(Outcome.PutManaInPool);
-        this.staticText = "if Blinkmoth Urn is untapped, that player adds {1} to his or her mana pool for each artifact he or she controls";
+        this.staticText = "if Blinkmoth Urn is untapped, that player adds {1} to their mana pool for each artifact he or she controls";
     }
 
     public BlinkmothUrnEffect(final BlinkmothUrnEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/b/BlitzHellion.java b/Mage.Sets/src/mage/cards/b/BlitzHellion.java
index 29a7805f63c..3a2e5d10e8c 100644
--- a/Mage.Sets/src/mage/cards/b/BlitzHellion.java
+++ b/Mage.Sets/src/mage/cards/b/BlitzHellion.java
@@ -59,9 +59,9 @@ public class BlitzHellion extends CardImpl {
         // Haste
         this.addAbility(HasteAbility.getInstance());
 
-        // At the beginning of the end step, Blitz Hellion's owner shuffles it into his or her library.
+        // At the beginning of the end step, Blitz Hellion's owner shuffles it into their library.
         Effect effect = new ShuffleIntoLibrarySourceEffect();
-        effect.setText("{this}'s owner shuffles it into his or her library.");
+        effect.setText("{this}'s owner shuffles it into their library.");
         this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.ANY, null, false));
     }
 
diff --git a/Mage.Sets/src/mage/cards/b/BloodOath.java b/Mage.Sets/src/mage/cards/b/BloodOath.java
index d1d56b9b54a..f2066e7a367 100644
--- a/Mage.Sets/src/mage/cards/b/BloodOath.java
+++ b/Mage.Sets/src/mage/cards/b/BloodOath.java
@@ -54,7 +54,7 @@ public class BloodOath extends CardImpl {
     public BloodOath(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{R}");
 
-        // Choose a card type. Target opponent reveals his or her hand. Blood Oath deals 3 damage to that player for each card of the chosen type revealed this way.
+        // Choose a card type. Target opponent reveals their hand. Blood Oath deals 3 damage to that player for each card of the chosen type revealed this way.
         this.getSpellAbility().addEffect(new BloodOathEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
     }
@@ -86,7 +86,7 @@ class BloodOathEffect extends OneShotEffect {
 
     public BloodOathEffect() {
         super(Outcome.Benefit);
-        staticText = "Choose a card type. Target opponent reveals his or her hand. {this} deals 3 damage to that player for each card of the chosen type revealed this way";
+        staticText = "Choose a card type. Target opponent reveals their hand. {this} deals 3 damage to that player for each card of the chosen type revealed this way";
     }
 
     public BloodOathEffect(final BloodOathEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/b/BloodTribute.java b/Mage.Sets/src/mage/cards/b/BloodTribute.java
index 19cd00f57e4..9b2f90d80c4 100644
--- a/Mage.Sets/src/mage/cards/b/BloodTribute.java
+++ b/Mage.Sets/src/mage/cards/b/BloodTribute.java
@@ -66,7 +66,7 @@ public class BloodTribute extends CardImpl {
         filter.add(Predicates.not(new TappedPredicate()));
         this.addAbility(new KickerAbility(new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))));
 
-        // Target opponent loses half his or her life, rounded up.
+        // Target opponent loses half their life, rounded up.
         this.getSpellAbility().addTarget(new TargetOpponent());
         this.getSpellAbility().addEffect(new BloodTributeLoseLifeEffect());
 
@@ -92,7 +92,7 @@ class BloodTributeLoseLifeEffect extends OneShotEffect {
 
     public BloodTributeLoseLifeEffect() {
         super(Outcome.Damage);
-        this.staticText = "Target opponent loses half his or her life, rounded up";
+        this.staticText = "Target opponent loses half their life, rounded up";
     }
 
     public BloodTributeLoseLifeEffect(final BloodTributeLoseLifeEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/b/BloodbondMarch.java b/Mage.Sets/src/mage/cards/b/BloodbondMarch.java
index de0ab798e89..f8c9e71107a 100644
--- a/Mage.Sets/src/mage/cards/b/BloodbondMarch.java
+++ b/Mage.Sets/src/mage/cards/b/BloodbondMarch.java
@@ -53,7 +53,7 @@ public class BloodbondMarch extends CardImpl {
 
     public BloodbondMarch(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{G}");
-        // Whenever a player casts a creature spell, each player returns all cards with the same name as that spell from his or her graveyard to the battlefield.
+        // Whenever a player casts a creature spell, each player returns all cards with the same name as that spell from their graveyard to the battlefield.
         this.addAbility(new SpellCastAllTriggeredAbility(new BloodbondMarchEffect(), new FilterCreatureSpell(), false, SetTargetPointer.SPELL));
     }
 
@@ -70,7 +70,7 @@ public class BloodbondMarch extends CardImpl {
 
         public BloodbondMarchEffect() {
             super(Outcome.Benefit);
-            staticText = "each player returns all cards with the same name as that spell from his or her graveyard to the battlefield";
+            staticText = "each player returns all cards with the same name as that spell from their graveyard to the battlefield";
         }
 
         public BloodbondMarchEffect(BloodbondMarchEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/b/BoggartForager.java b/Mage.Sets/src/mage/cards/b/BoggartForager.java
index 8c546d8fe3d..388b0c9a655 100644
--- a/Mage.Sets/src/mage/cards/b/BoggartForager.java
+++ b/Mage.Sets/src/mage/cards/b/BoggartForager.java
@@ -53,7 +53,7 @@ public class BoggartForager extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        // {R}, Sacrifice Boggart Forager: Target player shuffles his or her library.
+        // {R}, Sacrifice Boggart Forager: Target player shuffles their library.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShuffleLibraryTargetEffect(), new ManaCostsImpl("{R}"));
 	ability.addCost(new SacrificeSourceCost());
 	ability.addTarget(new TargetPlayer());
diff --git a/Mage.Sets/src/mage/cards/b/BoldwyrHeavyweights.java b/Mage.Sets/src/mage/cards/b/BoldwyrHeavyweights.java
index 1d1246de2f6..23c412bd99c 100644
--- a/Mage.Sets/src/mage/cards/b/BoldwyrHeavyweights.java
+++ b/Mage.Sets/src/mage/cards/b/BoldwyrHeavyweights.java
@@ -62,7 +62,7 @@ public class BoldwyrHeavyweights extends CardImpl {
         // Trample
         this.addAbility(TrampleAbility.getInstance());
 
-        // When Boldwyr Heavyweights enters the battlefield, each opponent may search his or her library for a creature card and put it onto the battlefield. Then each player who searched his or her library this way shuffles it.
+        // When Boldwyr Heavyweights enters the battlefield, each opponent may search their library for a creature card and put it onto the battlefield. Then each player who searched their library this way shuffles it.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new BoldwyrHeavyweightsEffect()));
     }
 
@@ -80,7 +80,7 @@ class BoldwyrHeavyweightsEffect extends OneShotEffect {
 
     BoldwyrHeavyweightsEffect() {
         super(Outcome.Detriment);
-        this.staticText = "each opponent may search his or her library for a creature card and put it onto the battlefield. Then each player who searched his or her library this way shuffles it";
+        this.staticText = "each opponent may search their library for a creature card and put it onto the battlefield. Then each player who searched their library this way shuffles it";
     }
 
     BoldwyrHeavyweightsEffect(final BoldwyrHeavyweightsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/b/BookBurning.java b/Mage.Sets/src/mage/cards/b/BookBurning.java
index 21182c8a428..1afbe407e05 100644
--- a/Mage.Sets/src/mage/cards/b/BookBurning.java
+++ b/Mage.Sets/src/mage/cards/b/BookBurning.java
@@ -49,7 +49,7 @@ public class BookBurning extends CardImpl {
     public BookBurning(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{R}");
 
-        // Any player may have Book Burning deal 6 damage to him or her. If no one does, target player puts the top six cards of his or her library into his or her graveyard.
+        // Any player may have Book Burning deal 6 damage to him or her. If no one does, target player puts the top six cards of their library into their graveyard.
         this.getSpellAbility().addEffect(new BookBurningMillEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
@@ -68,7 +68,7 @@ class BookBurningMillEffect extends OneShotEffect {
 
     public BookBurningMillEffect() {
         super(Outcome.Detriment);
-        staticText = "Any player may have {source} deal 6 damage to him or her. If no one does, target player puts the top six cards of his or her library into his or her graveyard";
+        staticText = "Any player may have {source} deal 6 damage to him or her. If no one does, target player puts the top six cards of their library into their graveyard";
     }
 
     public BookBurningMillEffect(final BookBurningMillEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/b/BorderlandExplorer.java b/Mage.Sets/src/mage/cards/b/BorderlandExplorer.java
index 56596b020b8..97f800e510c 100644
--- a/Mage.Sets/src/mage/cards/b/BorderlandExplorer.java
+++ b/Mage.Sets/src/mage/cards/b/BorderlandExplorer.java
@@ -61,8 +61,8 @@ public class BorderlandExplorer extends CardImpl {
         this.power = new MageInt(3);
         this.toughness = new MageInt(1);
 
-        // When Borderland Explorer enters the battlefield, each player may discard a card. Each player who discarded a card this way may search his or her library
-        // for a basic land card, reveal it, put it into his or her hand, then shuffle his or her library.
+        // When Borderland Explorer enters the battlefield, each player may discard a card. Each player who discarded a card this way may search their library
+        // for a basic land card, reveal it, put it into their hand, then shuffle their library.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new BorderlandExplorerEffect()));
     }
 
@@ -80,8 +80,8 @@ class BorderlandExplorerEffect extends OneShotEffect {
 
     public BorderlandExplorerEffect() {
         super(Outcome.Neutral);
-        this.staticText = "each player may discard a card. Each player who discarded a card this way may search his or her library "
-                + "for a basic land card, reveal it, put it into his or her hand, then shuffle his or her library";
+        this.staticText = "each player may discard a card. Each player who discarded a card this way may search their library "
+                + "for a basic land card, reveal it, put it into their hand, then shuffle their library";
     }
 
     public BorderlandExplorerEffect(final BorderlandExplorerEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/b/BottledCloister.java b/Mage.Sets/src/mage/cards/b/BottledCloister.java
index 7b133224297..ccf50c297e6 100644
--- a/Mage.Sets/src/mage/cards/b/BottledCloister.java
+++ b/Mage.Sets/src/mage/cards/b/BottledCloister.java
@@ -103,7 +103,7 @@ class BottledCloisterExileEffect extends OneShotEffect {
                     card.moveToExile(exileId, sourcePermanent.getName(), source.getSourceId(), game);
                     card.setFaceDown(true, game);
                 }
-                game.informPlayers(sourcePermanent.getName() + ": " + controller.getLogName() + " exiles his or her hand face down (" + numberOfCards + "card" + (numberOfCards > 1 ?"s":"") + ')');
+                game.informPlayers(sourcePermanent.getName() + ": " + controller.getLogName() + " exiles their hand face down (" + numberOfCards + "card" + (numberOfCards > 1 ?"s":"") + ')');
             }
             return true;
         }
diff --git a/Mage.Sets/src/mage/cards/b/BraidsConjurerAdept.java b/Mage.Sets/src/mage/cards/b/BraidsConjurerAdept.java
index 0f1050c8752..ef3276fb418 100644
--- a/Mage.Sets/src/mage/cards/b/BraidsConjurerAdept.java
+++ b/Mage.Sets/src/mage/cards/b/BraidsConjurerAdept.java
@@ -63,7 +63,7 @@ public class BraidsConjurerAdept extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        // At the beginning of each player's upkeep, that player may put an artifact, creature, or land card from his or her hand onto the battlefield.
+        // At the beginning of each player's upkeep, that player may put an artifact, creature, or land card from their hand onto the battlefield.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new PutPermanentOnBattlefieldEffect(filter, true), TargetController.ANY, false));
     }
 
diff --git a/Mage.Sets/src/mage/cards/b/BrainFreeze.java b/Mage.Sets/src/mage/cards/b/BrainFreeze.java
index 8278699d126..372c5c4a827 100644
--- a/Mage.Sets/src/mage/cards/b/BrainFreeze.java
+++ b/Mage.Sets/src/mage/cards/b/BrainFreeze.java
@@ -45,7 +45,7 @@ public class BrainFreeze extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{U}");
 
 
-        // Target player puts the top three cards of his or her library into his or her graveyard.
+        // Target player puts the top three cards of their library into their graveyard.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(3));
         // Storm
diff --git a/Mage.Sets/src/mage/cards/b/BrainMaggot.java b/Mage.Sets/src/mage/cards/b/BrainMaggot.java
index 6e1d217a65b..78b0e6c8851 100644
--- a/Mage.Sets/src/mage/cards/b/BrainMaggot.java
+++ b/Mage.Sets/src/mage/cards/b/BrainMaggot.java
@@ -64,7 +64,7 @@ public class BrainMaggot extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        // When Brain Maggot enters the battlefield, target opponent reveals his or her hand and you choose a nonland card from it. Exile that card until Brain Maggot leaves the battlefield.
+        // When Brain Maggot enters the battlefield, target opponent reveals their hand and you choose a nonland card from it. Exile that card until Brain Maggot leaves the battlefield.
         Ability ability = new EntersBattlefieldTriggeredAbility(new BrainMaggotExileEffect());
         ability.addTarget(new TargetOpponent());
         ability.addEffect(new CreateDelayedTriggeredAbilityEffect(new BrainMaggotReturnExiledCardAbility()));
@@ -85,7 +85,7 @@ class BrainMaggotExileEffect extends OneShotEffect {
 
     public BrainMaggotExileEffect() {
         super(Outcome.Benefit);
-        this.staticText = "target opponent reveals his or her hand and you choose a nonland card from it. Exile that card until {this} leaves the battlefield";
+        this.staticText = "target opponent reveals their hand and you choose a nonland card from it. Exile that card until {this} leaves the battlefield";
     }
 
     public BrainMaggotExileEffect(final BrainMaggotExileEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/b/BrainPry.java b/Mage.Sets/src/mage/cards/b/BrainPry.java
index fe92f3c9a99..7ca2ab73b26 100644
--- a/Mage.Sets/src/mage/cards/b/BrainPry.java
+++ b/Mage.Sets/src/mage/cards/b/BrainPry.java
@@ -50,7 +50,7 @@ public class BrainPry extends CardImpl {
     public BrainPry(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{B}");
 
-        //Name a nonland card. Target player reveals his or her hand. That player discards a card with that name. If he or she can't, you draw a card.
+        //Name a nonland card. Target player reveals their hand. That player discards a card with that name. If he or she can't, you draw a card.
         this.getSpellAbility().addEffect((new NameACardEffect(NameACardEffect.TypeOfName.NON_LAND_NAME)));
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new BrainPryEffect());
@@ -70,7 +70,7 @@ class BrainPryEffect extends OneShotEffect {
 
     public BrainPryEffect() {
         super(Outcome.Discard);
-        staticText = "Target player reveals his or her hand. That player discards a card with that name. If he or she can't, you draw a card";
+        staticText = "Target player reveals their hand. That player discards a card with that name. If he or she can't, you draw a card";
     }
 
     public BrainPryEffect(final BrainPryEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/b/Brainbite.java b/Mage.Sets/src/mage/cards/b/Brainbite.java
index a2ce6a2afda..f34c2d5325a 100644
--- a/Mage.Sets/src/mage/cards/b/Brainbite.java
+++ b/Mage.Sets/src/mage/cards/b/Brainbite.java
@@ -44,7 +44,7 @@ public class Brainbite extends CardImpl {
     public Brainbite(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{U}{B}");
 
-        // Target opponent reveals his or her hand. You choose a card from it. That player discards that card.
+        // Target opponent reveals their hand. You choose a card from it. That player discards that card.
         this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect());
         // Draw a card.
         this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));
diff --git a/Mage.Sets/src/mage/cards/b/BreakingEntering.java b/Mage.Sets/src/mage/cards/b/BreakingEntering.java
index 3f2cb0e954e..9779e83afc7 100644
--- a/Mage.Sets/src/mage/cards/b/BreakingEntering.java
+++ b/Mage.Sets/src/mage/cards/b/BreakingEntering.java
@@ -56,7 +56,7 @@ public class BreakingEntering extends SplitCard {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{U}{B}", "{4}{B}{R}", SpellAbilityType.SPLIT_FUSED);
 
         // Breaking
-        // Target player puts the top eight cards of his or her library into his or her graveyard.
+        // Target player puts the top eight cards of their library into their graveyard.
         getLeftHalfCard().getSpellAbility().addEffect(new PutTopCardOfLibraryIntoGraveTargetEffect(8));
         getLeftHalfCard().getSpellAbility().addTarget(new TargetPlayer());
 
diff --git a/Mage.Sets/src/mage/cards/b/Bribery.java b/Mage.Sets/src/mage/cards/b/Bribery.java
index 84b85e511dd..23265d2619b 100644
--- a/Mage.Sets/src/mage/cards/b/Bribery.java
+++ b/Mage.Sets/src/mage/cards/b/Bribery.java
@@ -51,7 +51,7 @@ public class Bribery extends CardImpl {
     public Bribery(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{U}{U}");
 
-        // Search target opponent's library for a creature card and put that card onto the battlefield under your control. Then that player shuffles his or her library.
+        // Search target opponent's library for a creature card and put that card onto the battlefield under your control. Then that player shuffles their library.
         this.getSpellAbility().addEffect(new BriberyEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
     }
@@ -70,7 +70,7 @@ class BriberyEffect extends OneShotEffect {
 
     public BriberyEffect() {
         super(Outcome.PutCardInPlay);
-        this.staticText = "Search target opponent's library for a creature card and put that card onto the battlefield under your control. Then that player shuffles his or her library";
+        this.staticText = "Search target opponent's library for a creature card and put that card onto the battlefield under your control. Then that player shuffles their library";
     }
 
     public BriberyEffect(final BriberyEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/b/BrineElemental.java b/Mage.Sets/src/mage/cards/b/BrineElemental.java
index 4a73167883d..a6cb3786b48 100644
--- a/Mage.Sets/src/mage/cards/b/BrineElemental.java
+++ b/Mage.Sets/src/mage/cards/b/BrineElemental.java
@@ -60,7 +60,7 @@ public class BrineElemental extends CardImpl {
         // Morph {5}{U}{U}
         this.addAbility(new MorphAbility(this, new ManaCostsImpl("{5}{U}{U}")));
 
-        // When Brine Elemental is turned face up, each opponent skips his or her next untap step.
+        // When Brine Elemental is turned face up, each opponent skips their next untap step.
         this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new BrineElementalEffect()));
     }
 
@@ -78,7 +78,7 @@ class BrineElementalEffect extends OneShotEffect {
 
     public BrineElementalEffect() {
         super(Outcome.Benefit);
-        this.staticText = "each opponent skips his or her next untap step";
+        this.staticText = "each opponent skips their next untap step";
     }
 
     public BrineElementalEffect(final BrineElementalEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/b/BrinkOfMadness.java b/Mage.Sets/src/mage/cards/b/BrinkOfMadness.java
index 256e2a87b55..45fbaee9be0 100644
--- a/Mage.Sets/src/mage/cards/b/BrinkOfMadness.java
+++ b/Mage.Sets/src/mage/cards/b/BrinkOfMadness.java
@@ -58,12 +58,12 @@ public class BrinkOfMadness extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}{B}");
 
 
-        // At the beginning of your upkeep, if you have no cards in hand, sacrifice Brink of Madness and target opponent discards his or her hand.
+        // At the beginning of your upkeep, if you have no cards in hand, sacrifice Brink of Madness and target opponent discards their hand.
         TriggeredAbility ability  = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceEffect(), TargetController.YOU, false);
         ability.addEffect(new BrinkOfMadnessEffect());
         ability.addTarget(new TargetOpponent());
         CardsInHandCondition contition = new CardsInHandCondition(ComparisonType.EQUAL_TO, 0);
-        this.addAbility(new ConditionalTriggeredAbility(ability, contition, "At the beginning of your upkeep, if you have no cards in hand, sacrifice {this} and target opponent discards his or her hand."));
+        this.addAbility(new ConditionalTriggeredAbility(ability, contition, "At the beginning of your upkeep, if you have no cards in hand, sacrifice {this} and target opponent discards their hand."));
         
     }
 
@@ -80,7 +80,7 @@ public class BrinkOfMadness extends CardImpl {
 
     public BrinkOfMadnessEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Target player discards his or her hand";
+        this.staticText = "Target player discards their hand";
     }
 
     public BrinkOfMadnessEffect(final BrinkOfMadnessEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/b/BrokenAmbitions.java b/Mage.Sets/src/mage/cards/b/BrokenAmbitions.java
index 14b610dedc4..92b2fe2fd3d 100644
--- a/Mage.Sets/src/mage/cards/b/BrokenAmbitions.java
+++ b/Mage.Sets/src/mage/cards/b/BrokenAmbitions.java
@@ -55,7 +55,7 @@ public class BrokenAmbitions extends CardImpl {
     public BrokenAmbitions(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{X}{U}");
 
-        // Counter target spell unless its controller pays {X}. Clash with an opponent. If you win, that spell's controller puts the top four cards of his or her library into his or her graveyard.
+        // Counter target spell unless its controller pays {X}. Clash with an opponent. If you win, that spell's controller puts the top four cards of their library into their graveyard.
         this.getSpellAbility().addEffect(new BrokenAmbitionsEffect(new ManacostVariableValue()));
         this.getSpellAbility().addTarget(new TargetSpell());
     }
@@ -78,7 +78,7 @@ class BrokenAmbitionsEffect extends OneShotEffect {
     public BrokenAmbitionsEffect(Cost cost) {
         super(Outcome.Benefit);
         this.cost = cost;
-        this.staticText = "Counter target spell unless its controller pays {X}. Clash with an opponent. If you win, that spell's controller puts the top four cards of his or her library into his or her graveyard";
+        this.staticText = "Counter target spell unless its controller pays {X}. Clash with an opponent. If you win, that spell's controller puts the top four cards of their library into their graveyard";
     }
     
     public BrokenAmbitionsEffect(DynamicValue genericMana) {
diff --git a/Mage.Sets/src/mage/cards/b/BubblingMuck.java b/Mage.Sets/src/mage/cards/b/BubblingMuck.java
index aef2b6bfb16..3e51347338b 100644
--- a/Mage.Sets/src/mage/cards/b/BubblingMuck.java
+++ b/Mage.Sets/src/mage/cards/b/BubblingMuck.java
@@ -56,7 +56,7 @@ public class BubblingMuck extends CardImpl {
     public BubblingMuck(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}");
 
-        // Until end of turn, whenever a player taps a Swamp for mana, that player adds {B} to his or her mana pool.
+        // Until end of turn, whenever a player taps a Swamp for mana, that player adds {B} to their mana pool.
         this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new BubblingMuckTriggeredAbility()));
     }
 
@@ -79,7 +79,7 @@ class BubblingMuckTriggeredAbility extends DelayedTriggeredManaAbility {
     }
 
     public BubblingMuckTriggeredAbility() {
-        super(new AddManaToManaPoolTargetControllerEffect(new Mana(ColoredManaSymbol.B), "his or her"), Duration.EndOfTurn, false);
+        super(new AddManaToManaPoolTargetControllerEffect(new Mana(ColoredManaSymbol.B), "their"), Duration.EndOfTurn, false);
         this.usesStack = false;
     }
 
@@ -111,6 +111,6 @@ class BubblingMuckTriggeredAbility extends DelayedTriggeredManaAbility {
 
     @Override
     public String getRule() {
-        return "Until end of turn, whenever a player taps a Swamp for mana, that player adds {B} to his or her mana pool";
+        return "Until end of turn, whenever a player taps a Swamp for mana, that player adds {B} to their mana pool";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/c/CabalInterrogator.java b/Mage.Sets/src/mage/cards/c/CabalInterrogator.java
index e044a7e7099..60c05a4d263 100644
--- a/Mage.Sets/src/mage/cards/c/CabalInterrogator.java
+++ b/Mage.Sets/src/mage/cards/c/CabalInterrogator.java
@@ -61,7 +61,7 @@ public class CabalInterrogator extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        // {X}{B}, {tap}: Target player reveals X cards from his or her hand and you choose one of them. That player discards that card.
+        // {X}{B}, {tap}: Target player reveals X cards from their hand and you choose one of them. That player discards that card.
         // Activate this ability only any time you could cast a sorcery.
         Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new CabalInterrogatorEffect(), new ManaCostsImpl("{X}{B}"));
         ability.addCost(new TapSourceCost());
@@ -83,7 +83,7 @@ class CabalInterrogatorEffect extends OneShotEffect {
 
     public CabalInterrogatorEffect() {
         super(Outcome.Discard);
-        this.staticText = "Target player reveals X cards from his or her hand and you choose one of them. That player discards that card";
+        this.staticText = "Target player reveals X cards from their hand and you choose one of them. That player discards that card";
     }
 
     public CabalInterrogatorEffect(final CabalInterrogatorEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/CabalTherapy.java b/Mage.Sets/src/mage/cards/c/CabalTherapy.java
index 52f43ffae5d..8e3e679afc3 100644
--- a/Mage.Sets/src/mage/cards/c/CabalTherapy.java
+++ b/Mage.Sets/src/mage/cards/c/CabalTherapy.java
@@ -54,7 +54,7 @@ public class CabalTherapy extends CardImpl {
     public CabalTherapy(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}");
 
-        // Name a nonland card. Target player reveals his or her hand and discards all cards with that name.
+        // Name a nonland card. Target player reveals their hand and discards all cards with that name.
         this.getSpellAbility().addEffect((new NameACardEffect(NameACardEffect.TypeOfName.NON_LAND_NAME)));
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new CabalTherapyEffect());
@@ -79,7 +79,7 @@ class CabalTherapyEffect extends OneShotEffect {
 
     public CabalTherapyEffect() {
         super(Outcome.Discard);
-        staticText = "Name a nonland card. Target player reveals his or her hand and discards all cards with that name";
+        staticText = "Name a nonland card. Target player reveals their hand and discards all cards with that name";
     }
 
     public CabalTherapyEffect(final CabalTherapyEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/Castigate.java b/Mage.Sets/src/mage/cards/c/Castigate.java
index ff5cf89547c..ede9dd764a5 100644
--- a/Mage.Sets/src/mage/cards/c/Castigate.java
+++ b/Mage.Sets/src/mage/cards/c/Castigate.java
@@ -44,7 +44,7 @@ public class Castigate extends CardImpl {
     public Castigate(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{W}{B}");
 
-        // Target opponent reveals his or her hand. You choose a nonland card from it and exile that card.
+        // Target opponent reveals their hand. You choose a nonland card from it and exile that card.
         this.getSpellAbility().addEffect(new ExileCardYouChooseTargetOpponentEffect(StaticFilters.FILTER_CARD_A_NON_LAND));
         this.getSpellAbility().addTarget(new TargetOpponent());
     }
diff --git a/Mage.Sets/src/mage/cards/c/CelestialConvergence.java b/Mage.Sets/src/mage/cards/c/CelestialConvergence.java
index d0bffc9604a..3efb58cbecd 100644
--- a/Mage.Sets/src/mage/cards/c/CelestialConvergence.java
+++ b/Mage.Sets/src/mage/cards/c/CelestialConvergence.java
@@ -104,12 +104,12 @@ class CelestialConvergenceEffect extends OneShotEffect {
 
             /**
              * 801.14. If an effect states that a player wins the game, all of
-             * that player’s opponents within his or her range of influence lose
+             * that player’s opponents within their range of influence lose
              * the game instead. #
              *
              * 801.15. If the effect of a spell or ability states that the game
              * is a draw, the game is a draw for that spell or ability’s
-             * controller and all players within his or her range of influence.
+             * controller and all players within their range of influence.
              * They leave the game. All remaining players continue to play the
              * game.
              *
diff --git a/Mage.Sets/src/mage/cards/c/CellarDoor.java b/Mage.Sets/src/mage/cards/c/CellarDoor.java
index cc7df9fe989..c1d8caa09ee 100644
--- a/Mage.Sets/src/mage/cards/c/CellarDoor.java
+++ b/Mage.Sets/src/mage/cards/c/CellarDoor.java
@@ -53,7 +53,7 @@ public class CellarDoor extends CardImpl {
     public CellarDoor(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}");
 
-        // {3}, {tap}: Target player puts the bottom card of his or her library into his or her graveyard. If it's a creature card, you create a 2/2 black Zombie creature token.
+        // {3}, {tap}: Target player puts the bottom card of their library into their graveyard. If it's a creature card, you create a 2/2 black Zombie creature token.
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CellarDoorEffect(), new GenericManaCost(3));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetPlayer());
@@ -74,7 +74,7 @@ class CellarDoorEffect extends OneShotEffect {
 
     public CellarDoorEffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "Target player puts the bottom card of his or her library into his or her graveyard. If it's a creature card, you create a 2/2 black Zombie creature token";
+        this.staticText = "Target player puts the bottom card of their library into their graveyard. If it's a creature card, you create a 2/2 black Zombie creature token";
     }
 
     public CellarDoorEffect(final CellarDoorEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/CerebralEruption.java b/Mage.Sets/src/mage/cards/c/CerebralEruption.java
index 197110de605..bfdd1720ef6 100644
--- a/Mage.Sets/src/mage/cards/c/CerebralEruption.java
+++ b/Mage.Sets/src/mage/cards/c/CerebralEruption.java
@@ -50,7 +50,7 @@ public class CerebralEruption extends CardImpl {
     public CerebralEruption(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{R}{R}");
 
-        // Target opponent reveals the top card of his or her 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.
+        // 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.
         this.getSpellAbility().addTarget(new TargetOpponent());
         this.getSpellAbility().addEffect(new CerebralEruptionEffect());
     }
@@ -70,7 +70,7 @@ class CerebralEruptionEffect extends OneShotEffect {
 
     CerebralEruptionEffect() {
         super(Outcome.Damage);
-        staticText = "Target opponent reveals the top card of his or her library. {this} 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 {this} to its owner's hand";
+        staticText = "Target opponent reveals the top card of their library. {this} 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 {this} to its owner's hand";
     }
 
     CerebralEruptionEffect(final CerebralEruptionEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/CeruleanSphinx.java b/Mage.Sets/src/mage/cards/c/CeruleanSphinx.java
index d8a82ef4d42..9ee729eb0b6 100644
--- a/Mage.Sets/src/mage/cards/c/CeruleanSphinx.java
+++ b/Mage.Sets/src/mage/cards/c/CeruleanSphinx.java
@@ -55,9 +55,9 @@ public class CeruleanSphinx extends CardImpl {
 
         // Flying
         this.addAbility(FlyingAbility.getInstance());
-        // {U}: Cerulean Sphinx's owner shuffles it into his or her library.
+        // {U}: Cerulean Sphinx's owner shuffles it into their library.
         Effect effect = new ShuffleIntoLibrarySourceEffect();
-        effect.setText("{this}'s owner shuffles it into his or her library.");
+        effect.setText("{this}'s owner shuffles it into their library.");
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{U}")));
     }
 
diff --git a/Mage.Sets/src/mage/cards/c/ChainsOfMephistopheles.java b/Mage.Sets/src/mage/cards/c/ChainsOfMephistopheles.java
index 1eb322a7553..f4366fe6ebd 100644
--- a/Mage.Sets/src/mage/cards/c/ChainsOfMephistopheles.java
+++ b/Mage.Sets/src/mage/cards/c/ChainsOfMephistopheles.java
@@ -51,7 +51,7 @@ public class ChainsOfMephistopheles extends CardImpl {
     public ChainsOfMephistopheles(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{B}");
 
-        // If a player would draw a card except the first one he or she draws in his or her draw step each turn, that player discards a card instead. If the player discards a card this way, he or she draws a card. If the player doesn't discard a card this way, he or she puts the top card of his or her library into his or her graveyard.
+        // If a player would draw a card except the first one he or she draws in their draw step each turn, that player discards a card instead. If the player discards a card this way, he or she draws a card. If the player doesn't discard a card this way, he or she puts the top card of their library into their graveyard.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ChainsOfMephistophelesReplacementEffect()), new CardsDrawnDuringDrawStepWatcher());
     }
 
@@ -69,7 +69,7 @@ class ChainsOfMephistophelesReplacementEffect extends ReplacementEffectImpl {
 
     public ChainsOfMephistophelesReplacementEffect() {
         super(Duration.WhileOnBattlefield, Outcome.Benefit);
-        staticText = "If a player would draw a card except the first one he or she draws in his or her draw step each turn, that player discards a card instead. If the player discards a card this way, he or she draws a card. If the player doesn't discard a card this way, he or she puts the top card of his or her library into his or her graveyard";
+        staticText = "If a player would draw a card except the first one he or she draws in their draw step each turn, that player discards a card instead. If the player discards a card this way, he or she draws a card. If the player doesn't discard a card this way, he or she puts the top card of their library into their graveyard";
     }
 
     public ChainsOfMephistophelesReplacementEffect(final ChainsOfMephistophelesReplacementEffect effect) {
@@ -91,7 +91,7 @@ class ChainsOfMephistophelesReplacementEffect extends ReplacementEffectImpl {
         Player player = game.getPlayer(event.getPlayerId());
         if (player != null) {
             if (player.getHand().isEmpty()) {
-                // he or she puts the top card of his or her library into his or her graveyard
+                // he or she puts the top card of their library into their graveyard
                 Effect effect = new PutTopCardOfLibraryIntoGraveTargetEffect(1);
                 effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
                 effect.apply(game, source);
diff --git a/Mage.Sets/src/mage/cards/c/ChancellorOfTheAnnex.java b/Mage.Sets/src/mage/cards/c/ChancellorOfTheAnnex.java
index 94729d72762..2a883ba5f29 100644
--- a/Mage.Sets/src/mage/cards/c/ChancellorOfTheAnnex.java
+++ b/Mage.Sets/src/mage/cards/c/ChancellorOfTheAnnex.java
@@ -63,7 +63,7 @@ public class ChancellorOfTheAnnex extends CardImpl {
         this.power = new MageInt(5);
         this.toughness = new MageInt(6);
 
-        // You may reveal this card from your opening hand. If you do, when each opponent casts his or her first spell of the game, counter that spell unless that player pays {1}.
+        // You may reveal this card from your opening hand. If you do, when each opponent casts their first spell of the game, counter that spell unless that player pays {1}.
         this.addAbility(new ChancellorAbility(new ChancellorOfTheAnnexEffect()));
 
         this.addAbility(FlyingAbility.getInstance());
@@ -86,7 +86,7 @@ class ChancellorOfTheAnnexEffect extends OneShotEffect {
 
     public ChancellorOfTheAnnexEffect() {
         super(Outcome.Benefit);
-        staticText = "when each opponent casts his or her first spell of the game, counter that spell unless that player pays {1}";
+        staticText = "when each opponent casts their first spell of the game, counter that spell unless that player pays {1}";
     }
 
     public ChancellorOfTheAnnexEffect(ChancellorOfTheAnnexEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/ChancellorOfTheSpires.java b/Mage.Sets/src/mage/cards/c/ChancellorOfTheSpires.java
index ca168443d10..769aafb4900 100644
--- a/Mage.Sets/src/mage/cards/c/ChancellorOfTheSpires.java
+++ b/Mage.Sets/src/mage/cards/c/ChancellorOfTheSpires.java
@@ -57,7 +57,7 @@ import mage.target.common.TargetCardInOpponentsGraveyard;
  */
 public class ChancellorOfTheSpires extends CardImpl {
 
-    private static final String abilityText = "at the beginning of the first upkeep, each opponent puts the top seven cards of his or her library into his or her graveyard";
+    private static final String abilityText = "at the beginning of the first upkeep, each opponent puts the top seven cards of their library into their graveyard";
 
     private static final FilterCard filter = new FilterCard("instant or sorcery card from an opponent's graveyard");
 
@@ -74,7 +74,7 @@ public class ChancellorOfTheSpires extends CardImpl {
         this.power = new MageInt(5);
         this.toughness = new MageInt(7);
 
-        // You may reveal this card from your opening hand. If you do, at the beginning of the first upkeep, each opponent puts the top seven cards of his or her library into his or her graveyard.
+        // You may reveal this card from your opening hand. If you do, at the beginning of the first upkeep, each opponent puts the top seven cards of their library into their graveyard.
         this.addAbility(new ChancellorAbility(new ChancellorOfTheSpiresDelayedTriggeredAbility(), abilityText));
 
         this.addAbility(FlyingAbility.getInstance());
@@ -124,7 +124,7 @@ class ChancellorOfTheSpiresEffect extends OneShotEffect {
 
     ChancellorOfTheSpiresEffect () {
         super(Outcome.Benefit);
-        staticText = "each opponent puts the top seven cards of his or her library into his or her graveyard";
+        staticText = "each opponent puts the top seven cards of their library into their graveyard";
     }
 
     ChancellorOfTheSpiresEffect(ChancellorOfTheSpiresEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/ChandraAblaze.java b/Mage.Sets/src/mage/cards/c/ChandraAblaze.java
index 48aa36b99ce..5eb51cacf8c 100644
--- a/Mage.Sets/src/mage/cards/c/ChandraAblaze.java
+++ b/Mage.Sets/src/mage/cards/c/ChandraAblaze.java
@@ -73,7 +73,7 @@ public class ChandraAblaze extends CardImpl {
         ability.addEffect(new ChandraAblazeEffect2());
         ability.addTarget(new TargetCreatureOrPlayer());
         this.addAbility(ability);
-        // -2: Each player discards his or her hand, then draws three cards.
+        // -2: Each player discards their hand, then draws three cards.
         ability = new LoyaltyAbility(new DiscardHandAllEffect(), -2);
         Effect effect = new DrawCardAllEffect(3);
         effect.setText(", then draws three cards");
diff --git a/Mage.Sets/src/mage/cards/c/ChaosMoon.java b/Mage.Sets/src/mage/cards/c/ChaosMoon.java
index 9db40417ac3..a613e22d23f 100644
--- a/Mage.Sets/src/mage/cards/c/ChaosMoon.java
+++ b/Mage.Sets/src/mage/cards/c/ChaosMoon.java
@@ -70,7 +70,7 @@ public class ChaosMoon extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{R}");
 
 
-        // At the beginning of each upkeep, count the number of permanents. If the number is odd, until end of turn, red creatures get +1/+1 and whenever a player taps a Mountain for mana, that player adds {R} to his or her mana pool (in addition to the mana the land produces). If the number is even, until end of turn, red creatures get -1/-1 and if a player taps a Mountain for mana, that Mountain produces colorless mana instead of any other type.
+        // At the beginning of each upkeep, count the number of permanents. If the number is odd, until end of turn, red creatures get +1/+1 and whenever a player taps a Mountain for mana, that player adds {R} to their mana pool (in addition to the mana the land produces). If the number is even, until end of turn, red creatures get -1/-1 and if a player taps a Mountain for mana, that Mountain produces colorless mana instead of any other type.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new ChaosMoonEffect(), TargetController.ANY, false));
     }
 
@@ -94,7 +94,7 @@ class ChaosMoonEffect extends OneShotEffect {
 
     public ChaosMoonEffect() {
         super(Outcome.Neutral);
-        this.staticText = "count the number of permanents. If the number is odd, until end of turn, red creatures get +1/+1 and whenever a player taps a Mountain for mana, that player adds {R} to his or her mana pool (in addition to the mana the land produces). If the number is even, until end of turn, red creatures get -1/-1 and if a player taps a Mountain for mana, that Mountain produces colorless mana instead of any other type";
+        this.staticText = "count the number of permanents. If the number is odd, until end of turn, red creatures get +1/+1 and whenever a player taps a Mountain for mana, that player adds {R} to their mana pool (in addition to the mana the land produces). If the number is even, until end of turn, red creatures get -1/-1 and if a player taps a Mountain for mana, that Mountain produces colorless mana instead of any other type";
     }
 
     public ChaosMoonEffect(final ChaosMoonEffect effect) {
@@ -136,7 +136,7 @@ class ChaosMoonOddTriggeredAbility extends DelayedTriggeredManaAbility {
     }
 
     public ChaosMoonOddTriggeredAbility() {
-        super(new AddManaToManaPoolTargetControllerEffect(new Mana(ColoredManaSymbol.R), "his or her"), Duration.EndOfTurn, false);
+        super(new AddManaToManaPoolTargetControllerEffect(new Mana(ColoredManaSymbol.R), "their"), Duration.EndOfTurn, false);
         this.usesStack = false;
     }
 
@@ -168,7 +168,7 @@ class ChaosMoonOddTriggeredAbility extends DelayedTriggeredManaAbility {
 
     @Override
     public String getRule() {
-        return "Until end of turn, whenever a player taps a Mountain for mana, that player adds {R} to his or her mana pool";
+        return "Until end of turn, whenever a player taps a Mountain for mana, that player adds {R} to their mana pool";
     }
 }
 
diff --git a/Mage.Sets/src/mage/cards/c/ChaosWarp.java b/Mage.Sets/src/mage/cards/c/ChaosWarp.java
index 4171b26bd47..b559466c636 100644
--- a/Mage.Sets/src/mage/cards/c/ChaosWarp.java
+++ b/Mage.Sets/src/mage/cards/c/ChaosWarp.java
@@ -51,10 +51,10 @@ public class ChaosWarp extends CardImpl {
     public ChaosWarp(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}");
 
-        // The owner of target permanent shuffles it into his or her library,
+        // The owner of target permanent shuffles it into their library,
         this.getSpellAbility().addEffect(new ChaosWarpShuffleIntoLibraryEffect());
         this.getSpellAbility().addTarget(new TargetPermanent());
-        //then reveals the top card of his or her library.
+        //then reveals the top card of their library.
         //If it's a permanent card, he or she puts it onto the battlefield.
         this.getSpellAbility().addEffect(new ChaosWarpRevealEffect());
 
@@ -74,7 +74,7 @@ class ChaosWarpShuffleIntoLibraryEffect extends OneShotEffect {
 
     public ChaosWarpShuffleIntoLibraryEffect() {
         super(Outcome.Detriment);
-        this.staticText = "The owner of target permanent shuffles it into his or her library";
+        this.staticText = "The owner of target permanent shuffles it into their library";
     }
 
     public ChaosWarpShuffleIntoLibraryEffect(final ChaosWarpShuffleIntoLibraryEffect effect) {
@@ -105,7 +105,7 @@ class ChaosWarpRevealEffect extends OneShotEffect {
 
     public ChaosWarpRevealEffect() {
         super(Outcome.PutCardInPlay);
-        this.staticText = "then reveals the top card of his or her library. If it's a permanent card, he or she puts it onto the battlefield";
+        this.staticText = "then reveals the top card of their library. If it's a permanent card, he or she puts it onto the battlefield";
     }
 
     public ChaosWarpRevealEffect(final ChaosWarpRevealEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/CharmedGriffin.java b/Mage.Sets/src/mage/cards/c/CharmedGriffin.java
index 39f417082ae..c596f29aa67 100644
--- a/Mage.Sets/src/mage/cards/c/CharmedGriffin.java
+++ b/Mage.Sets/src/mage/cards/c/CharmedGriffin.java
@@ -61,7 +61,7 @@ public class CharmedGriffin extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
 
-        // When Charmed Griffin enters the battlefield, each other player may put an artifact or enchantment card onto the battlefield from his or her hand.
+        // When Charmed Griffin enters the battlefield, each other player may put an artifact or enchantment card onto the battlefield from their hand.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new CharmedGriffinEffect(), false));
     }
 
@@ -79,7 +79,7 @@ class CharmedGriffinEffect extends OneShotEffect {
 
     public CharmedGriffinEffect() {
         super(Outcome.Detriment);
-        this.staticText = "each other player may put an artifact or enchantment card onto the battlefield from his or her hand";
+        this.staticText = "each other player may put an artifact or enchantment card onto the battlefield from their hand";
     }
 
     public CharmedGriffinEffect(final CharmedGriffinEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/ChillOfForeboding.java b/Mage.Sets/src/mage/cards/c/ChillOfForeboding.java
index 77654f89a48..a3e7e9b035a 100644
--- a/Mage.Sets/src/mage/cards/c/ChillOfForeboding.java
+++ b/Mage.Sets/src/mage/cards/c/ChillOfForeboding.java
@@ -50,7 +50,7 @@ public class ChillOfForeboding extends CardImpl {
     public ChillOfForeboding(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{U}");
 
-        // Each player puts the top five cards of his or her library into his or her graveyard.
+        // Each player puts the top five cards of their library into their graveyard.
         this.getSpellAbility().addEffect(new ChillOfForebodingEffect());
         // Flashback {7}{U}
         this.addAbility(new FlashbackAbility(new ManaCostsImpl("{7}{U}"), TimingRule.SORCERY));
@@ -70,7 +70,7 @@ class ChillOfForebodingEffect extends OneShotEffect {
 
     public ChillOfForebodingEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Each player puts the top five cards of his or her library into his or her graveyard";
+        this.staticText = "Each player puts the top five cards of their library into their graveyard";
     }
 
     public ChillOfForebodingEffect(final ChillOfForebodingEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/ChimneyImp.java b/Mage.Sets/src/mage/cards/c/ChimneyImp.java
index 6522c0499d7..c29a769a8f7 100644
--- a/Mage.Sets/src/mage/cards/c/ChimneyImp.java
+++ b/Mage.Sets/src/mage/cards/c/ChimneyImp.java
@@ -60,7 +60,7 @@ public class ChimneyImp extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
         
-        // When Chimney Imp dies, target opponent puts a card from his or her hand on top of his or her library.
+        // When Chimney Imp dies, target opponent puts a card from their hand on top of their library.
         Ability ability = new DiesTriggeredAbility(new ChimneyImpEffect(), false);
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
@@ -81,7 +81,7 @@ class ChimneyImpEffect extends OneShotEffect {
 
     public ChimneyImpEffect() {
         super(Outcome.Detriment);
-        this.staticText = "target opponent puts a card from his or her hand on top of his or her library.";
+        this.staticText = "target opponent puts a card from their hand on top of their library.";
     }
 
     public ChimneyImpEffect(final ChimneyImpEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/ChitteringRats.java b/Mage.Sets/src/mage/cards/c/ChitteringRats.java
index afaa4c0c6de..537df4938dc 100644
--- a/Mage.Sets/src/mage/cards/c/ChitteringRats.java
+++ b/Mage.Sets/src/mage/cards/c/ChitteringRats.java
@@ -57,7 +57,7 @@ public class ChitteringRats extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        // When Chittering Rats enters the battlefield, target opponent puts a card from his or her hand on top of his or her library.
+        // When Chittering Rats enters the battlefield, target opponent puts a card from their hand on top of their library.
         Ability ability = new EntersBattlefieldTriggeredAbility(new ChitteringRatsEffect(), false);
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
@@ -78,7 +78,7 @@ class ChitteringRatsEffect extends OneShotEffect {
 
     public ChitteringRatsEffect() {
         super(Outcome.Detriment);
-        this.staticText = "target opponent puts a card from his or her hand on top of his or her library";
+        this.staticText = "target opponent puts a card from their hand on top of their library";
     }
 
     public ChitteringRatsEffect(final ChitteringRatsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/ChronicFlooding.java b/Mage.Sets/src/mage/cards/c/ChronicFlooding.java
index da815baa941..4ae9358ef0c 100644
--- a/Mage.Sets/src/mage/cards/c/ChronicFlooding.java
+++ b/Mage.Sets/src/mage/cards/c/ChronicFlooding.java
@@ -67,7 +67,7 @@ public class ChronicFlooding extends CardImpl {
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
        
-        // Whenever enchanted land becomes tapped, its controller puts the top three cards of his or her library into his or her graveyard.
+        // Whenever enchanted land becomes tapped, its controller puts the top three cards of their library into their graveyard.
         this.addAbility(new ChronicFloodingAbility());
     }
  
@@ -118,6 +118,6 @@ class ChronicFloodingAbility extends TriggeredAbilityImpl {
  
     @Override
     public String getRule() {
-        return "Whenever enchanted land becomes tapped, its controller puts the top three cards of his or her library into his or her graveyard.";
+        return "Whenever enchanted land becomes tapped, its controller puts the top three cards of their library into their graveyard.";
     }
 }
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/cards/c/CloudhoofKirin.java b/Mage.Sets/src/mage/cards/c/CloudhoofKirin.java
index 2494270a629..4b88bb7f5ad 100644
--- a/Mage.Sets/src/mage/cards/c/CloudhoofKirin.java
+++ b/Mage.Sets/src/mage/cards/c/CloudhoofKirin.java
@@ -64,7 +64,7 @@ public class CloudhoofKirin extends CardImpl {
 
         // Flying
         this.addAbility(FlyingAbility.getInstance());
-        // Whenever you cast a Spirit or Arcane spell, you may have target player put the top X cards of his or her library into his or her graveyard, where X is that spell's converted mana cost.
+        // Whenever you cast a Spirit or Arcane spell, you may have target player put the top X cards of their library into their graveyard, where X is that spell's converted mana cost.
         Ability ability = new SpellCastControllerTriggeredAbility(Zone.BATTLEFIELD, new CloudhoofKirinEffect(), StaticFilters.SPIRIT_OR_ARCANE_CARD, true, true);
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
@@ -84,7 +84,7 @@ class CloudhoofKirinEffect extends OneShotEffect {
 
     public CloudhoofKirinEffect() {
         super(Outcome.Detriment);
-        this.staticText = "you may have target player put the top X cards of his or her library into his or her graveyard, where X is that spell's converted mana cost";
+        this.staticText = "you may have target player put the top X cards of their library into their graveyard, where X is that spell's converted mana cost";
     }
 
     public CloudhoofKirinEffect(final CloudhoofKirinEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/CodexShredder.java b/Mage.Sets/src/mage/cards/c/CodexShredder.java
index bd0b8914d12..486361fb9d1 100644
--- a/Mage.Sets/src/mage/cards/c/CodexShredder.java
+++ b/Mage.Sets/src/mage/cards/c/CodexShredder.java
@@ -49,7 +49,7 @@ public class CodexShredder extends CardImpl {
     public CodexShredder(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}");
 
-        // {T}: Target player puts the top card of his or her library into his or her graveyard.
+        // {T}: Target player puts the top card of their library into their graveyard.
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(1), new TapSourceCost());
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/c/CoercedConfession.java b/Mage.Sets/src/mage/cards/c/CoercedConfession.java
index a81855ffe20..75245e08609 100644
--- a/Mage.Sets/src/mage/cards/c/CoercedConfession.java
+++ b/Mage.Sets/src/mage/cards/c/CoercedConfession.java
@@ -48,7 +48,7 @@ public class CoercedConfession extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{U/B}");
 
 
-        // Target player puts the top four cards of his or her library into his or her graveyard. You draw a card for each creature card put into a graveyard this way.
+        // Target player puts the top four cards of their library into their graveyard. You draw a card for each creature card put into a graveyard this way.
         getSpellAbility().addEffect(new CoercedConfessionMillEffect());
         getSpellAbility().addTarget(new TargetPlayer());
     }
@@ -67,7 +67,7 @@ class CoercedConfessionMillEffect extends OneShotEffect {
 
     public CoercedConfessionMillEffect() {
         super(Outcome.DrawCard);
-        this.staticText = "Target player puts the top four cards of his or her library into his or her graveyard. You draw a card for each creature card put into a graveyard this way";
+        this.staticText = "Target player puts the top four cards of their library into their graveyard. You draw a card for each creature card put into a graveyard this way";
     }
 
     public CoercedConfessionMillEffect(final CoercedConfessionMillEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/Coercion.java b/Mage.Sets/src/mage/cards/c/Coercion.java
index f646d32aa14..dc05d270480 100644
--- a/Mage.Sets/src/mage/cards/c/Coercion.java
+++ b/Mage.Sets/src/mage/cards/c/Coercion.java
@@ -44,7 +44,7 @@ public class Coercion extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}");
 
 
-        // Target opponent reveals his or her hand. You choose a card from it. That player discards that card.
+        // Target opponent reveals their hand. You choose a card from it. That player discards that card.
         this.getSpellAbility().addTarget(new TargetOpponent());
         this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect());
     }
diff --git a/Mage.Sets/src/mage/cards/c/CollectiveBrutality.java b/Mage.Sets/src/mage/cards/c/CollectiveBrutality.java
index 26e78211ab8..a7a2b8ca757 100644
--- a/Mage.Sets/src/mage/cards/c/CollectiveBrutality.java
+++ b/Mage.Sets/src/mage/cards/c/CollectiveBrutality.java
@@ -81,9 +81,9 @@ public class CollectiveBrutality extends CardImpl {
         this.getSpellAbility().getModes().setMinModes(1);
         this.getSpellAbility().getModes().setMaxModes(3);
 
-        // Target opponent reveals his or her hand. You choose an instant or sorcery card from it. That player discards that card.;
+        // Target opponent reveals their hand. You choose an instant or sorcery card from it. That player discards that card.;
         Effect effect = new DiscardCardYouChooseTargetEffect(filter, TargetController.ANY);
-        effect.setText("Target opponent reveals his or her hand. You choose an instant or sorcery card from it. That player discards that card");
+        effect.setText("Target opponent reveals their hand. You choose an instant or sorcery card from it. That player discards that card");
         this.getSpellAbility().addEffect(effect);
         this.getSpellAbility().addTarget(new TargetPlayer(1, 1, false, filterDiscard));
 
diff --git a/Mage.Sets/src/mage/cards/c/CollectiveDefiance.java b/Mage.Sets/src/mage/cards/c/CollectiveDefiance.java
index 49c744ec6d4..0cb47fe18dc 100644
--- a/Mage.Sets/src/mage/cards/c/CollectiveDefiance.java
+++ b/Mage.Sets/src/mage/cards/c/CollectiveDefiance.java
@@ -73,7 +73,7 @@ public class CollectiveDefiance extends CardImpl {
         this.getSpellAbility().getModes().setMinModes(1);
         this.getSpellAbility().getModes().setMaxModes(3);
 
-        // Target player discards all cards in his or her hand, then draws that many cards.;
+        // Target player discards all cards in their hand, then draws that many cards.;
         this.getSpellAbility().addEffect(new CollectiveDefianceEffect());
         this.getSpellAbility().addTarget(new TargetPlayer(1, 1, false, filterDiscard));
 
@@ -108,7 +108,7 @@ class CollectiveDefianceEffect extends OneShotEffect {
 
     public CollectiveDefianceEffect() {
         super(Outcome.Discard);
-        this.staticText = "Target player discards all the cards in his or her hand, then draws that many cards";
+        this.staticText = "Target player discards all the cards in their hand, then draws that many cards";
     }
 
     public CollectiveDefianceEffect(final CollectiveDefianceEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/CollectiveVoyage.java b/Mage.Sets/src/mage/cards/c/CollectiveVoyage.java
index 178cd63f69a..48dc3636ab1 100644
--- a/Mage.Sets/src/mage/cards/c/CollectiveVoyage.java
+++ b/Mage.Sets/src/mage/cards/c/CollectiveVoyage.java
@@ -53,7 +53,7 @@ public class CollectiveVoyage extends CardImpl {
     public CollectiveVoyage(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{G}");
 
-        // Join forces - Starting with you, each player may pay any amount of mana. Each player searches his or her library for up to X basic land cards, where X is the total amount of mana paid this way, puts them onto the battlefield tapped, then shuffles his or her library.
+        // Join forces - Starting with you, each player may pay any amount of mana. Each player searches their library for up to X basic land cards, where X is the total amount of mana paid this way, puts them onto the battlefield tapped, then shuffles their library.
         this.getSpellAbility().addEffect(new CollectiveVoyageEffect());
     }
 
@@ -71,7 +71,7 @@ class CollectiveVoyageEffect extends OneShotEffect {
 
     public CollectiveVoyageEffect() {
         super(Outcome.Detriment);
-        this.staticText = "<i>Join forces</i> - Starting with you, each player may pay any amount of mana. Each player searches his or her library for up to X basic land cards, where X is the total amount of mana paid this way, puts them onto the battlefield tapped, then shuffles his or her library";
+        this.staticText = "<i>Join forces</i> - Starting with you, each player may pay any amount of mana. Each player searches their library for up to X basic land cards, where X is the total amount of mana paid this way, puts them onto the battlefield tapped, then shuffles their library";
     }
 
     public CollectiveVoyageEffect(final CollectiveVoyageEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/CommitMemory.java b/Mage.Sets/src/mage/cards/c/CommitMemory.java
index 9b3e4c7b683..5ec85447778 100644
--- a/Mage.Sets/src/mage/cards/c/CommitMemory.java
+++ b/Mage.Sets/src/mage/cards/c/CommitMemory.java
@@ -71,7 +71,7 @@ public class CommitMemory extends SplitCard {
 
         // Memory
         // Aftermath
-        // Each player shuffles his or her hand and graveyard into his or her library, then draws seven cards.
+        // Each player shuffles their hand and graveyard into their library, then draws seven cards.
         ((CardImpl) (getRightHalfCard())).addAbility(new AftermathAbility().setRuleAtTheTop(true));
         getRightHalfCard().getSpellAbility().addEffect(new MemoryEffect());
         Effect effect = new DrawCardAllEffect(7);
@@ -153,7 +153,7 @@ class MemoryEffect extends OneShotEffect {
 
     public MemoryEffect() {
         super(Outcome.Neutral);
-        staticText = "Each player shuffles his or her hand and graveyard into his or her library";
+        staticText = "Each player shuffles their hand and graveyard into their library";
     }
 
     public MemoryEffect(final MemoryEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/CompellingArgument.java b/Mage.Sets/src/mage/cards/c/CompellingArgument.java
index 10b23848091..5730361bd46 100644
--- a/Mage.Sets/src/mage/cards/c/CompellingArgument.java
+++ b/Mage.Sets/src/mage/cards/c/CompellingArgument.java
@@ -45,7 +45,7 @@ public class CompellingArgument extends CardImpl {
     public CompellingArgument(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{U}");
 
-        // Target player puts the top five cards of his or her library into his or her graveyard.
+        // Target player puts the top five cards of their library into their graveyard.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(5));
 
diff --git a/Mage.Sets/src/mage/cards/c/ConsumingAberration.java b/Mage.Sets/src/mage/cards/c/ConsumingAberration.java
index 1928b372c7b..7ee94832c60 100644
--- a/Mage.Sets/src/mage/cards/c/ConsumingAberration.java
+++ b/Mage.Sets/src/mage/cards/c/ConsumingAberration.java
@@ -62,7 +62,7 @@ public class ConsumingAberration extends CardImpl {
 
         //Consuming Aberration's power and toughness are each equal to the number of cards in your opponents' graveyards.
         this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInOpponentsGraveyardsCount(), Duration.EndOfGame)));
-        //Whenever you cast a spell, each opponent reveals cards from the top of his or her library until he or she reveals a land card, then puts those cards into his or her graveyard.
+        //Whenever you cast a spell, each opponent reveals cards from the top of their library until he or she reveals a land card, then puts those cards into their graveyard.
         this.addAbility(new SpellCastControllerTriggeredAbility(new ConsumingAberrationEffect(), false));
     }
 
@@ -81,7 +81,7 @@ class ConsumingAberrationEffect extends OneShotEffect {
 
     public ConsumingAberrationEffect() {
         super(Outcome.PutCardInPlay);
-        this.staticText = "each opponent reveals cards from the top of his or her library until he or she reveals a land card, then puts those cards into his or her graveyard";
+        this.staticText = "each opponent reveals cards from the top of their library until he or she reveals a land card, then puts those cards into their graveyard";
     }
 
     public ConsumingAberrationEffect(final ConsumingAberrationEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/ConundrumSphinx.java b/Mage.Sets/src/mage/cards/c/ConundrumSphinx.java
index f42d2be742d..37279502a92 100644
--- a/Mage.Sets/src/mage/cards/c/ConundrumSphinx.java
+++ b/Mage.Sets/src/mage/cards/c/ConundrumSphinx.java
@@ -60,9 +60,9 @@ public class ConundrumSphinx extends CardImpl {
 
         //Flying
         this.addAbility(FlyingAbility.getInstance());
-        // Whenever Conundrum Sphinx attacks, each player names a card. Then each player reveals the top card of his or her library.
-        // If the card a player revealed is the card he or she named, that player puts it into his or her hand.
-        // If it's not, that player puts it on the bottom of his or her library.
+        // Whenever Conundrum Sphinx attacks, each player names a card. Then each player reveals the top card of their library.
+        // If the card a player revealed is the card he or she named, that player puts it into their hand.
+        // If it's not, that player puts it on the bottom of their library.
         this.addAbility(new AttacksTriggeredAbility(new ConundrumSphinxEffect(), false));
     }
 
@@ -81,7 +81,7 @@ class ConundrumSphinxEffect extends OneShotEffect {
 
     public ConundrumSphinxEffect() {
         super(Outcome.DrawCard);
-        staticText = "each player names a card. Then each player reveals the top card of his or her library. If the card a player revealed is the card he or she named, that player puts it into his or her hand. If it's not, that player puts it on the bottom of his or her library";
+        staticText = "each player names a card. Then each player reveals the top card of their library. If the card a player revealed is the card he or she named, that player puts it into their hand. If it's not, that player puts it on the bottom of their library";
     }
 
     public ConundrumSphinxEffect(final ConundrumSphinxEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/CorpseTraders.java b/Mage.Sets/src/mage/cards/c/CorpseTraders.java
index cd9239b0d93..6a52ad79739 100644
--- a/Mage.Sets/src/mage/cards/c/CorpseTraders.java
+++ b/Mage.Sets/src/mage/cards/c/CorpseTraders.java
@@ -56,7 +56,7 @@ public class CorpseTraders extends CardImpl {
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);
 
-        // {2}{B}, Sacrifice a creature: Target opponent reveals his or her hand. You choose a card from it. That player discards that card. Activate this ability only any time you could cast a sorcery.
+        // {2}{B}, Sacrifice a creature: Target opponent reveals their hand. You choose a card from it. That player discards that card. Activate this ability only any time you could cast a sorcery.
         Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardCardYouChooseTargetEffect(), new ManaCostsImpl("{2}{B}"));
         ability.addTarget(new TargetOpponent());
         ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT)));
diff --git a/Mage.Sets/src/mage/cards/c/CosisTrickster.java b/Mage.Sets/src/mage/cards/c/CosisTrickster.java
index bd21b873848..02c836231f8 100644
--- a/Mage.Sets/src/mage/cards/c/CosisTrickster.java
+++ b/Mage.Sets/src/mage/cards/c/CosisTrickster.java
@@ -95,6 +95,6 @@ class CosisTricksterTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "Whenever an opponent shuffles his or her library, you may put a +1/+1 counter on {this}.";
+        return "Whenever an opponent shuffles their library, you may put a +1/+1 counter on {this}.";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/c/Counterbore.java b/Mage.Sets/src/mage/cards/c/Counterbore.java
index 85dd380273a..fad6984c8ec 100644
--- a/Mage.Sets/src/mage/cards/c/Counterbore.java
+++ b/Mage.Sets/src/mage/cards/c/Counterbore.java
@@ -45,7 +45,7 @@ public class Counterbore extends CardImpl {
 
 
         // Counter target spell. 
-        // Search its controller's graveyard, hand, and library for all cards with the same name as that spell and exile them. Then that player shuffles his or her library.
+        // Search its controller's graveyard, hand, and library for all cards with the same name as that spell and exile them. Then that player shuffles their library.
         this.getSpellAbility().addTarget(new TargetSpell());
         this.getSpellAbility().addEffect(new CounterTargetAndSearchGraveyardHandLibraryEffect());
     }
diff --git a/Mage.Sets/src/mage/cards/c/Countermand.java b/Mage.Sets/src/mage/cards/c/Countermand.java
index 3f7a494a07b..a208421b7f3 100644
--- a/Mage.Sets/src/mage/cards/c/Countermand.java
+++ b/Mage.Sets/src/mage/cards/c/Countermand.java
@@ -51,7 +51,7 @@ public class Countermand extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{U}{U}");
 
 
-        // Counter target spell. Its controller puts the top four cards of his or her library into his or her graveyard.
+        // Counter target spell. Its controller puts the top four cards of their library into their graveyard.
         this.getSpellAbility().addTarget(new TargetSpell(StaticFilters.FILTER_SPELL));
         this.getSpellAbility().addEffect(new CountermandEffect());
     }
@@ -69,7 +69,7 @@ class CountermandEffect extends OneShotEffect {
 
     public CountermandEffect() {
         super(Outcome.Detriment);
-        staticText = "Counter target spell. Its controller puts the top four cards of his or her library into his or her graveyard";
+        staticText = "Counter target spell. Its controller puts the top four cards of their library into their graveyard";
     }
 
     public CountermandEffect(final CountermandEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/CranialArchive.java b/Mage.Sets/src/mage/cards/c/CranialArchive.java
index e6707e81e47..452a5d52ef2 100644
--- a/Mage.Sets/src/mage/cards/c/CranialArchive.java
+++ b/Mage.Sets/src/mage/cards/c/CranialArchive.java
@@ -52,7 +52,7 @@ public class CranialArchive extends CardImpl {
     public CranialArchive(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}");
 
-        // {2}, Exile Cranial Archive: Target player shuffles his or her graveyard into his or her library. Draw a card.
+        // {2}, Exile Cranial Archive: Target player shuffles their graveyard into their library. Draw a card.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CranialArchiveEffect(), new GenericManaCost(2));
         ability.addCost(new ExileSourceCost());
         ability.addTarget(new TargetPlayer());
@@ -74,7 +74,7 @@ class CranialArchiveEffect extends OneShotEffect {
 
     public CranialArchiveEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Target player shuffles his or her graveyard into his or her library. Draw a card";
+        this.staticText = "Target player shuffles their graveyard into their library. Draw a card";
     }
 
     public CranialArchiveEffect(final CranialArchiveEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/CranialExtraction.java b/Mage.Sets/src/mage/cards/c/CranialExtraction.java
index fb8f930d0d0..c373a03bf13 100644
--- a/Mage.Sets/src/mage/cards/c/CranialExtraction.java
+++ b/Mage.Sets/src/mage/cards/c/CranialExtraction.java
@@ -55,7 +55,7 @@ public class CranialExtraction extends CardImpl {
         this.subtype.add(SubType.ARCANE);
 
         /* Name a nonland card. Search target player's graveyard, hand, and library for
-        * all cards with that name and exile them. Then that player shuffles his or her library. */
+        * all cards with that name and exile them. Then that player shuffles their library. */
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new CranialExtractionEffect());
     }
diff --git a/Mage.Sets/src/mage/cards/c/CreepingDread.java b/Mage.Sets/src/mage/cards/c/CreepingDread.java
index e229dcfcad3..ff7348a9675 100644
--- a/Mage.Sets/src/mage/cards/c/CreepingDread.java
+++ b/Mage.Sets/src/mage/cards/c/CreepingDread.java
@@ -85,7 +85,7 @@ class CreepingDreadEffect extends OneShotEffect {
     /*
     * When a spell or ability instructs each player to discard a card, 
     starting with the player whose turn it is and proceeding in turn order, 
-    each player selects a card from his or her hand without revealing it, 
+    each player selects a card from their hand without revealing it,
     sets it aside, and then all of those cards are revealed and discarded at once.
     
     http://gatherer.wizards.com/Pages/Card/Details.aspx?multiverseid=409851
diff --git a/Mage.Sets/src/mage/cards/c/CrosisThePurger.java b/Mage.Sets/src/mage/cards/c/CrosisThePurger.java
index c7d38c5d147..4fd36f307c8 100644
--- a/Mage.Sets/src/mage/cards/c/CrosisThePurger.java
+++ b/Mage.Sets/src/mage/cards/c/CrosisThePurger.java
@@ -66,7 +66,7 @@ public class CrosisThePurger extends CardImpl {
 
         // Flying
         this.addAbility(FlyingAbility.getInstance());
-        // Whenever Crosis, the Purger deals combat damage to a player, you may pay {2}{B}. If you do, choose a color, then that player reveals his or her hand and discards all cards of that color.
+        // Whenever Crosis, the Purger deals combat damage to a player, you may pay {2}{B}. If you do, choose a color, then that player reveals their hand and discards all cards of that color.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DoIfCostPaid(new CrosisThePurgerEffect(),
                 new ManaCostsImpl("{2}{B}")), false, true));
     }
@@ -85,7 +85,7 @@ class CrosisThePurgerEffect extends OneShotEffect {
 
     CrosisThePurgerEffect() {
         super(Outcome.Discard);
-        this.staticText = "choose a color, then that player reveals his or her hand and discards all cards of that color.";
+        this.staticText = "choose a color, then that player reveals their hand and discards all cards of that color.";
     }
 
     CrosisThePurgerEffect(final CrosisThePurgerEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/CrosstownCourier.java b/Mage.Sets/src/mage/cards/c/CrosstownCourier.java
index 4c49aed6951..1b21bd34a48 100644
--- a/Mage.Sets/src/mage/cards/c/CrosstownCourier.java
+++ b/Mage.Sets/src/mage/cards/c/CrosstownCourier.java
@@ -57,7 +57,7 @@ public class CrosstownCourier extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);
 
-        // Whenever Crosstown Courier deals combat damage to a player, that player puts that many cards from the top of his or her library into his or her graveyard.
+        // Whenever Crosstown Courier deals combat damage to a player, that player puts that many cards from the top of their library into their graveyard.
         this.addAbility(new CrosstownCourierTriggeredAbility());
     }
 
@@ -106,7 +106,7 @@ public class CrosstownCourier extends CardImpl {
 
         @Override
         public String getRule() {
-            return "Whenever {this} deals combat damage to a player, that player puts that many cards from the top of his or her library into his or her graveyard.";
+            return "Whenever {this} deals combat damage to a player, that player puts that many cards from the top of their library into their graveyard.";
         }
     }
 }
diff --git a/Mage.Sets/src/mage/cards/c/CruelFate.java b/Mage.Sets/src/mage/cards/c/CruelFate.java
index ce16987c8f5..8863d25beaa 100644
--- a/Mage.Sets/src/mage/cards/c/CruelFate.java
+++ b/Mage.Sets/src/mage/cards/c/CruelFate.java
@@ -53,7 +53,7 @@ public class CruelFate extends CardImpl {
     public CruelFate(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{U}");
 
-        // Look at the top five cards of target opponent's library. Put one of those cards into that player's graveyard and the rest on top of his or her library in any order.
+        // Look at the top five cards of target opponent's library. Put one of those cards into that player's graveyard and the rest on top of their library in any order.
         this.getSpellAbility().addEffect(new CruelFateEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
 
@@ -73,7 +73,7 @@ class CruelFateEffect extends OneShotEffect {
 
     public CruelFateEffect() {
         super(Outcome.DrawCard);
-        this.staticText = "Look at the top five cards of target opponent's library. Put one of those cards into that player's graveyard and the rest on top of his or her library in any order";
+        this.staticText = "Look at the top five cards of target opponent's library. Put one of those cards into that player's graveyard and the rest on top of their library in any order";
     }
 
     public CruelFateEffect(final CruelFateEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/CrumbleToDust.java b/Mage.Sets/src/mage/cards/c/CrumbleToDust.java
index dbe9cb9b5f8..1630304b743 100644
--- a/Mage.Sets/src/mage/cards/c/CrumbleToDust.java
+++ b/Mage.Sets/src/mage/cards/c/CrumbleToDust.java
@@ -47,7 +47,7 @@ public class CrumbleToDust extends CardImpl {
         // Devoid
         this.addAbility(new DevoidAbility(this.color));
 
-        // Exile target nonbasic land. Search its controller's graveyard, hand, and library for any number of cards with the same name as that land and exile them. Then that player shuffles his or her library.
+        // Exile target nonbasic land. Search its controller's graveyard, hand, and library for any number of cards with the same name as that land and exile them. Then that player shuffles their library.
         this.getSpellAbility().addTarget(new TargetNonBasicLandPermanent());
         this.getSpellAbility().addEffect(new ExileTargetAndSearchGraveyardHandLibraryEffect(false, "its controller's", "any number of cards with the same name as that land"));
     }
diff --git a/Mage.Sets/src/mage/cards/c/CrumblingSanctuary.java b/Mage.Sets/src/mage/cards/c/CrumblingSanctuary.java
index 87b02ed31b8..f80ce2bc785 100644
--- a/Mage.Sets/src/mage/cards/c/CrumblingSanctuary.java
+++ b/Mage.Sets/src/mage/cards/c/CrumblingSanctuary.java
@@ -50,7 +50,7 @@ public class CrumblingSanctuary extends CardImpl {
     public CrumblingSanctuary(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}");
 
-        // If damage would be dealt to a player, that player exiles that many cards from the top of his or her library instead.
+        // If damage would be dealt to a player, that player exiles that many cards from the top of their library instead.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CrumblingSanctuaryEffect()));
     }
 
@@ -68,7 +68,7 @@ class CrumblingSanctuaryEffect extends PreventionEffectImpl {
 
     public CrumblingSanctuaryEffect() {
         super(Duration.WhileOnBattlefield, Integer.MAX_VALUE, false, false);
-        staticText = "If damage would be dealt to a player, that player exiles that many cards from the top of his or her library instead.";
+        staticText = "If damage would be dealt to a player, that player exiles that many cards from the top of their library instead.";
     }
 
     public CrumblingSanctuaryEffect(final CrumblingSanctuaryEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/CryptChampion.java b/Mage.Sets/src/mage/cards/c/CryptChampion.java
index 89bb2cd93f7..53964b6d6a6 100644
--- a/Mage.Sets/src/mage/cards/c/CryptChampion.java
+++ b/Mage.Sets/src/mage/cards/c/CryptChampion.java
@@ -70,7 +70,7 @@ public class CryptChampion extends CardImpl {
         // Double strike
         this.addAbility(DoubleStrikeAbility.getInstance());
 
-        // When Crypt Champion enters the battlefield, each player puts a creature card with converted mana cost 3 or less from his or her graveyard onto the battlefield.
+        // When Crypt Champion enters the battlefield, each player puts a creature card with converted mana cost 3 or less from their graveyard onto the battlefield.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new CryptChampionEffect()));
 
         // When Crypt Champion enters the battlefield, sacrifice it unless {R} was spent to cast it.
@@ -91,7 +91,7 @@ class CryptChampionEffect extends OneShotEffect {
 
     CryptChampionEffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "each player puts a creature card with converted mana cost 3 or less from his or her graveyard onto the battlefield";
+        this.staticText = "each player puts a creature card with converted mana cost 3 or less from their graveyard onto the battlefield";
     }
 
     CryptChampionEffect(final CryptChampionEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/CunningAbduction.java b/Mage.Sets/src/mage/cards/c/CunningAbduction.java
index 46ae0415b44..ec2de76adcb 100644
--- a/Mage.Sets/src/mage/cards/c/CunningAbduction.java
+++ b/Mage.Sets/src/mage/cards/c/CunningAbduction.java
@@ -56,7 +56,7 @@ public class CunningAbduction extends CardImpl {
     public CunningAbduction(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{U}{B}");
 
-        // Target opponent reveals his or her hand. You choose a nonland card from that player's hand and exile it. You may cast that card for as long as it remains exiled, and you may spend mana as though it were mana of any color to cast that spell.
+        // Target opponent reveals their hand. You choose a nonland card from that player's hand and exile it. You may cast that card for as long as it remains exiled, and you may spend mana as though it were mana of any color to cast that spell.
         this.getSpellAbility().addTarget(new TargetOpponent());
         this.getSpellAbility().addEffect(new CunningAbductionExileEffect());
     }
@@ -77,7 +77,7 @@ class CunningAbductionExileEffect extends OneShotEffect {
 
     public CunningAbductionExileEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Target opponent reveals his or her hand. You choose a nonland card from that player's hand and exile it. You may cast that card for as long as it remains exiled, and you may spend mana as though it were mana of any color to cast that spell";
+        this.staticText = "Target opponent reveals their hand. You choose a nonland card from that player's hand and exile it. You may cast that card for as long as it remains exiled, and you may spend mana as though it were mana of any color to cast that spell";
     }
 
     public CunningAbductionExileEffect(final CunningAbductionExileEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/CurseOfInertia.java b/Mage.Sets/src/mage/cards/c/CurseOfInertia.java
index 21bbb7999ab..9bba2d9d7b4 100644
--- a/Mage.Sets/src/mage/cards/c/CurseOfInertia.java
+++ b/Mage.Sets/src/mage/cards/c/CurseOfInertia.java
@@ -65,7 +65,7 @@ public class CurseOfInertia extends CardImpl {
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.Detriment));
         this.addAbility(new EnchantAbility(auraTarget.getTargetName()));
 
-        // Whenever a player attacks enchanted player with one or more creatures, that attacking player may tap or untap target permanent of his or her choice.
+        // Whenever a player attacks enchanted player with one or more creatures, that attacking player may tap or untap target permanent of their choice.
         this.addAbility(new CurseOfInertiaTriggeredAbility());
 
     }
@@ -111,7 +111,7 @@ class CurseOfInertiaTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "Whenever a player attacks enchanted player with one or more creatures, that attacking player may tap or untap target permanent of his or her choice.";
+        return "Whenever a player attacks enchanted player with one or more creatures, that attacking player may tap or untap target permanent of their choice.";
     }
 
     @Override
@@ -124,7 +124,7 @@ class CurseOfInertiaTriggeredAbility extends TriggeredAbilityImpl {
 class CurseOfInertiaTapOrUntapTargetEffect extends OneShotEffect {
     public CurseOfInertiaTapOrUntapTargetEffect() {
         super(Outcome.Tap);
-        staticText = "tap or untap target permanent of his or her choice";
+        staticText = "tap or untap target permanent of their choice";
     }
 
     public CurseOfInertiaTapOrUntapTargetEffect(final CurseOfInertiaTapOrUntapTargetEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/c/CurseOfOblivion.java b/Mage.Sets/src/mage/cards/c/CurseOfOblivion.java
index 14fed6c8614..aa2d262d4f5 100644
--- a/Mage.Sets/src/mage/cards/c/CurseOfOblivion.java
+++ b/Mage.Sets/src/mage/cards/c/CurseOfOblivion.java
@@ -66,7 +66,7 @@ public class CurseOfOblivion extends CardImpl {
         Ability ability = new EnchantAbility(target.getTargetName());
         this.addAbility(ability);
 
-        // At the beginning of enchanted player's upkeep, that player exiles two cards from his or her graveyard.
+        // At the beginning of enchanted player's upkeep, that player exiles two cards from their graveyard.
         this.addAbility(new CurseOfOblivionAbility());
     }
 
@@ -115,7 +115,7 @@ class CurseOfOblivionAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "At the beginning of enchanted player's upkeep, that player exiles two cards from his or her graveyard.";
+        return "At the beginning of enchanted player's upkeep, that player exiles two cards from their graveyard.";
     }
 
 }
diff --git a/Mage.Sets/src/mage/cards/c/CurseOfTheBloodyTome.java b/Mage.Sets/src/mage/cards/c/CurseOfTheBloodyTome.java
index 7b5a4d50270..96df62b5914 100644
--- a/Mage.Sets/src/mage/cards/c/CurseOfTheBloodyTome.java
+++ b/Mage.Sets/src/mage/cards/c/CurseOfTheBloodyTome.java
@@ -65,7 +65,7 @@ public class CurseOfTheBloodyTome extends CardImpl {
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
         Ability ability = new EnchantAbility(target.getTargetName());
         this.addAbility(ability);
-        // At the beginning of enchanted player's upkeep, that player puts the top two cards of his or her library into his or her graveyard.
+        // At the beginning of enchanted player's upkeep, that player puts the top two cards of their library into their graveyard.
         this.addAbility(new CurseOfTheBloodyTomeAbility());
 
     }
@@ -115,6 +115,6 @@ class CurseOfTheBloodyTomeAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "At the beginning of enchanted player's upkeep, that player puts the top two cards of his or her library into his or her graveyard.";
+        return "At the beginning of enchanted player's upkeep, that player puts the top two cards of their library into their graveyard.";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/d/DakraMystic.java b/Mage.Sets/src/mage/cards/d/DakraMystic.java
index 3c9b890b5c0..19f41e4f16e 100644
--- a/Mage.Sets/src/mage/cards/d/DakraMystic.java
+++ b/Mage.Sets/src/mage/cards/d/DakraMystic.java
@@ -59,7 +59,7 @@ public class DakraMystic extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        // {U},{T}:Each player reveals the top card of his or her library. You may put the revealed cards into their owners graveyard. If you don't, each player draws a card.
+        // {U},{T}:Each player reveals the top card of their library. You may put the revealed cards into their owners graveyard. If you don't, each player draws a card.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DakraMysticEffect(), new ManaCostsImpl("{U}"));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
@@ -80,7 +80,7 @@ class DakraMysticEffect extends OneShotEffect {
 
     public DakraMysticEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Each player reveals the top card of his or her library. You may put the revealed cards into their owners' graveyard. If you don't, each player draws a card";
+        this.staticText = "Each player reveals the top card of their library. You may put the revealed cards into their owners' graveyard. If you don't, each player draws a card";
     }
 
     public DakraMysticEffect(final DakraMysticEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/d/DampenThought.java b/Mage.Sets/src/mage/cards/d/DampenThought.java
index 87e3f473870..6d323bc386e 100644
--- a/Mage.Sets/src/mage/cards/d/DampenThought.java
+++ b/Mage.Sets/src/mage/cards/d/DampenThought.java
@@ -47,7 +47,7 @@ public class DampenThought extends CardImpl {
         this.subtype.add(SubType.ARCANE);
 
 
-        // Target player puts the top four cards of his or her library into his or her graveyard.
+        // Target player puts the top four cards of their library into their graveyard.
         this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(4));
         this.getSpellAbility().addTarget(new TargetPlayer());
         // Splice onto Arcane {1}{U}
diff --git a/Mage.Sets/src/mage/cards/d/DarigaazTheIgniter.java b/Mage.Sets/src/mage/cards/d/DarigaazTheIgniter.java
index 9bb78334e50..05b202cba6c 100644
--- a/Mage.Sets/src/mage/cards/d/DarigaazTheIgniter.java
+++ b/Mage.Sets/src/mage/cards/d/DarigaazTheIgniter.java
@@ -63,7 +63,7 @@ public class DarigaazTheIgniter extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
 
-        // Whenever Darigaaz, the Igniter deals combat damage to a player, you may pay {2}{R}. If you do, choose a color, then that player reveals his or her hand and Darigaaz deals damage to the player equal to the number of cards of that color revealed this way.
+        // Whenever Darigaaz, the Igniter deals combat damage to a player, you may pay {2}{R}. If you do, choose a color, then that player reveals their hand and Darigaaz deals damage to the player equal to the number of cards of that color revealed this way.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new DoIfCostPaid(
                 new DarigaazTheIgniterEffect(), new ManaCostsImpl("{2}{R}")), false, true));
     }
@@ -82,7 +82,7 @@ class DarigaazTheIgniterEffect extends OneShotEffect {
 
     public DarigaazTheIgniterEffect() {
         super(Outcome.Damage);
-        staticText = "choose a color, then that player reveals his or her hand and {this} deals damage"
+        staticText = "choose a color, then that player reveals their hand and {this} deals damage"
                 + " to the player equal to the number of cards of that color revealed this way";
     }
 
diff --git a/Mage.Sets/src/mage/cards/d/DarkDeal.java b/Mage.Sets/src/mage/cards/d/DarkDeal.java
index 319e4ceda95..56b3116594a 100644
--- a/Mage.Sets/src/mage/cards/d/DarkDeal.java
+++ b/Mage.Sets/src/mage/cards/d/DarkDeal.java
@@ -48,7 +48,7 @@ public class DarkDeal extends CardImpl {
     public DarkDeal(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}");
 
-        // Each player discards all the cards in his or her hand, then draws that many cards minus one.
+        // Each player discards all the cards in their hand, then draws that many cards minus one.
         this.getSpellAbility().addEffect(new DarkDealEffect());
     }
 
@@ -66,7 +66,7 @@ class DarkDealEffect extends OneShotEffect {
 
     DarkDealEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Each player discards all the cards in his or her hand, then draws that many cards minus one";
+        this.staticText = "Each player discards all the cards in their hand, then draws that many cards minus one";
     }
 
     DarkDealEffect(final DarkDealEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/d/DarkInquiry.java b/Mage.Sets/src/mage/cards/d/DarkInquiry.java
index 091417e1585..9daef08045d 100644
--- a/Mage.Sets/src/mage/cards/d/DarkInquiry.java
+++ b/Mage.Sets/src/mage/cards/d/DarkInquiry.java
@@ -44,7 +44,7 @@ public class DarkInquiry extends CardImpl {
     public DarkInquiry(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{B}");
 
-        // Target opponent reveals his or her hand. You choose a non land card from it. That player discards that card.
+        // Target opponent reveals their hand. You choose a non land card from it. That player discards that card.
         this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(StaticFilters.FILTER_CARD_A_NON_LAND));
         this.getSpellAbility().addTarget(new TargetOpponent());
     }
diff --git a/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java b/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java
index 4c5b0f14d17..e20effc2ac4 100644
--- a/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java
+++ b/Mage.Sets/src/mage/cards/d/DawnbreakReclaimer.java
@@ -100,10 +100,10 @@ class DawnbreakReclaimerEffect extends OneShotEffect {
     @Override
     public boolean apply(Game game, Ability source) {
         /**
-         * 04.11.2015 If any opponent has a creature card in his or her
+         * 04.11.2015 If any opponent has a creature card in their
          * graveyard as Dawnbreak Reclaimer’s ability resolves, then you must
          * choose one of those cards. You can’t choose a different opponent with
-         * no creature cards in his or her graveyard to avoid returning one of
+         * no creature cards in their graveyard to avoid returning one of
          * those cards.
          *
          * 04.11.2015 If there are no creature cards in any opponent’s graveyard
@@ -132,7 +132,7 @@ class DawnbreakReclaimerEffect extends OneShotEffect {
                 controller.choose(outcome, targetOpponent, source.getSourceId(), game);
                 opponent = game.getPlayer(targetOpponent.getFirstTarget());
                 if (opponent != null) {
-                    game.informPlayers(sourceObject.getLogName() + ": " + controller.getLogName() + " has chosen " + opponent.getLogName() + " to select a creature card from his or her graveyard");
+                    game.informPlayers(sourceObject.getLogName() + ": " + controller.getLogName() + " has chosen " + opponent.getLogName() + " to select a creature card from their graveyard");
                 }
             }
             if (opponent != null) {
diff --git a/Mage.Sets/src/mage/cards/d/DawnsReflection.java b/Mage.Sets/src/mage/cards/d/DawnsReflection.java
index 01295644fb6..11769c1d794 100644
--- a/Mage.Sets/src/mage/cards/d/DawnsReflection.java
+++ b/Mage.Sets/src/mage/cards/d/DawnsReflection.java
@@ -65,7 +65,7 @@ public class DawnsReflection extends CardImpl {
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
-        // Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors to his or her mana pool.
+        // Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors to their mana pool.
         this.addAbility(new DawnsReflectionTriggeredAbility());
     }
 
@@ -107,7 +107,7 @@ class DawnsReflectionTriggeredAbility extends TriggeredManaAbility {
 
     @Override
     public String getRule() {
-        return "Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors to his or her mana pool <i>(in addition to the mana the land produces)</i>.";
+        return "Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors to their mana pool <i>(in addition to the mana the land produces)</i>.";
     }
 }
 
@@ -115,7 +115,7 @@ class DawnsReflectionManaEffect extends ManaEffect {
 
     public DawnsReflectionManaEffect() {
         super();
-        this.staticText = "its controller adds two mana in any combination of colors to his or her mana pool";
+        this.staticText = "its controller adds two mana in any combination of colors to their mana pool";
     }
 
     public DawnsReflectionManaEffect(final DawnsReflectionManaEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/d/DaysUndoing.java b/Mage.Sets/src/mage/cards/d/DaysUndoing.java
index 7093c385dc1..b43324d2972 100644
--- a/Mage.Sets/src/mage/cards/d/DaysUndoing.java
+++ b/Mage.Sets/src/mage/cards/d/DaysUndoing.java
@@ -52,7 +52,7 @@ public class DaysUndoing extends CardImpl {
     public DaysUndoing(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{U}");
 
-        // Each player shuffles his or her hand and graveyard into his or her library, then draws seven cards. If it's your turn, end the turn.
+        // Each player shuffles their hand and graveyard into their library, then draws seven cards. If it's your turn, end the turn.
         this.getSpellAbility().addEffect(new DaysUndoingEffect());
         Effect effect = new DrawCardAllEffect(7);
         effect.setText(", then draws seven cards");
@@ -74,7 +74,7 @@ class DaysUndoingEffect extends OneShotEffect {
 
     public DaysUndoingEffect() {
         super(Outcome.Neutral);
-        staticText = "Each player shuffles his or her hand and graveyard into his or her library";
+        staticText = "Each player shuffles their hand and graveyard into their library";
     }
 
     public DaysUndoingEffect(final DaysUndoingEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/d/DeathMatch.java b/Mage.Sets/src/mage/cards/d/DeathMatch.java
index 027445a10ff..dee54dc0857 100644
--- a/Mage.Sets/src/mage/cards/d/DeathMatch.java
+++ b/Mage.Sets/src/mage/cards/d/DeathMatch.java
@@ -53,7 +53,7 @@ public class DeathMatch extends CardImpl {
     public DeathMatch(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{B}");
 
-        // Whenever a creature enters the battlefield, that creature's controller may have target creature of his or her choice get -3/-3 until end of turn.
+        // Whenever a creature enters the battlefield, that creature's controller may have target creature of their choice get -3/-3 until end of turn.
         // NOTE: The ability being optional is implemented in the subclass to give the choice to correct player.
         Ability ability = new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new DeathMatchEffect(),
                 StaticFilters.FILTER_PERMANENT_CREATURE, false, SetTargetPointer.PLAYER, "");
@@ -88,7 +88,7 @@ class DeathMatchEffect extends OneShotEffect {
 
     public DeathMatchEffect() {
         super(Outcome.UnboostCreature);
-        staticText = "that creature's controller may have target creature of his or her choice get -3/-3 until end of turn.";
+        staticText = "that creature's controller may have target creature of their choice get -3/-3 until end of turn.";
     }
 
     public boolean apply(Game game, Ability source) {
diff --git a/Mage.Sets/src/mage/cards/d/Deglamer.java b/Mage.Sets/src/mage/cards/d/Deglamer.java
index 975a37a8edb..840b04959c2 100644
--- a/Mage.Sets/src/mage/cards/d/Deglamer.java
+++ b/Mage.Sets/src/mage/cards/d/Deglamer.java
@@ -45,7 +45,7 @@ public class Deglamer extends CardImpl {
     public Deglamer(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{G}");
 
-        // Choose target artifact or enchantment. Its owner shuffles it into his or her library.
+        // Choose target artifact or enchantment. Its owner shuffles it into their library.
         this.getSpellAbility().addEffect(new ShuffleIntoLibraryTargetEffect());
         this.getSpellAbility().addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT));
     }
diff --git a/Mage.Sets/src/mage/cards/d/Deicide.java b/Mage.Sets/src/mage/cards/d/Deicide.java
index 470c38c5cce..2c1c02497f8 100644
--- a/Mage.Sets/src/mage/cards/d/Deicide.java
+++ b/Mage.Sets/src/mage/cards/d/Deicide.java
@@ -54,7 +54,7 @@ public class Deicide extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{W}");
 
 
-        // Exile target enchantment. If the exiled card is a God card, search its controller's graveyard, hand, and library for any number of cards with the same name as that card and exile them, then that player shuffles his or her library.
+        // Exile target enchantment. If the exiled card is a God card, search its controller's graveyard, hand, and library for any number of cards with the same name as that card and exile them, then that player shuffles their library.
         this.getSpellAbility().addEffect(new DeicideExileEffect());
         this.getSpellAbility().addTarget(new TargetEnchantmentPermanent());
     }
diff --git a/Mage.Sets/src/mage/cards/d/DementiaSliver.java b/Mage.Sets/src/mage/cards/d/DementiaSliver.java
index 8e5cfb838b2..5620a5a552c 100644
--- a/Mage.Sets/src/mage/cards/d/DementiaSliver.java
+++ b/Mage.Sets/src/mage/cards/d/DementiaSliver.java
@@ -64,14 +64,14 @@ public class DementiaSliver extends CardImpl {
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);
 
-        // All Slivers have "{T}: Name a card. Target opponent reveals a card at random from his or her hand. If it's the named card, that player discards it. Activate this ability only during your turn."
+        // All Slivers have "{T}: Name a card. Target opponent reveals a card at random from their hand. If it's the named card, that player discards it. Activate this ability only during your turn."
         Ability gainedAbility = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new NameACardEffect(NameACardEffect.TypeOfName.ALL), new TapSourceCost(), MyTurnCondition.instance);
         gainedAbility.addEffect(new DementiaSliverEffect());
         gainedAbility.addTarget(new TargetOpponent());
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
                 new GainAbilityAllEffect(gainedAbility, Duration.WhileOnBattlefield, filter,
                         "All Slivers have \"{T}: Choose a card name. "
-                        + "Target opponent reveals a card at random from his or her hand."
+                        + "Target opponent reveals a card at random from their hand."
                         + " If that card has the chosen name, that player discards it."
                         + " Activate this ability only during your turn.\""
                 )
@@ -92,7 +92,7 @@ class DementiaSliverEffect extends OneShotEffect {
 
     public DementiaSliverEffect() {
         super(Outcome.Damage);
-        staticText = "Target opponent reveals a card at random from his or her hand. If it's the named card, that player discards it";
+        staticText = "Target opponent reveals a card at random from their hand. If it's the named card, that player discards it";
     }
 
     public DementiaSliverEffect(final DementiaSliverEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/d/DenyingWind.java b/Mage.Sets/src/mage/cards/d/DenyingWind.java
index 087b5379449..66fa128a78a 100644
--- a/Mage.Sets/src/mage/cards/d/DenyingWind.java
+++ b/Mage.Sets/src/mage/cards/d/DenyingWind.java
@@ -52,7 +52,7 @@ public class DenyingWind extends CardImpl {
     public DenyingWind(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{7}{U}{U}");
 
-        // Search target player's library for up to seven cards and exile them. Then that player shuffles his or her library.
+        // Search target player's library for up to seven cards and exile them. Then that player shuffles their library.
         getSpellAbility().addEffect(new DenyingWindEffect());
         getSpellAbility().addTarget(new TargetPlayer());
     }
@@ -71,7 +71,7 @@ class DenyingWindEffect extends OneShotEffect {
 
     public DenyingWindEffect() {
         super(Outcome.Neutral);
-        staticText = "search target player's library for up to seven cards and exile them. Then that player shuffles his or her library";
+        staticText = "search target player's library for up to seven cards and exile them. Then that player shuffles their library";
     }
 
     public DenyingWindEffect(final DenyingWindEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/d/DescentIntoMadness.java b/Mage.Sets/src/mage/cards/d/DescentIntoMadness.java
index 24e98defa67..4c1ec1e436b 100644
--- a/Mage.Sets/src/mage/cards/d/DescentIntoMadness.java
+++ b/Mage.Sets/src/mage/cards/d/DescentIntoMadness.java
@@ -78,7 +78,7 @@ public class DescentIntoMadness extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{B}{B}");
 
 
-        // 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.
+        // 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 their hand, where X is the number of despair counters on Descent into Madness.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DescentIntoMadnessEffect(), TargetController.YOU, false));
     }
 
@@ -96,7 +96,7 @@ class DescentIntoMadnessEffect extends OneShotEffect {
 
     public DescentIntoMadnessEffect() {
         super(Outcome.Sacrifice);
-        this.staticText = "put a despair counter on {this}, 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 {this}";
+        this.staticText = "put a despair counter on {this}, then each player exiles X permanents he or she controls and/or cards from their hand, where X is the number of despair counters on {this}";
     }
 
     public DescentIntoMadnessEffect(final DescentIntoMadnessEffect effect) {
@@ -214,7 +214,7 @@ class DescentIntoMadnessEffect extends OneShotEffect {
             }
         }
         if (cardsFromHand > 0) {
-            game.informPlayers(player.getLogName() + " selects " + cardsFromHand + (cardsFromHand == 1?" card":" cards") + " from his or her hand");
+            game.informPlayers(player.getLogName() + " selects " + cardsFromHand + (cardsFromHand == 1?" card":" cards") + " from their hand");
         }
     }
 }
diff --git a/Mage.Sets/src/mage/cards/d/Despise.java b/Mage.Sets/src/mage/cards/d/Despise.java
index a7ad3d160fb..0aaddbcfe79 100644
--- a/Mage.Sets/src/mage/cards/d/Despise.java
+++ b/Mage.Sets/src/mage/cards/d/Despise.java
@@ -54,7 +54,7 @@ public class Despise extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}");
 
 
-        // Target opponent reveals his or her hand. You choose a creature or planeswalker card from it. That player discards that card.
+        // Target opponent reveals their hand. You choose a creature or planeswalker card from it. That player discards that card.
         this.getSpellAbility().addTarget(new TargetOpponent());
         this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(filter));
     }
diff --git a/Mage.Sets/src/mage/cards/d/DestroyTheEvidence.java b/Mage.Sets/src/mage/cards/d/DestroyTheEvidence.java
index a7c7ac7ac7a..50e5e2998ce 100644
--- a/Mage.Sets/src/mage/cards/d/DestroyTheEvidence.java
+++ b/Mage.Sets/src/mage/cards/d/DestroyTheEvidence.java
@@ -51,7 +51,7 @@ public class DestroyTheEvidence extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{B}");
 
         // Destroy target land. Its controller reveals cards from the top of his
-        // or her library until he or she reveals a land card, then puts those cards into his or her graveyard.
+        // or her library until he or she reveals a land card, then puts those cards into their graveyard.
         TargetLandPermanent target = new TargetLandPermanent();
         this.getSpellAbility().addTarget(target);
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
@@ -72,7 +72,7 @@ class DestroyTheEvidenceEffect extends OneShotEffect {
 
     public DestroyTheEvidenceEffect() {
         super(Outcome.Discard);
-        this.staticText = "Its controller reveals cards from the top of his or her library until he or she reveals a land card, then puts those cards into his or her graveyard";
+        this.staticText = "Its controller reveals cards from the top of their library until he or she reveals a land card, then puts those cards into their graveyard";
     }
 
     public DestroyTheEvidenceEffect(final DestroyTheEvidenceEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/d/DictateOfKarametra.java b/Mage.Sets/src/mage/cards/d/DictateOfKarametra.java
index 363e44b134d..5154880c910 100644
--- a/Mage.Sets/src/mage/cards/d/DictateOfKarametra.java
+++ b/Mage.Sets/src/mage/cards/d/DictateOfKarametra.java
@@ -49,7 +49,7 @@ public class DictateOfKarametra extends CardImpl {
 
         // Flash
         this.addAbility(FlashAbility.getInstance());
-        // Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
+        // Whenever a player taps a land for mana, that player adds one mana to their mana pool of any type that land produced.
         this.addAbility(new TapForManaAllTriggeredManaAbility(
                 new AddManaOfAnyTypeProducedEffect(),
                 new FilterLandPermanent("a player taps a land"),
diff --git a/Mage.Sets/src/mage/cards/d/DiminishingReturns.java b/Mage.Sets/src/mage/cards/d/DiminishingReturns.java
index c20aff85926..75540071dcb 100644
--- a/Mage.Sets/src/mage/cards/d/DiminishingReturns.java
+++ b/Mage.Sets/src/mage/cards/d/DiminishingReturns.java
@@ -48,7 +48,7 @@ public class DiminishingReturns extends CardImpl {
     public DiminishingReturns(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{U}{U}");
 
-        // Each player shuffles his or her hand and graveyard into his or her library. You exile the top ten cards of your library. Then each player draws up to seven cards.
+        // Each player shuffles their hand and graveyard into their library. You exile the top ten cards of your library. Then each player draws up to seven cards.
         this.getSpellAbility().addEffect(new DiminishingReturnsEffect());
     }
 
@@ -66,7 +66,7 @@ class DiminishingReturnsEffect extends OneShotEffect {
 
     public DiminishingReturnsEffect() {
         super(Outcome.Neutral);
-        staticText = "Each player shuffles his or her hand and graveyard into his or her library. You exile the top ten cards of your library. Then each player draws up to seven cards.";
+        staticText = "Each player shuffles their hand and graveyard into their library. You exile the top ten cards of your library. Then each player draws up to seven cards.";
     }
 
     public DiminishingReturnsEffect(final DiminishingReturnsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/d/DiplomacyOfTheWastes.java b/Mage.Sets/src/mage/cards/d/DiplomacyOfTheWastes.java
index 1c2f5991e53..409e6758615 100644
--- a/Mage.Sets/src/mage/cards/d/DiplomacyOfTheWastes.java
+++ b/Mage.Sets/src/mage/cards/d/DiplomacyOfTheWastes.java
@@ -49,7 +49,7 @@ public class DiplomacyOfTheWastes extends CardImpl {
     public DiplomacyOfTheWastes(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}");
 
-        // Target opponent reveals his or her hand. You choose a nonland card from it. That player discards that card. If you control a Warrior, that player loses 2 life.
+        // Target opponent reveals their hand. You choose a nonland card from it. That player discards that card. If you control a Warrior, that player loses 2 life.
         this.getSpellAbility().addTarget(new TargetOpponent());
         this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(new FilterNonlandCard()));
         this.getSpellAbility().addEffect(new ConditionalOneShotEffect(
diff --git a/Mage.Sets/src/mage/cards/d/DireFleetRavager.java b/Mage.Sets/src/mage/cards/d/DireFleetRavager.java
index 2cb8e9204a3..c585cc62868 100644
--- a/Mage.Sets/src/mage/cards/d/DireFleetRavager.java
+++ b/Mage.Sets/src/mage/cards/d/DireFleetRavager.java
@@ -63,7 +63,7 @@ public class DireFleetRavager extends CardImpl {
         // Deathtouch
         this.addAbility(DeathtouchAbility.getInstance());
 
-        // When Dire Fleet Ravager enters the battlefield, each player loses a third of his or her life, rounded up.
+        // When Dire Fleet Ravager enters the battlefield, each player loses a third of their life, rounded up.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new DireFleetRavagerEffect()));
     }
 
@@ -81,7 +81,7 @@ class DireFleetRavagerEffect extends OneShotEffect {
 
     DireFleetRavagerEffect() {
         super(Outcome.Detriment);
-        this.staticText = "each player loses a third of his or her life, rounded up";
+        this.staticText = "each player loses a third of their life, rounded up";
     }
 
     DireFleetRavagerEffect(final DireFleetRavagerEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfPhenax.java b/Mage.Sets/src/mage/cards/d/DiscipleOfPhenax.java
index 0ba1d587359..47f1ff2549c 100644
--- a/Mage.Sets/src/mage/cards/d/DiscipleOfPhenax.java
+++ b/Mage.Sets/src/mage/cards/d/DiscipleOfPhenax.java
@@ -62,7 +62,7 @@ public class DiscipleOfPhenax extends CardImpl {
         this.toughness = new MageInt(3);
 
         // When Disciple of Phenax enters the battlefield, target player reveals a number of cards
-        // from his or her hand equal to your devotion to black. You choose one of them. That player discards that card.
+        // from their hand equal to your devotion to black. You choose one of them. That player discards that card.
         Ability ability = new EntersBattlefieldTriggeredAbility(new DiscipleOfPhenaxEffect(), false);
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
@@ -83,7 +83,7 @@ class DiscipleOfPhenaxEffect extends OneShotEffect {
 
     public DiscipleOfPhenaxEffect() {
         super(Outcome.Discard);
-        staticText = "target player reveals a number of cards from his or her hand equal to your devotion to black. You choose one of them. That player discards that card";
+        staticText = "target player reveals a number of cards from their hand equal to your devotion to black. You choose one of them. That player discards that card";
     }
 
     public DiscipleOfPhenaxEffect(final DiscipleOfPhenaxEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/d/Dispossess.java b/Mage.Sets/src/mage/cards/d/Dispossess.java
index 4c1e749ae4a..006cab12cec 100644
--- a/Mage.Sets/src/mage/cards/d/Dispossess.java
+++ b/Mage.Sets/src/mage/cards/d/Dispossess.java
@@ -46,7 +46,7 @@ public class Dispossess extends CardImpl {
     public Dispossess(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{B}");
 
-        // Name an artifact card. Search target player's graveyard, hand, and library for any number of cards with that name and exile them. Then that player shuffles his or her library.
+        // Name an artifact card. Search target player's graveyard, hand, and library for any number of cards with that name and exile them. Then that player shuffles their library.
         this.getSpellAbility().addEffect((new NameACardEffect(NameACardEffect.TypeOfName.ARTIFACT_NAME)));
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new DispossessEffect());
diff --git a/Mage.Sets/src/mage/cards/d/DistendedMindbender.java b/Mage.Sets/src/mage/cards/d/DistendedMindbender.java
index 46480bd2a80..145a9d3c1ff 100644
--- a/Mage.Sets/src/mage/cards/d/DistendedMindbender.java
+++ b/Mage.Sets/src/mage/cards/d/DistendedMindbender.java
@@ -68,7 +68,7 @@ public class DistendedMindbender extends CardImpl {
         // Emerge {5}{B}{B}
         this.addAbility(new EmergeAbility(this, new ManaCostsImpl<>("{5}{B}{B}")));
 
-        // When controller cast Distended Mindbender, target opponent reveals his or her hand. You choose from it a nonland card with converted mana cost 3 or less
+        // When controller cast Distended Mindbender, target opponent reveals their hand. You choose from it a nonland card with converted mana cost 3 or less
         // and a card with converted mana cost 4 or greater. That player discards those cards.
         Ability ability = new CastSourceTriggeredAbility(new DistendedMindbenderEffect());
         ability.addTarget(new TargetOpponent());
@@ -98,7 +98,7 @@ class DistendedMindbenderEffect extends OneShotEffect {
 
     public DistendedMindbenderEffect() {
         super(Outcome.Discard);
-        this.staticText = "target opponent reveals his or her hand. You choose from it a nonland card with converted mana cost 3 or less and a card with "
+        this.staticText = "target opponent reveals their hand. You choose from it a nonland card with converted mana cost 3 or less and a card with "
                 + "converted mana cost 4 or greater. That player discards those cards.";
     }
 
diff --git a/Mage.Sets/src/mage/cards/d/Distress.java b/Mage.Sets/src/mage/cards/d/Distress.java
index 39530e31e7f..ad7d587319a 100644
--- a/Mage.Sets/src/mage/cards/d/Distress.java
+++ b/Mage.Sets/src/mage/cards/d/Distress.java
@@ -53,7 +53,7 @@ public class Distress extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}{B}");
 
 
-        // Target player reveals his or her hand. You choose a nonland card from it. That player discards that card.
+        // Target player reveals their hand. You choose a nonland card from it. That player discards that card.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(filter, TargetController.ANY));
     }
diff --git a/Mage.Sets/src/mage/cards/d/DivergentTransformations.java b/Mage.Sets/src/mage/cards/d/DivergentTransformations.java
index e915c36e1af..7815acb1ee7 100644
--- a/Mage.Sets/src/mage/cards/d/DivergentTransformations.java
+++ b/Mage.Sets/src/mage/cards/d/DivergentTransformations.java
@@ -53,7 +53,7 @@ public class DivergentTransformations extends CardImpl {
 
         // Undaunted
         this.addAbility(new UndauntedAbility());
-        // Exile two target creatures. For each of those creatures, its controller reveals cards from the top of his or her library until he or she reveals a creature card, puts that card onto the battlefield, then shuffles the rest into his or her library.
+        // Exile two target creatures. For each of those creatures, its controller reveals cards from the top of their library until he or she reveals a creature card, puts that card onto the battlefield, then shuffles the rest into their library.
         this.getSpellAbility().addEffect(new DivergentTransformationsEffect());
         this.getSpellAbility().addTarget(new TargetCreaturePermanent(2, 2, FILTER_PERMANENT_CREATURES, false));
 
@@ -73,8 +73,8 @@ class DivergentTransformationsEffect extends OneShotEffect {
 
     public DivergentTransformationsEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Exile two target creatures. For each of those creatures, its controller reveals cards from the top of his or her library "
-                + "until he or she reveals a creature card, puts that card onto the battlefield, then shuffles the rest into his or her library";
+        this.staticText = "Exile two target creatures. For each of those creatures, its controller reveals cards from the top of their library "
+                + "until he or she reveals a creature card, puts that card onto the battlefield, then shuffles the rest into their library";
     }
 
     public DivergentTransformationsEffect(final DivergentTransformationsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/d/DominatorDrone.java b/Mage.Sets/src/mage/cards/d/DominatorDrone.java
index 7c6e1928186..2a2a2555ed8 100644
--- a/Mage.Sets/src/mage/cards/d/DominatorDrone.java
+++ b/Mage.Sets/src/mage/cards/d/DominatorDrone.java
@@ -68,7 +68,7 @@ public class DominatorDrone extends CardImpl {
         // Devoid
         this.addAbility(new DevoidAbility(this.color));
 
-        // Ingest (Whenever this creature deals combat damage to a player, that player exiles the top card of his or her library.)
+        // Ingest (Whenever this creature deals combat damage to a player, that player exiles the top card of their library.)
         this.addAbility(new IngestAbility());
 
         // When Dominator Drone enters the battlefield, if you control another colorless creature, each opponent loses 2 life.
diff --git a/Mage.Sets/src/mage/cards/d/Doomfall.java b/Mage.Sets/src/mage/cards/d/Doomfall.java
index 78c30c55e61..96ac8a00f61 100644
--- a/Mage.Sets/src/mage/cards/d/Doomfall.java
+++ b/Mage.Sets/src/mage/cards/d/Doomfall.java
@@ -61,10 +61,10 @@ public class Doomfall extends CardImpl {
         this.getSpellAbility().addEffect(new DoomfallEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
 
-        // • Target opponent reveals his or her hand. You choose a nonland card from it. Exile that card.
+        // • Target opponent reveals their hand. You choose a nonland card from it. Exile that card.
         Mode mode = new Mode();
         mode.getEffects().add(new ExileCardYouChooseTargetOpponentEffect(StaticFilters.FILTER_CARD_A_NON_LAND)
-                .setText("Target opponent reveals his or her hand. You choose a nonland card from it. Exile that card"));
+                .setText("Target opponent reveals their hand. You choose a nonland card from it. Exile that card"));
         mode.getTargets().add(new TargetOpponent());
         this.getSpellAbility().addMode(mode);
     }
diff --git a/Mage.Sets/src/mage/cards/d/Doorkeeper.java b/Mage.Sets/src/mage/cards/d/Doorkeeper.java
index b1780b7a9c3..1a76f7f3a30 100644
--- a/Mage.Sets/src/mage/cards/d/Doorkeeper.java
+++ b/Mage.Sets/src/mage/cards/d/Doorkeeper.java
@@ -67,7 +67,7 @@ public class Doorkeeper extends CardImpl {
         // Defender
         this.addAbility(DefenderAbility.getInstance());
 
-        // {2}{U}, {T}: Target player puts the top X cards of his or her library into his or her graveyard, where X is the number of creatures with defender you control.
+        // {2}{U}, {T}: Target player puts the top X cards of their library into their graveyard, where X is the number of creatures with defender you control.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(new PermanentsOnBattlefieldCount(filter)), new ManaCostsImpl("{2}{U}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetPlayer());
diff --git a/Mage.Sets/src/mage/cards/d/DrafnasRestoration.java b/Mage.Sets/src/mage/cards/d/DrafnasRestoration.java
index c767d005047..27b1d26877c 100644
--- a/Mage.Sets/src/mage/cards/d/DrafnasRestoration.java
+++ b/Mage.Sets/src/mage/cards/d/DrafnasRestoration.java
@@ -53,7 +53,7 @@ public class DrafnasRestoration extends CardImpl {
     public DrafnasRestoration(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{U}");
 
-        // Put any number of target artifact cards from target player's graveyard on top of his or her library in any order.
+        // Put any number of target artifact cards from target player's graveyard on top of their library in any order.
         this.getSpellAbility().addEffect(new DrafnasRestorationEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addTarget(new DrafnasRestorationTarget());
@@ -112,7 +112,7 @@ class DrafnasRestorationEffect extends OneShotEffect {
 
     DrafnasRestorationEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Put any number of target artifact cards from target player's graveyard on top of his or her library in any order.";
+        this.staticText = "Put any number of target artifact cards from target player's graveyard on top of their library in any order.";
     }
 
     DrafnasRestorationEffect(final DrafnasRestorationEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/d/DragonMage.java b/Mage.Sets/src/mage/cards/d/DragonMage.java
index f3be571b33d..f40476506b0 100644
--- a/Mage.Sets/src/mage/cards/d/DragonMage.java
+++ b/Mage.Sets/src/mage/cards/d/DragonMage.java
@@ -55,7 +55,7 @@ public class DragonMage extends CardImpl {
 
         // Flying
         this.addAbility(FlyingAbility.getInstance());
-        // Whenever Dragon Mage deals combat damage to a player, each player discards his or her hand and draws seven cards.
+        // Whenever Dragon Mage deals combat damage to a player, each player discards their hand and draws seven cards.
         Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DiscardHandAllEffect(), false);
         Effect effect = new DrawCardAllEffect(7);
         effect.setText("and draws seven cards");
diff --git a/Mage.Sets/src/mage/cards/d/DreadSummons.java b/Mage.Sets/src/mage/cards/d/DreadSummons.java
index c5b7cd45fcd..c948c7bac80 100644
--- a/Mage.Sets/src/mage/cards/d/DreadSummons.java
+++ b/Mage.Sets/src/mage/cards/d/DreadSummons.java
@@ -51,7 +51,7 @@ public class DreadSummons extends CardImpl {
     public DreadSummons(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{B}{B}");
 
-        // Each player puts the top X cards of his or her library into his or her graveyard. For each creature card put into a graveyard this way, you create a tapped 2/2 black Zombie creature token.
+        // Each player puts the top X cards of their library into their graveyard. For each creature card put into a graveyard this way, you create a tapped 2/2 black Zombie creature token.
         getSpellAbility().addEffect(new DreadSummonsEffect());
     }
 
@@ -69,7 +69,7 @@ class DreadSummonsEffect extends OneShotEffect {
 
     public DreadSummonsEffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "Each player puts the top X cards of his or her library into his or her graveyard. For each creature card put into a graveyard this way, you create a tapped 2/2 black Zombie creature token";
+        this.staticText = "Each player puts the top X cards of their library into their graveyard. For each creature card put into a graveyard this way, you create a tapped 2/2 black Zombie creature token";
     }
 
     public DreadSummonsEffect(final DreadSummonsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/d/Dreadwaters.java b/Mage.Sets/src/mage/cards/d/Dreadwaters.java
index dd486664669..b724ee4b587 100644
--- a/Mage.Sets/src/mage/cards/d/Dreadwaters.java
+++ b/Mage.Sets/src/mage/cards/d/Dreadwaters.java
@@ -55,7 +55,7 @@ public class Dreadwaters extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{U}");
 
 
-        // Target player puts the top X cards of his or her library into his or her graveyard, where X is the number of lands you control.
+        // Target player puts the top X cards of their library into their graveyard, where X is the number of lands you control.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(new PermanentsOnBattlefieldCount(filter)));
     }
diff --git a/Mage.Sets/src/mage/cards/d/DreamTwist.java b/Mage.Sets/src/mage/cards/d/DreamTwist.java
index 682025ba8f4..349d310ab32 100644
--- a/Mage.Sets/src/mage/cards/d/DreamTwist.java
+++ b/Mage.Sets/src/mage/cards/d/DreamTwist.java
@@ -46,7 +46,7 @@ public class DreamTwist extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{U}");
 
 
-        // Target player puts the top three cards of his or her library into his or her graveyard.
+        // Target player puts the top three cards of their library into their graveyard.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(3));
 
diff --git a/Mage.Sets/src/mage/cards/d/DreambornMuse.java b/Mage.Sets/src/mage/cards/d/DreambornMuse.java
index d5300baf30b..28c1af6b550 100644
--- a/Mage.Sets/src/mage/cards/d/DreambornMuse.java
+++ b/Mage.Sets/src/mage/cards/d/DreambornMuse.java
@@ -50,9 +50,9 @@ public class DreambornMuse extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
         
-        // At the beginning of each player's upkeep, that player puts the top X cards of his or her library into his or her graveyard, where X is the number of cards in his or her hand.
+        // At the beginning of each player's upkeep, that player puts the top X cards of their library into their graveyard, where X is the number of cards in their hand.
         PutLibraryIntoGraveTargetEffect effect = new PutLibraryIntoGraveTargetEffect(new CardsInTargetPlayerHandCount());
-        effect.setText("that player puts the top X cards of his or her library into his or her graveyard, where X is the number of cards in his or her hand.");
+        effect.setText("that player puts the top X cards of their library into their graveyard, where X is the number of cards in their hand.");
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(effect, TargetController.ANY, false));
         
     }
diff --git a/Mage.Sets/src/mage/cards/d/DrownerInitiate.java b/Mage.Sets/src/mage/cards/d/DrownerInitiate.java
index 8f3fbcc414c..7a984add82f 100644
--- a/Mage.Sets/src/mage/cards/d/DrownerInitiate.java
+++ b/Mage.Sets/src/mage/cards/d/DrownerInitiate.java
@@ -64,7 +64,7 @@ public class DrownerInitiate extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        // Whenever a player casts a blue spell, you may pay {1}. If you do, target player puts the top two cards of his or her library into his or her graveyard.
+        // Whenever a player casts a blue spell, you may pay {1}. If you do, target player puts the top two cards of their library into their graveyard.
         Ability ability = new SpellCastAllTriggeredAbility(new DoIfCostPaid(new PutLibraryIntoGraveTargetEffect(2), new ManaCostsImpl("{1}")), filter, false);
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/d/DrownerOfSecrets.java b/Mage.Sets/src/mage/cards/d/DrownerOfSecrets.java
index aa753174cd8..a34a2c32750 100644
--- a/Mage.Sets/src/mage/cards/d/DrownerOfSecrets.java
+++ b/Mage.Sets/src/mage/cards/d/DrownerOfSecrets.java
@@ -66,7 +66,7 @@ public class DrownerOfSecrets extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(3);
 
-        // Tap an untapped Merfolk you control: Target player puts the top card of his or her library into his or her graveyard.
+        // Tap an untapped Merfolk you control: Target player puts the top card of their library into their graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(1), new TapTargetCost(new TargetControlledPermanent(filter)));
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/d/DubiousChallenge.java b/Mage.Sets/src/mage/cards/d/DubiousChallenge.java
index cd973d7619a..031dfac663f 100644
--- a/Mage.Sets/src/mage/cards/d/DubiousChallenge.java
+++ b/Mage.Sets/src/mage/cards/d/DubiousChallenge.java
@@ -50,7 +50,7 @@ public class DubiousChallenge extends CardImpl {
     public DubiousChallenge(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{G}");
 
-        // Look at the top ten cards of your library, exile up to two creature cards from among them, then shuffle your library. Target opponent may choose one of the exiled cards and put it onto the battlefield under his or her control. Put the rest onto the battlefield under your control.
+        // Look at the top ten cards of your library, exile up to two creature cards from among them, then shuffle your library. Target opponent may choose one of the exiled cards and put it onto the battlefield under their control. Put the rest onto the battlefield under your control.
         getSpellAbility().addEffect(new DubiousChallengeEffect());
         getSpellAbility().addTarget(new TargetOpponent());
         getSpellAbility().addEffect(new DubiousChallengeMoveToBattlefieldEffect());
@@ -71,7 +71,7 @@ class DubiousChallengeEffect extends OneShotEffect {
 
     public DubiousChallengeEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Look at the top ten cards of your library, exile up to two creature cards from among them, then shuffle your library. Target opponent may choose one of the exiled cards and put it onto the battlefield under his or her control. Put the rest onto the battlefield under your control.";
+        this.staticText = "Look at the top ten cards of your library, exile up to two creature cards from among them, then shuffle your library. Target opponent may choose one of the exiled cards and put it onto the battlefield under their control. Put the rest onto the battlefield under your control.";
     }
 
     public DubiousChallengeEffect(final DubiousChallengeEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/d/Duress.java b/Mage.Sets/src/mage/cards/d/Duress.java
index 7df18ee75d7..6e079f5fea3 100644
--- a/Mage.Sets/src/mage/cards/d/Duress.java
+++ b/Mage.Sets/src/mage/cards/d/Duress.java
@@ -54,7 +54,7 @@ public class Duress extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}");
 
 
-        // Target opponent reveals his or her hand. You choose a noncreature, nonland card from it. That player discards that card.
+        // Target opponent reveals their hand. You choose a noncreature, nonland card from it. That player discards that card.
         this.getSpellAbility().addTarget(new TargetOpponent());
         this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(filter));
     }
diff --git a/Mage.Sets/src/mage/cards/d/DuskmantleGuildmage.java b/Mage.Sets/src/mage/cards/d/DuskmantleGuildmage.java
index 9255097c78f..bd25e8347a2 100644
--- a/Mage.Sets/src/mage/cards/d/DuskmantleGuildmage.java
+++ b/Mage.Sets/src/mage/cards/d/DuskmantleGuildmage.java
@@ -68,7 +68,7 @@ public class DuskmantleGuildmage extends CardImpl {
         // {1}{U}{B}: Whenever a card is put into an opponent's graveyard from anywhere this turn, that player loses 1 life.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateDelayedTriggeredAbilityEffect(new CardPutIntoOpponentGraveThisTurn()), new ManaCostsImpl("{1}{U}{B}")));
 
-        // {2}{U}{B}: Target player puts the top two cards of his or her library into his or her graveyard.
+        // {2}{U}{B}: Target player puts the top two cards of their library into their graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), new ManaCostsImpl("{2}{U}{B}"));
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/d/DuskmantleHouseOfShadow.java b/Mage.Sets/src/mage/cards/d/DuskmantleHouseOfShadow.java
index 645e0ff62d6..ad203586de2 100644
--- a/Mage.Sets/src/mage/cards/d/DuskmantleHouseOfShadow.java
+++ b/Mage.Sets/src/mage/cards/d/DuskmantleHouseOfShadow.java
@@ -51,7 +51,7 @@ public class DuskmantleHouseOfShadow extends CardImpl {
 
         // {tap}: Add {C} to your mana pool.
         this.addAbility(new ColorlessManaAbility());
-        // {U}{B}, {tap}: Target player puts the top card of his or her library into his or her graveyard.
+        // {U}{B}, {tap}: Target player puts the top card of their library into their graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(1), new ManaCostsImpl("{U}{B}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetPlayer());
diff --git a/Mage.Sets/src/mage/cards/d/DuskmantleSeer.java b/Mage.Sets/src/mage/cards/d/DuskmantleSeer.java
index 6fd7248a7e7..7a3e93f5d2a 100644
--- a/Mage.Sets/src/mage/cards/d/DuskmantleSeer.java
+++ b/Mage.Sets/src/mage/cards/d/DuskmantleSeer.java
@@ -59,7 +59,7 @@ public class DuskmantleSeer extends CardImpl {
 
         // Flying
         this.addAbility(FlyingAbility.getInstance());
-        // At the beginning of your upkeep, each player reveals the top card of his or her library, loses life equal to that card's converted mana cost, then puts it into his or her hand.
+        // At the beginning of your upkeep, each player reveals the top card of their library, loses life equal to that card's converted mana cost, then puts it into their hand.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DuskmantleSeerEffect(), TargetController.YOU, false, false));
 
     }
@@ -78,7 +78,7 @@ class DuskmantleSeerEffect extends OneShotEffect {
 
     public DuskmantleSeerEffect() {
         super(Outcome.Detriment);
-        this.staticText = "each player reveals the top card of his or her library, loses life equal to that card's converted mana cost, then puts it into his or her hand";
+        this.staticText = "each player reveals the top card of their library, loses life equal to that card's converted mana cost, then puts it into their hand";
     }
 
     public DuskmantleSeerEffect(final DuskmantleSeerEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/d/DwellOnThePast.java b/Mage.Sets/src/mage/cards/d/DwellOnThePast.java
index 0636f84d320..8b03a5b7f9d 100644
--- a/Mage.Sets/src/mage/cards/d/DwellOnThePast.java
+++ b/Mage.Sets/src/mage/cards/d/DwellOnThePast.java
@@ -52,7 +52,7 @@ public class DwellOnThePast extends CardImpl {
     public DwellOnThePast(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{G}");
 
-        // Target player shuffles up to four target cards from his or her graveyard into his or her library.
+        // Target player shuffles up to four target cards from their graveyard into their library.
         this.getSpellAbility().addEffect(new DwellOnThePastEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addTarget(new DwellOnThePastTarget());
@@ -73,7 +73,7 @@ class DwellOnThePastEffect extends OneShotEffect {
 
     public DwellOnThePastEffect() {
         super(Outcome.Neutral);
-        this.staticText = "Target player shuffles up to four target cards from his or her graveyard into his or her library";
+        this.staticText = "Target player shuffles up to four target cards from their graveyard into their library";
     }
 
     public DwellOnThePastEffect(final DwellOnThePastEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/e/EarwigSquad.java b/Mage.Sets/src/mage/cards/e/EarwigSquad.java
index be21434ef18..7d5275dfc59 100644
--- a/Mage.Sets/src/mage/cards/e/EarwigSquad.java
+++ b/Mage.Sets/src/mage/cards/e/EarwigSquad.java
@@ -65,11 +65,11 @@ public class EarwigSquad extends CardImpl {
 
         // Prowl {2}{B}
         this.addAbility(new ProwlAbility(this, "{2}{B}"));
-        // When Earwig Squad enters the battlefield, if its prowl cost was paid, search target opponent's library for three cards and exile them. Then that player shuffles his or her library.
+        // When Earwig Squad enters the battlefield, if its prowl cost was paid, search target opponent's library for three cards and exile them. Then that player shuffles their library.
         EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new EarwigSquadEffect(), false);
         ability.addTarget(new TargetOpponent());
         this.addAbility(new ConditionalTriggeredAbility(ability, ProwlCondition.instance,
-                "When {this} enters the battlefield, if its prowl cost was paid, search target opponent's library for three cards and exile them. Then that player shuffles his or her library."));
+                "When {this} enters the battlefield, if its prowl cost was paid, search target opponent's library for three cards and exile them. Then that player shuffles their library."));
 
     }
 
@@ -87,7 +87,7 @@ class EarwigSquadEffect extends OneShotEffect {
 
     public EarwigSquadEffect() {
         super(Outcome.Benefit);
-        staticText = "search target opponent's library for three cards and exile them. Then that player shuffles his or her library";
+        staticText = "search target opponent's library for three cards and exile them. Then that player shuffles their library";
     }
 
     public EarwigSquadEffect(final EarwigSquadEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/e/EbonbladeReaper.java b/Mage.Sets/src/mage/cards/e/EbonbladeReaper.java
index 5b7458ec08c..ffad79e7639 100644
--- a/Mage.Sets/src/mage/cards/e/EbonbladeReaper.java
+++ b/Mage.Sets/src/mage/cards/e/EbonbladeReaper.java
@@ -58,7 +58,7 @@ public class EbonbladeReaper extends CardImpl {
         //Whenever Ebonblade Reaper attacks, you lose half your life, rounded up.
         this.addAbility(new AttacksTriggeredAbility(new LoseHalfLifeEffect(), false));
 
-        //Whenever Ebonblade Reaper deals combat damage to a player, that player loses half his or her life, rounded up.
+        //Whenever Ebonblade Reaper deals combat damage to a player, that player loses half their life, rounded up.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new LoseHalfLifeTargetEffect(), false, true));
 
         //Morph {3}{B}{B}
diff --git a/Mage.Sets/src/mage/cards/e/ElkinLair.java b/Mage.Sets/src/mage/cards/e/ElkinLair.java
index 861992f6394..e2e36b18e9c 100644
--- a/Mage.Sets/src/mage/cards/e/ElkinLair.java
+++ b/Mage.Sets/src/mage/cards/e/ElkinLair.java
@@ -63,7 +63,7 @@ public class ElkinLair extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}");
         addSuperType(SuperType.WORLD);
 
-        // At the beginning of each player's upkeep, that player exiles a card at random from his or her hand. The player may play that card this turn. At the beginning of the next end step, if the player hasn't played the card, he or she puts it into his or her graveyard.
+        // At the beginning of each player's upkeep, that player exiles a card at random from their hand. The player may play that card this turn. At the beginning of the next end step, if the player hasn't played the card, he or she puts it into their graveyard.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new ElkinLairUpkeepEffect(), TargetController.ANY, false));
 
     }
@@ -83,7 +83,7 @@ class ElkinLairUpkeepEffect extends OneShotEffect {
 
     public ElkinLairUpkeepEffect() {
         super(Outcome.Benefit);
-        this.staticText = "that player exiles a card at random from his or her hand. The player may play that card this turn. At the beginning of the next end step, if the player hasn't played the card, he or she puts it into his or her graveyard";
+        this.staticText = "that player exiles a card at random from their hand. The player may play that card this turn. At the beginning of the next end step, if the player hasn't played the card, he or she puts it into their graveyard";
     }
 
     public ElkinLairUpkeepEffect(final ElkinLairUpkeepEffect effect) {
@@ -159,7 +159,7 @@ class ElkinLairPutIntoGraveyardEffect extends OneShotEffect {
 
     public ElkinLairPutIntoGraveyardEffect() {
         super(Outcome.Neutral);
-        staticText = "if the player hasn't played the card, he or she puts it into his or her graveyard";
+        staticText = "if the player hasn't played the card, he or she puts it into their graveyard";
     }
 
     public ElkinLairPutIntoGraveyardEffect(final ElkinLairPutIntoGraveyardEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/e/ElvishGuidance.java b/Mage.Sets/src/mage/cards/e/ElvishGuidance.java
index bf70650d401..5e13ab5535b 100644
--- a/Mage.Sets/src/mage/cards/e/ElvishGuidance.java
+++ b/Mage.Sets/src/mage/cards/e/ElvishGuidance.java
@@ -65,7 +65,7 @@ public class ElvishGuidance extends CardImpl {
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
 
-        // Whenever enchanted land is tapped for mana, its controller adds {G} to his or her mana pool for each Elf on the battlefield.
+        // Whenever enchanted land is tapped for mana, its controller adds {G} to their mana pool for each Elf on the battlefield.
         this.addAbility(new ElvishGuidanceTriggeredAbility());
     }
 
@@ -107,6 +107,6 @@ class ElvishGuidanceTriggeredAbility extends TriggeredManaAbility {
 
     @Override
     public String getRule() {
-        return "Whenever enchanted land is tapped for mana, its controller adds {G} to his or her mana pool for each Elf on the battlefield.";
+        return "Whenever enchanted land is tapped for mana, its controller adds {G} to their mana pool for each Elf on the battlefield.";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/e/EmbalmersTools.java b/Mage.Sets/src/mage/cards/e/EmbalmersTools.java
index 25059081591..061ad75b68a 100644
--- a/Mage.Sets/src/mage/cards/e/EmbalmersTools.java
+++ b/Mage.Sets/src/mage/cards/e/EmbalmersTools.java
@@ -71,7 +71,7 @@ public class EmbalmersTools extends CardImpl {
         // Activated abilities of creature cards in your graveyard cost {1} less to activate.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new EmbalmersToolsEffect()));
 
-        // Tap an untapped Zombie you control: Target player puts the top card of his or her library into his or her graveyard.
+        // Tap an untapped Zombie you control: Target player puts the top card of their library into their graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(1), new TapTargetCost(new TargetControlledPermanent(filter)));
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/e/EmptyCityRuse.java b/Mage.Sets/src/mage/cards/e/EmptyCityRuse.java
index efdcb8f1f72..5ed1bb030ac 100644
--- a/Mage.Sets/src/mage/cards/e/EmptyCityRuse.java
+++ b/Mage.Sets/src/mage/cards/e/EmptyCityRuse.java
@@ -43,7 +43,7 @@ public class EmptyCityRuse extends CardImpl {
     public EmptyCityRuse(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{W}");
 
-        // Target opponent skips all combat phases of his or her next turn.
+        // Target opponent skips all combat phases of their next turn.
         this.getSpellAbility().addEffect(new SkipNextCombatEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
     }
diff --git a/Mage.Sets/src/mage/cards/e/EmptyTheCatacombs.java b/Mage.Sets/src/mage/cards/e/EmptyTheCatacombs.java
index ce2b9944de8..25c0010ae7f 100644
--- a/Mage.Sets/src/mage/cards/e/EmptyTheCatacombs.java
+++ b/Mage.Sets/src/mage/cards/e/EmptyTheCatacombs.java
@@ -49,7 +49,7 @@ public class EmptyTheCatacombs extends CardImpl {
     public EmptyTheCatacombs(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{B}");
 
-        // Each player returns all creature cards from his or her graveyard to his or her hand.
+        // Each player returns all creature cards from their graveyard to their hand.
         this.getSpellAbility().addEffect(new EmptyTheCatacombsEffect());
     }
 
@@ -69,7 +69,7 @@ class EmptyTheCatacombsEffect extends OneShotEffect {
 
     public EmptyTheCatacombsEffect() {
         super(Outcome.ReturnToHand);
-        staticText = "Each player returns all creature cards from his or her graveyard to his or her hand";
+        staticText = "Each player returns all creature cards from their graveyard to their hand";
     }
 
     public EmptyTheCatacombsEffect(final EmptyTheCatacombsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/e/EmrakulTheAeonsTorn.java b/Mage.Sets/src/mage/cards/e/EmrakulTheAeonsTorn.java
index 1b44456472f..72ebcfcf0d6 100644
--- a/Mage.Sets/src/mage/cards/e/EmrakulTheAeonsTorn.java
+++ b/Mage.Sets/src/mage/cards/e/EmrakulTheAeonsTorn.java
@@ -73,7 +73,7 @@ public class EmrakulTheAeonsTorn extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
         this.addAbility(new ProtectionAbility(filter));
         this.addAbility(new AnnihilatorAbility(6));
-        // When Emrakul is put into a graveyard from anywhere, its owner shuffles his or her graveyard into his or her library.
+        // When Emrakul is put into a graveyard from anywhere, its owner shuffles their graveyard into their library.
         this.addAbility(new PutIntoGraveFromAnywhereSourceTriggeredAbility(new ShuffleIntoLibraryGraveOfSourceOwnerEffect(), false));
     }
 
diff --git a/Mage.Sets/src/mage/cards/e/Encroach.java b/Mage.Sets/src/mage/cards/e/Encroach.java
index 0440368ce29..2eada5bbf98 100644
--- a/Mage.Sets/src/mage/cards/e/Encroach.java
+++ b/Mage.Sets/src/mage/cards/e/Encroach.java
@@ -55,7 +55,7 @@ public class Encroach extends CardImpl {
     public Encroach(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}");
 
-        // Target player reveals his or her hand. You choose a nonbasic land card from it. That player discards that card.
+        // Target player reveals their hand. You choose a nonbasic land card from it. That player discards that card.
         this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(filter));
         this.getSpellAbility().addTarget(new TargetOpponent());
    }
diff --git a/Mage.Sets/src/mage/cards/e/EndlessWhispers.java b/Mage.Sets/src/mage/cards/e/EndlessWhispers.java
index c7976f063ea..282a596fc73 100644
--- a/Mage.Sets/src/mage/cards/e/EndlessWhispers.java
+++ b/Mage.Sets/src/mage/cards/e/EndlessWhispers.java
@@ -58,15 +58,15 @@ public class EndlessWhispers extends CardImpl {
     public EndlessWhispers(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{B}{B}");
 
-        // Each creature has "When this creature dies, choose target opponent. That player puts this card from its owner's graveyard onto the battlefield under his or her control at the beginning of the next end step."
+        // Each creature has "When this creature dies, choose target opponent. That player puts this card from its owner's graveyard onto the battlefield under their control at the beginning of the next end step."
         DelayedTriggeredAbility delayedAbility = new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new ReturnSourceToBattlefieldEffect());
         Effect effect = new CreateDelayedTriggeredAbilityEffect(delayedAbility, true);
-        effect.setText("choose target opponent. That player puts this card from its owner's graveyard onto the battlefield under his or her control at the beginning of the next end step");
+        effect.setText("choose target opponent. That player puts this card from its owner's graveyard onto the battlefield under their control at the beginning of the next end step");
         Ability gainAbility = new DiesTriggeredAbility(effect);
         gainAbility.addTarget(new TargetOpponent());
 
         effect = new GainAbilityAllEffect(gainAbility, Duration.WhileOnBattlefield, new FilterCreaturePermanent("Each creature"));
-        effect.setText("Each creature has \"When this creature dies, choose target opponent. That player puts this card from its owner's graveyard onto the battlefield under his or her control at the beginning of the next end step.\"");
+        effect.setText("Each creature has \"When this creature dies, choose target opponent. That player puts this card from its owner's graveyard onto the battlefield under their control at the beginning of the next end step.\"");
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
 
     }
@@ -85,7 +85,7 @@ class ReturnSourceToBattlefieldEffect extends OneShotEffect {
 
     public ReturnSourceToBattlefieldEffect() {
         super(Outcome.PutCreatureInPlay);
-        staticText = "That player puts this card from its owner's graveyard onto the battlefield under his or her control";
+        staticText = "That player puts this card from its owner's graveyard onto the battlefield under their control";
     }
 
     public ReturnSourceToBattlefieldEffect(final ReturnSourceToBattlefieldEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/e/EnigmaEidolon.java b/Mage.Sets/src/mage/cards/e/EnigmaEidolon.java
index 4a452e0f11b..fe1ad071126 100644
--- a/Mage.Sets/src/mage/cards/e/EnigmaEidolon.java
+++ b/Mage.Sets/src/mage/cards/e/EnigmaEidolon.java
@@ -63,7 +63,7 @@ public class EnigmaEidolon extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        // {U}, Sacrifice Enigma Eidolon: Target player puts the top three cards of his or her library into his or her graveyard.
+        // {U}, Sacrifice Enigma Eidolon: Target player puts the top three cards of their library into their graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(3), new ManaCostsImpl("{U}"));
         ability.addCost(new SacrificeSourceCost());
         ability.addTarget(new TargetPlayer());
diff --git a/Mage.Sets/src/mage/cards/e/EntomberExarch.java b/Mage.Sets/src/mage/cards/e/EntomberExarch.java
index 25654c6fa6d..39bc5429111 100644
--- a/Mage.Sets/src/mage/cards/e/EntomberExarch.java
+++ b/Mage.Sets/src/mage/cards/e/EntomberExarch.java
@@ -64,7 +64,7 @@ public class EntomberExarch extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        // When Entomber Exarch enters the battlefield, choose one - Return target creature card from your graveyard to your hand; or target opponent reveals his or her hand, you choose a noncreature card from it, then that player discards that card.
+        // When Entomber Exarch enters the battlefield, choose one - Return target creature card from your graveyard to your hand; or target opponent reveals their hand, you choose a noncreature card from it, then that player discards that card.
         Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnToHandTargetEffect(), false);
         ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
         Mode mode = new Mode();
@@ -94,7 +94,7 @@ class EntomberExarchEffect extends OneShotEffect {
 
     EntomberExarchEffect() {
         super(Outcome.Discard);
-        staticText = "target opponent reveals his or her hand, you choose a noncreature card from it, then that player discards that card";
+        staticText = "target opponent reveals their hand, you choose a noncreature card from it, then that player discards that card";
     }
 
     EntomberExarchEffect(final EntomberExarchEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/e/Eradicate.java b/Mage.Sets/src/mage/cards/e/Eradicate.java
index cb98686c567..f9be2eeb7ef 100644
--- a/Mage.Sets/src/mage/cards/e/Eradicate.java
+++ b/Mage.Sets/src/mage/cards/e/Eradicate.java
@@ -54,7 +54,7 @@ public class Eradicate extends CardImpl {
 
 
         // Exile target nonblack creature. Search its controller's graveyard, hand, and library for all cards 
-        // with the same name as that creature and exile them. Then that player shuffles his or her library.
+        // with the same name as that creature and exile them. Then that player shuffles their library.
         this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
         this.getSpellAbility().addEffect(new ExileTargetAndSearchGraveyardHandLibraryEffect(false, "its controller's","all cards with the same name as that creature"));
     }
diff --git a/Mage.Sets/src/mage/cards/e/EternalDominion.java b/Mage.Sets/src/mage/cards/e/EternalDominion.java
index 7c7c777d81e..65c5ce05a3e 100644
--- a/Mage.Sets/src/mage/cards/e/EternalDominion.java
+++ b/Mage.Sets/src/mage/cards/e/EternalDominion.java
@@ -56,7 +56,7 @@ public class EternalDominion extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{7}{U}{U}{U}");
 
         // Search target opponent's library for an artifact, creature, enchantment, or land card.
-        // Put that card onto the battlefield under your control. Then that player shuffles his or her library.
+        // Put that card onto the battlefield under your control. Then that player shuffles their library.
         this.getSpellAbility().addEffect(new EternalDominionEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
 
@@ -89,7 +89,7 @@ class EternalDominionEffect extends OneShotEffect {
 
     public EternalDominionEffect() {
         super(Outcome.Benefit);
-        staticText = "Search target opponent's library for an artifact, creature, enchantment, or land card. Put that card onto the battlefield under your control. Then that player shuffles his or her library";
+        staticText = "Search target opponent's library for an artifact, creature, enchantment, or land card. Put that card onto the battlefield under your control. Then that player shuffles their library";
     }
 
     public EternalDominionEffect(final EternalDominionEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/e/Eureka.java b/Mage.Sets/src/mage/cards/e/Eureka.java
index 1eff8b4cc44..54a15765c6f 100644
--- a/Mage.Sets/src/mage/cards/e/Eureka.java
+++ b/Mage.Sets/src/mage/cards/e/Eureka.java
@@ -52,7 +52,7 @@ public class Eureka extends CardImpl {
     public Eureka(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{G}{G}");
 
-        // Starting with you, each player may put a permanent card from his or her hand onto the battlefield. Repeat this process until no one puts a card onto the battlefield.
+        // Starting with you, each player may put a permanent card from their hand onto the battlefield. Repeat this process until no one puts a card onto the battlefield.
         this.getSpellAbility().addEffect(new EurekaEffect());
     }
 
@@ -70,7 +70,7 @@ class EurekaEffect extends OneShotEffect {
 
     public EurekaEffect() {
         super(Outcome.PutCardInPlay);
-        this.staticText = "Starting with you, each player may put a permanent card from his or her hand onto the battlefield. Repeat this process until no one puts a card onto the battlefield";
+        this.staticText = "Starting with you, each player may put a permanent card from their hand onto the battlefield. Repeat this process until no one puts a card onto the battlefield";
     }
 
     public EurekaEffect(final EurekaEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java b/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java
index 0c3440db5e5..3acb479eebb 100644
--- a/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java
+++ b/Mage.Sets/src/mage/cards/e/EvanescentIntellect.java
@@ -61,7 +61,7 @@ public class EvanescentIntellect extends CardImpl {
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
-        // Enchanted creature has "{1}{U}, {T}: Target player puts the top three cards of his or her library into his or her graveyard."
+        // Enchanted creature has "{1}{U}, {T}: Target player puts the top three cards of their library into their graveyard."
         ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutTopCardOfLibraryIntoGraveTargetEffect(3), new ManaCostsImpl("{1}{U}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetPlayer());
diff --git a/Mage.Sets/src/mage/cards/e/Exhaustion.java b/Mage.Sets/src/mage/cards/e/Exhaustion.java
index ef4f7854edd..433513ad02f 100644
--- a/Mage.Sets/src/mage/cards/e/Exhaustion.java
+++ b/Mage.Sets/src/mage/cards/e/Exhaustion.java
@@ -53,7 +53,7 @@ public class Exhaustion extends CardImpl {
     public Exhaustion(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{U}");
 
-        // Creatures and lands target opponent controls don't untap during his or her next untap step.
+        // Creatures and lands target opponent controls don't untap during their next untap step.
         this.getSpellAbility().addEffect(new ExhaustionEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
     }
@@ -78,7 +78,7 @@ class ExhaustionEffect extends OneShotEffect {
 
     ExhaustionEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Creatures and lands target opponent controls don't untap during his or her next untap step.";
+        this.staticText = "Creatures and lands target opponent controls don't untap during their next untap step.";
     }
 
     ExhaustionEffect(final ExhaustionEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/e/Exhume.java b/Mage.Sets/src/mage/cards/e/Exhume.java
index a06a50309e0..c25011621df 100644
--- a/Mage.Sets/src/mage/cards/e/Exhume.java
+++ b/Mage.Sets/src/mage/cards/e/Exhume.java
@@ -51,7 +51,7 @@ public class Exhume extends CardImpl {
     public Exhume(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{B}");
 
-        // Each player puts a creature card from his or her graveyard onto the battlefield.
+        // Each player puts a creature card from their graveyard onto the battlefield.
         this.getSpellAbility().addEffect(new ExhumeEffect());
     }
 
@@ -69,7 +69,7 @@ class ExhumeEffect extends OneShotEffect {
 
     public ExhumeEffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "Each player puts a creature card from his or her graveyard onto the battlefield";
+        this.staticText = "Each player puts a creature card from their graveyard onto the battlefield";
     }
 
     public ExhumeEffect(final ExhumeEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/e/Extirpate.java b/Mage.Sets/src/mage/cards/e/Extirpate.java
index 2e61bbdfbf9..f39c934806d 100644
--- a/Mage.Sets/src/mage/cards/e/Extirpate.java
+++ b/Mage.Sets/src/mage/cards/e/Extirpate.java
@@ -69,7 +69,7 @@ public class Extirpate extends CardImpl {
 
         // Split second
         this.addAbility(new SplitSecondAbility());
-        // Choose target card in a graveyard other than a basic land card. Search its owner's graveyard, hand, and library for all cards with the same name as that card and exile them. Then that player shuffles his or her library.
+        // Choose target card in a graveyard other than a basic land card. Search its owner's graveyard, hand, and library for all cards with the same name as that card and exile them. Then that player shuffles their library.
         this.getSpellAbility().addEffect(new ExtirpateEffect());
         this.getSpellAbility().addTarget(new TargetCardInGraveyard(filter));
     }
@@ -88,7 +88,7 @@ class ExtirpateEffect extends OneShotEffect {
 
     public ExtirpateEffect() {
         super(Outcome.Exile);
-        this.staticText = "Choose target card in a graveyard other than a basic land card. Search its owner's graveyard, hand, and library for any number of cards with the same name as that card and exile them. Then that player shuffles his or her library";
+        this.staticText = "Choose target card in a graveyard other than a basic land card. Search its owner's graveyard, hand, and library for any number of cards with the same name as that card and exile them. Then that player shuffles their library";
     }
 
     public ExtirpateEffect(final ExtirpateEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/e/Extract.java b/Mage.Sets/src/mage/cards/e/Extract.java
index e479aa82daf..4b76fe1387e 100644
--- a/Mage.Sets/src/mage/cards/e/Extract.java
+++ b/Mage.Sets/src/mage/cards/e/Extract.java
@@ -52,7 +52,7 @@ public class Extract extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{U}");
 
 
-        // Search target player's library for a card and exile it. Then that player shuffles his or her library.
+        // Search target player's library for a card and exile it. Then that player shuffles their library.
         this.getSpellAbility().addEffect(new ExtractEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
    
@@ -74,7 +74,7 @@ class ExtractEffect extends OneShotEffect {
 
     public ExtractEffect() {
         super(Outcome.Exile);
-        staticText = "Search target player's library for a card and exile it. Then that player shuffles his or her library.";
+        staticText = "Search target player's library for a card and exile it. Then that player shuffles their library.";
     }
 
     public ExtractEffect(final ExtractEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/e/ExtractFromDarkness.java b/Mage.Sets/src/mage/cards/e/ExtractFromDarkness.java
index 25c170efa4a..32b327b92bf 100644
--- a/Mage.Sets/src/mage/cards/e/ExtractFromDarkness.java
+++ b/Mage.Sets/src/mage/cards/e/ExtractFromDarkness.java
@@ -50,7 +50,7 @@ public class ExtractFromDarkness extends CardImpl {
     public ExtractFromDarkness(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{U}{B}");
 
-        // Each player puts the top two cards of his or her library into his or her graveyard.
+        // Each player puts the top two cards of their library into their graveyard.
         this.getSpellAbility().addEffect(new ExtractFromDarknessMillEffect());
         // Then put a creature card from a graveyard onto the battlefield under your control.
         this.getSpellAbility().addEffect(new ExtractFromDarknessReturnFromGraveyardToBattlefieldEffect());
@@ -70,7 +70,7 @@ class ExtractFromDarknessMillEffect extends OneShotEffect {
 
     ExtractFromDarknessMillEffect() {
         super(Outcome.Detriment);
-        staticText = "Each player puts the top two cards of his or her library into his or her graveyard";
+        staticText = "Each player puts the top two cards of their library into their graveyard";
     }
 
     ExtractFromDarknessMillEffect(final ExtractFromDarknessMillEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/e/ExtractorDemon.java b/Mage.Sets/src/mage/cards/e/ExtractorDemon.java
index 1c4edb67e81..2b93c307d73 100644
--- a/Mage.Sets/src/mage/cards/e/ExtractorDemon.java
+++ b/Mage.Sets/src/mage/cards/e/ExtractorDemon.java
@@ -66,7 +66,7 @@ public class ExtractorDemon extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
 
-        // Whenever another creature leaves the battlefield, you may have target player put the top two cards of his or her library into his or her graveyard.
+        // Whenever another creature leaves the battlefield, you may have target player put the top two cards of their library into their graveyard.
         Ability ability = new LeavesBattlefieldAllTriggeredAbility(new PutLibraryIntoGraveTargetEffect(2), filter, true);
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java b/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java
index d1429c3557e..41353ab4af6 100644
--- a/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java
+++ b/Mage.Sets/src/mage/cards/e/ExtraplanarLens.java
@@ -74,7 +74,7 @@ public class ExtraplanarLens extends CardImpl {
         ability.addTarget(new TargetLandPermanent(filter));
         this.addAbility(ability);
 
-        // Whenever a land with the same name as the exiled card is tapped for mana, its controller adds one mana to his or her mana pool of any type that land produced.
+        // Whenever a land with the same name as the exiled card is tapped for mana, its controller adds one mana to their mana pool of any type that land produced.
         this.addAbility(new ExtraplanarLensTriggeredAbility());
 
     }
diff --git a/Mage.Sets/src/mage/cards/e/EyeOfYawgmoth.java b/Mage.Sets/src/mage/cards/e/EyeOfYawgmoth.java
index 797b38a33ad..54d281fddb8 100644
--- a/Mage.Sets/src/mage/cards/e/EyeOfYawgmoth.java
+++ b/Mage.Sets/src/mage/cards/e/EyeOfYawgmoth.java
@@ -122,7 +122,7 @@ class EyeOfYawgmothEffect extends OneShotEffect {
                 if (card != null) {
                     cards.remove(card);
                     card.moveToZone(Zone.HAND, source.getSourceId(), game, false);
-                    game.informPlayers(source.getSourceObject(game).getIdName() + ": " + controller.getLogName() + " puts " + card.getIdName() + " into his or her hand");
+                    game.informPlayers(source.getSourceObject(game).getIdName() + ": " + controller.getLogName() + " puts " + card.getIdName() + " into their hand");
                 }
             }
             for (UUID cardId : cards) {
diff --git a/Mage.Sets/src/mage/cards/e/EyeSpy.java b/Mage.Sets/src/mage/cards/e/EyeSpy.java
index eaafe553cb8..7c99cc57c64 100644
--- a/Mage.Sets/src/mage/cards/e/EyeSpy.java
+++ b/Mage.Sets/src/mage/cards/e/EyeSpy.java
@@ -43,7 +43,7 @@ public class EyeSpy extends CardImpl {
     public EyeSpy(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{U}");
 
-        // Look at the top card of target player's library. You may put that card into his or her graveyard.
+        // Look at the top card of target player's library. You may put that card into their graveyard.
         this.getSpellAbility().addEffect(new LookLibraryTopCardTargetPlayerEffect(1, true));
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
diff --git a/Mage.Sets/src/mage/cards/f/FallIntoOblivion.java b/Mage.Sets/src/mage/cards/f/FallIntoOblivion.java
new file mode 100644
index 00000000000..212ec99ebb6
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/f/FallIntoOblivion.java
@@ -0,0 +1,38 @@
+package mage.cards.f;
+
+import mage.abilities.effects.common.DestroyTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SuperType;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.SupertypePredicate;
+import mage.target.common.TargetCreaturePermanent;
+
+import java.util.UUID;
+
+public class FallIntoOblivion extends CardImpl {
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonlegendary creature");
+
+    static {
+        filter.add(Predicates.not(new SupertypePredicate(SuperType.LEGENDARY)));
+    }
+
+    public FallIntoOblivion(UUID ownerId, CardSetInfo cardSetInfo){
+        super(ownerId, cardSetInfo, new CardType[] { CardType.INSTANT }, "{1}{B}");
+
+        //destroy target non legendary creature
+        spellAbility.addEffect(new DestroyTargetEffect());
+        spellAbility.addTarget(new TargetCreaturePermanent(filter));
+    }
+
+    public FallIntoOblivion(final FallIntoOblivion fallIntoOblivion){
+        super(fallIntoOblivion);
+    }
+
+    public FallIntoOblivion copy(){
+        return new FallIntoOblivion(this);
+    }
+}
diff --git a/Mage.Sets/src/mage/cards/f/FalsePeace.java b/Mage.Sets/src/mage/cards/f/FalsePeace.java
index fd64288912f..5b1da9a76fe 100644
--- a/Mage.Sets/src/mage/cards/f/FalsePeace.java
+++ b/Mage.Sets/src/mage/cards/f/FalsePeace.java
@@ -43,7 +43,7 @@ public class FalsePeace extends CardImpl {
     public FalsePeace(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{W}");
 
-        // Target player skips all combat phases of his or her next turn.
+        // Target player skips all combat phases of their next turn.
         this.getSpellAbility().addEffect(new SkipNextCombatEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
diff --git a/Mage.Sets/src/mage/cards/f/Fascination.java b/Mage.Sets/src/mage/cards/f/Fascination.java
index 918d07660a1..655625773fc 100644
--- a/Mage.Sets/src/mage/cards/f/Fascination.java
+++ b/Mage.Sets/src/mage/cards/f/Fascination.java
@@ -50,7 +50,7 @@ public class Fascination extends CardImpl {
         // * Each player draws X cards.
         this.getSpellAbility().addEffect(new DrawCardAllEffect(new ManacostVariableValue()));
         
-        // * Each player puts the top X cards of his or her library into his or her graveyard.
+        // * Each player puts the top X cards of their library into their graveyard.
         Mode mode = new Mode();
         mode.getEffects().add(new PutTopCardOfLibraryIntoGraveEachPlayerEffect(new ManacostVariableValue(), TargetController.ANY));
         this.getSpellAbility().addMode(mode);
diff --git a/Mage.Sets/src/mage/cards/f/FathomFeeder.java b/Mage.Sets/src/mage/cards/f/FathomFeeder.java
index ee461bf0b2f..97dbc468d9d 100644
--- a/Mage.Sets/src/mage/cards/f/FathomFeeder.java
+++ b/Mage.Sets/src/mage/cards/f/FathomFeeder.java
@@ -70,7 +70,7 @@ public class FathomFeeder extends CardImpl {
         // Ingest
         this.addAbility(new IngestAbility());
 
-        // {3}{U}{B}: Draw a card. Each opponent exiles the top card of his or her library.
+        // {3}{U}{B}: Draw a card. Each opponent exiles the top card of their library.
         Effect effect = new FathomFeederEffect();
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{3}{U}{B}"));
         ability.addEffect(effect);
@@ -90,7 +90,7 @@ public class FathomFeeder extends CardImpl {
 class FathomFeederEffect extends OneShotEffect {
     public FathomFeederEffect() {
         super(Outcome.Exile);
-        this.staticText = "Each opponent exiles the top card of his or her library";
+        this.staticText = "Each opponent exiles the top card of their library";
     }
 
     public FathomFeederEffect(final FathomFeederEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/f/FertileGround.java b/Mage.Sets/src/mage/cards/f/FertileGround.java
index 057d16697a3..0ffc34f7ddc 100644
--- a/Mage.Sets/src/mage/cards/f/FertileGround.java
+++ b/Mage.Sets/src/mage/cards/f/FertileGround.java
@@ -64,7 +64,7 @@ public class FertileGround extends CardImpl {
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
-        // Whenever enchanted land is tapped for mana, its controller adds one mana of any color to his or her mana pool.
+        // Whenever enchanted land is tapped for mana, its controller adds one mana of any color to their mana pool.
         this.addAbility(new FertileGroundTriggeredAbility());
     }
 
@@ -114,6 +114,6 @@ class FertileGroundTriggeredAbility extends TriggeredManaAbility {
 
     @Override
     public String getRule() {
-        return "Whenever enchanted land is tapped for mana, its controller adds one mana of any color to his or her mana pool";
+        return "Whenever enchanted land is tapped for mana, its controller adds one mana of any color to their mana pool";
     }
 }
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/cards/f/Fertilid.java b/Mage.Sets/src/mage/cards/f/Fertilid.java
index 9f47bf79eb0..4faa9ee5ceb 100644
--- a/Mage.Sets/src/mage/cards/f/Fertilid.java
+++ b/Mage.Sets/src/mage/cards/f/Fertilid.java
@@ -62,7 +62,7 @@ public class Fertilid extends CardImpl {
         // Fertilid enters the battlefield with two +1/+1 counters on it.
         this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance(2)), "with two +1/+1 counters on it"));
         
-        // {1}{G}, Remove a +1/+1 counter from Fertilid: Target player searches his or her library for a basic land card and puts it onto the battlefield tapped. Then that player shuffles his or her library.
+        // {1}{G}, Remove a +1/+1 counter from Fertilid: Target player searches their library for a basic land card and puts it onto the battlefield tapped. Then that player shuffles their library.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, 
                 new SearchLibraryPutInPlayTargetPlayerEffect(new TargetCardInLibrary(StaticFilters.FILTER_BASIC_LAND_CARD), true, true), new ManaCostsImpl("{1}{G}"));
         ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1)));
diff --git a/Mage.Sets/src/mage/cards/f/FieldOfRuin.java b/Mage.Sets/src/mage/cards/f/FieldOfRuin.java
index 93cce26254a..41d74e68b83 100644
--- a/Mage.Sets/src/mage/cards/f/FieldOfRuin.java
+++ b/Mage.Sets/src/mage/cards/f/FieldOfRuin.java
@@ -73,7 +73,7 @@ public class FieldOfRuin extends CardImpl {
         // {T}: Add {C} to your mana pool.
         this.addAbility(new ColorlessManaAbility());
 
-        // {2}, {T}, Sacrifice Field of Ruin: Destroy target nonbasic land an opponent controls. Each player searches his or her library for a basic land card, puts it onto the battlefield, then shuffles his or her library.
+        // {2}, {T}, Sacrifice Field of Ruin: Destroy target nonbasic land an opponent controls. Each player searches their library for a basic land card, puts it onto the battlefield, then shuffles their library.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost());
         ability.addCost(new ManaCostsImpl("{2}"));
         ability.addCost(new SacrificeSourceCost());
@@ -96,7 +96,7 @@ class FieldOfRuinEffect extends OneShotEffect {
 
     FieldOfRuinEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Each player searches his or her library for a basic land card, puts it onto the battlefield, then shuffles his or her library";
+        this.staticText = "Each player searches their library for a basic land card, puts it onto the battlefield, then shuffles their library";
     }
 
     FieldOfRuinEffect(final FieldOfRuinEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/f/FiendOfTheShadows.java b/Mage.Sets/src/mage/cards/f/FiendOfTheShadows.java
index 8e8bc070708..32ce48209b1 100644
--- a/Mage.Sets/src/mage/cards/f/FiendOfTheShadows.java
+++ b/Mage.Sets/src/mage/cards/f/FiendOfTheShadows.java
@@ -71,7 +71,7 @@ public class FiendOfTheShadows extends CardImpl {
         this.toughness = new MageInt(3);
 
         this.addAbility(FlyingAbility.getInstance());
-        // Whenever Fiend of the Shadows deals combat damage to a player, that player exiles a card from his or her hand. You may play that card for as long as it remains exiled.
+        // Whenever Fiend of the Shadows deals combat damage to a player, that player exiles a card from their hand. You may play that card for as long as it remains exiled.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new ExileFromZoneTargetEffect(Zone.HAND, exileId, "Fiend of the Shadows", new FilterCard()), false, true));
         this.addAbility(new SimpleStaticAbility(Zone.ALL, new FiendOfTheShadowsEffect(exileId)));
 
diff --git a/Mage.Sets/src/mage/cards/f/FleetSwallower.java b/Mage.Sets/src/mage/cards/f/FleetSwallower.java
index 7dca9daf933..0b3c83da734 100644
--- a/Mage.Sets/src/mage/cards/f/FleetSwallower.java
+++ b/Mage.Sets/src/mage/cards/f/FleetSwallower.java
@@ -55,7 +55,7 @@ public class FleetSwallower extends CardImpl {
         this.power = new MageInt(6);
         this.toughness = new MageInt(6);
 
-        // Whenever Fleet Swallower attacks, target player puts the top half of his or her library, rounded up, into his or her graveyard.
+        // Whenever Fleet Swallower attacks, target player puts the top half of their library, rounded up, into their graveyard.
         Ability ability = new AttacksTriggeredAbility(new FleetSwallowerEffect(), false);
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
@@ -75,7 +75,7 @@ class FleetSwallowerEffect extends OneShotEffect {
 
     public FleetSwallowerEffect() {
         super(Outcome.Detriment);
-        staticText = "target player puts the top half of his or her library, rounded up, into his or her graveyard";
+        staticText = "target player puts the top half of their library, rounded up, into their graveyard";
     }
 
     public FleetSwallowerEffect(final FleetSwallowerEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/f/FleetingMemories.java b/Mage.Sets/src/mage/cards/f/FleetingMemories.java
index 47577f15e7f..4f97ae8472a 100644
--- a/Mage.Sets/src/mage/cards/f/FleetingMemories.java
+++ b/Mage.Sets/src/mage/cards/f/FleetingMemories.java
@@ -63,7 +63,7 @@ public class FleetingMemories extends CardImpl {
         // When Fleeting Memories enters the battlefield, investigate.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new InvestigateEffect(), false));
 
-        // Whenever you sacrifice a Clue, target player puts the top three cards of his or her graveyard into his or her graveyard.
+        // Whenever you sacrifice a Clue, target player puts the top three cards of their graveyard into their graveyard.
         Ability ability = new FleetingMemoriesTriggeredAbility();
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/f/FlintGolem.java b/Mage.Sets/src/mage/cards/f/FlintGolem.java
index ed99556a940..ee99cfbb37d 100644
--- a/Mage.Sets/src/mage/cards/f/FlintGolem.java
+++ b/Mage.Sets/src/mage/cards/f/FlintGolem.java
@@ -54,7 +54,7 @@ public class FlintGolem extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(3);
 
-        // Whenever Flint Golem becomes blocked, defending player puts the top three cards of his or her library into his or her graveyard.
+        // Whenever Flint Golem becomes blocked, defending player puts the top three cards of their library into their graveyard.
         this.addAbility(new BecomesBlockedByCreatureTriggeredAbility(new FlintGolemEffect(), false));
     }
 
@@ -72,7 +72,7 @@ class FlintGolemEffect extends OneShotEffect {
 
     public FlintGolemEffect() {
         super(Outcome.Detriment);
-        this.staticText = "defending player puts the top three cards of his or her library into his or her graveyard";
+        this.staticText = "defending player puts the top three cards of their library into their graveyard";
     }
 
     public FlintGolemEffect(final FlintGolemEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/f/FoldIntoAether.java b/Mage.Sets/src/mage/cards/f/FoldIntoAether.java
index ae95ec3a706..b5035bb8e56 100644
--- a/Mage.Sets/src/mage/cards/f/FoldIntoAether.java
+++ b/Mage.Sets/src/mage/cards/f/FoldIntoAether.java
@@ -52,7 +52,7 @@ public class FoldIntoAether extends CardImpl {
     public FoldIntoAether(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{U}{U}");
 
-        // Counter target spell. If that spell is countered this way, its controller may put a creature card from his or her hand onto the battlefield.
+        // Counter target spell. If that spell is countered this way, its controller may put a creature card from their hand onto the battlefield.
         this.getSpellAbility().addEffect(new FoldIntoAetherEffect());
         this.getSpellAbility().addTarget(new TargetSpell());
     }
@@ -71,7 +71,7 @@ class FoldIntoAetherEffect extends OneShotEffect {
 
     public FoldIntoAetherEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Counter target spell. If that spell is countered this way, its controller may put a creature card from his or her hand onto the battlefield";
+        this.staticText = "Counter target spell. If that spell is countered this way, its controller may put a creature card from their hand onto the battlefield";
     }
 
     public FoldIntoAetherEffect(final FoldIntoAetherEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/f/ForcemageAdvocate.java b/Mage.Sets/src/mage/cards/f/ForcemageAdvocate.java
index 71579beb725..233ea948eeb 100644
--- a/Mage.Sets/src/mage/cards/f/ForcemageAdvocate.java
+++ b/Mage.Sets/src/mage/cards/f/ForcemageAdvocate.java
@@ -61,9 +61,9 @@ public class ForcemageAdvocate extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);
 
-        // {tap}: Return target card from an opponent's graveyard to his or her hand. Put a +1/+1 counter on target creature.
+        // {tap}: Return target card from an opponent's graveyard to their hand. Put a +1/+1 counter on target creature.
         Effect effect = new ReturnFromGraveyardToHandTargetEffect();
-        effect.setText("Return target card from an opponent's graveyard to his or her hand");
+        effect.setText("Return target card from an opponent's graveyard to their hand");
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost());
 
         effect = new AddCountersTargetEffect(CounterType.P1P1.createInstance());
diff --git a/Mage.Sets/src/mage/cards/f/Foreshadow.java b/Mage.Sets/src/mage/cards/f/Foreshadow.java
index 54db6503045..ce40ddcce69 100644
--- a/Mage.Sets/src/mage/cards/f/Foreshadow.java
+++ b/Mage.Sets/src/mage/cards/f/Foreshadow.java
@@ -53,7 +53,7 @@ public class Foreshadow extends CardImpl {
     public Foreshadow(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{U}");
 
-        // Choose a card name, then target opponent puts the top card of his or her library into his or her graveyard. If that card has the chosen name, you draw a card.
+        // Choose a card name, then target opponent puts the top card of their library into their graveyard. If that card has the chosen name, you draw a card.
         this.getSpellAbility().addEffect(new NameACardEffect(NameACardEffect.TypeOfName.ALL));
         this.getSpellAbility().addEffect(new ForeshadowEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
@@ -77,7 +77,7 @@ class ForeshadowEffect extends OneShotEffect {
 
     public ForeshadowEffect() {
         super(Outcome.DrawCard);
-        this.staticText = ", then target opponent puts the top card of his or her library into his or her graveyard. If that card has the chosen name, you draw a card";
+        this.staticText = ", then target opponent puts the top card of their library into their graveyard. If that card has the chosen name, you draw a card";
     }
 
     public ForeshadowEffect(final ForeshadowEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/f/FrayingSanity.java b/Mage.Sets/src/mage/cards/f/FrayingSanity.java
index 1cfcad7dac1..51251f8dc6d 100644
--- a/Mage.Sets/src/mage/cards/f/FrayingSanity.java
+++ b/Mage.Sets/src/mage/cards/f/FrayingSanity.java
@@ -67,7 +67,7 @@ public class FrayingSanity extends CardImpl {
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
 
-        // At the beginning of each end step, enchanted player puts the top X cards of his or her library into his or her graveyard, where X is the total number of cards put into his or her graveyard from anywhere this turn.
+        // At the beginning of each end step, enchanted player puts the top X cards of their library into their graveyard, where X is the total number of cards put into their graveyard from anywhere this turn.
         this.addAbility(new FrayingSanityTriggeredAbility(), new CardsPutIntoGraveyardWatcher());
 
     }
@@ -109,7 +109,7 @@ class FrayingSanityTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "At the beginning of each end step, enchanted player puts the top X cards of his or her library into his or her graveyard, where X is the total number of cards put into his or her graveyard from anywhere this turn.";
+        return "At the beginning of each end step, enchanted player puts the top X cards of their library into their graveyard, where X is the total number of cards put into their graveyard from anywhere this turn.";
     }
 }
 
diff --git a/Mage.Sets/src/mage/cards/f/FriendlyFire.java b/Mage.Sets/src/mage/cards/f/FriendlyFire.java
index 8176cc73fd2..b2b0af61c47 100644
--- a/Mage.Sets/src/mage/cards/f/FriendlyFire.java
+++ b/Mage.Sets/src/mage/cards/f/FriendlyFire.java
@@ -48,7 +48,7 @@ public class FriendlyFire extends CardImpl {
     public FriendlyFire(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{R}");
 
-        // Target creature's controller reveals a card at random from his or her hand. Friendly Fire deals damage to that creature and that player equal to the revealed card's converted mana cost.
+        // Target creature's controller reveals a card at random from their hand. Friendly Fire deals damage to that creature and that player equal to the revealed card's converted mana cost.
         this.getSpellAbility().addEffect(new FriendlyFireEffect());
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
 
@@ -68,7 +68,7 @@ class FriendlyFireEffect extends OneShotEffect {
 
     public FriendlyFireEffect() {
         super(Outcome.Discard);
-        this.staticText = "Target creature's controller reveals a card at random from his or her hand. {this} deals damage to that creature and that player equal to the revealed card's converted mana cost";
+        this.staticText = "Target creature's controller reveals a card at random from their hand. {this} deals damage to that creature and that player equal to the revealed card's converted mana cost";
     }
 
     public FriendlyFireEffect(final FriendlyFireEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/f/FromTheAshes.java b/Mage.Sets/src/mage/cards/f/FromTheAshes.java
index c0dc644a3cc..ed2d5fa5f1b 100644
--- a/Mage.Sets/src/mage/cards/f/FromTheAshes.java
+++ b/Mage.Sets/src/mage/cards/f/FromTheAshes.java
@@ -56,7 +56,7 @@ public class FromTheAshes extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{R}");
 
 
-        // Destroy all nonbasic lands. For each land destroyed this way, its controller may search his or her library for a basic land card and put it onto the battlefield. Then each player who searched his or her library this way shuffles it.
+        // Destroy all nonbasic lands. For each land destroyed this way, its controller may search their library for a basic land card and put it onto the battlefield. Then each player who searched their library this way shuffles it.
         this.getSpellAbility().addEffect(new FromTheAshesEffect());
     }
 
@@ -76,7 +76,7 @@ class FromTheAshesEffect extends OneShotEffect {
 
     public FromTheAshesEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Destroy all nonbasic lands. For each land destroyed this way, its controller may search his or her library for a basic land card and put it onto the battlefield. Then each player who searched his or her library this way shuffles it";
+        this.staticText = "Destroy all nonbasic lands. For each land destroyed this way, its controller may search their library for a basic land card and put it onto the battlefield. Then each player who searched their library this way shuffles it";
     }
 
     public FromTheAshesEffect(final FromTheAshesEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/g/GaeasBlessing.java b/Mage.Sets/src/mage/cards/g/GaeasBlessing.java
index a29262fff65..b8aca7aab13 100644
--- a/Mage.Sets/src/mage/cards/g/GaeasBlessing.java
+++ b/Mage.Sets/src/mage/cards/g/GaeasBlessing.java
@@ -54,7 +54,7 @@ public class GaeasBlessing extends CardImpl {
     public GaeasBlessing(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{G}");
 
-        // Target player shuffles up to three target cards from his or her graveyard into his or her library.
+        // Target player shuffles up to three target cards from their graveyard into their library.
         this.getSpellAbility().addEffect(new GaeasBlessingEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addTarget(new GaeasBlessingTarget());
@@ -80,7 +80,7 @@ class GaeasBlessingEffect extends OneShotEffect {
 
     public GaeasBlessingEffect() {
         super(Outcome.Neutral);
-        this.staticText = "Target player shuffles up to three target cards from his or her graveyard into his or her library";
+        this.staticText = "Target player shuffles up to three target cards from their graveyard into their library";
     }
 
     public GaeasBlessingEffect(final GaeasBlessingEffect effect) {
@@ -181,7 +181,7 @@ class GaeasBlessingGraveToLibraryEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         if (controller != null) {
-            game.informPlayers(new StringBuilder(controller.getLogName()).append(" shuffle his or her graveyard into his or her library").toString());
+            game.informPlayers(new StringBuilder(controller.getLogName()).append(" shuffle their graveyard into their library").toString());
             for (Card card : controller.getGraveyard().getCards(game)) {
                 controller.moveCardToLibraryWithInfo(card, source.getSourceId(), game, Zone.GRAVEYARD, true, true);
             }
diff --git a/Mage.Sets/src/mage/cards/g/GamePreserve.java b/Mage.Sets/src/mage/cards/g/GamePreserve.java
index 300ed6a40a6..dac389ec190 100644
--- a/Mage.Sets/src/mage/cards/g/GamePreserve.java
+++ b/Mage.Sets/src/mage/cards/g/GamePreserve.java
@@ -53,7 +53,7 @@ public class GamePreserve extends CardImpl {
     public GamePreserve(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{G}");
 
-        // At the beginning of your upkeep, each player reveals the top card of his or her library. If all cards revealed this way are creature cards, put those cards onto the battlefield under their owners' control.
+        // At the beginning of your upkeep, each player reveals the top card of their library. If all cards revealed this way are creature cards, put those cards onto the battlefield under their owners' control.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DuskmarEffect(), TargetController.YOU, false));
     }
 
@@ -71,7 +71,7 @@ class DuskmarEffect extends OneShotEffect {
 
     public DuskmarEffect() {
         super(Outcome.Detriment);
-        this.staticText = "each player reveals the top card of his or her library. If all cards revealed this way are creature cards, put those cards onto the battlefield under their owners' control";
+        this.staticText = "each player reveals the top card of their library. If all cards revealed this way are creature cards, put those cards onto the battlefield under their owners' control";
     }
 
     public DuskmarEffect(final DuskmarEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/g/GateToTheAether.java b/Mage.Sets/src/mage/cards/g/GateToTheAether.java
index 3bc32a36357..928989adb57 100644
--- a/Mage.Sets/src/mage/cards/g/GateToTheAether.java
+++ b/Mage.Sets/src/mage/cards/g/GateToTheAether.java
@@ -51,7 +51,7 @@ public class GateToTheAether extends CardImpl {
     public GateToTheAether(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}");
 
-        // At the beginning of each player's upkeep, that player reveals the top card of his or her library. If it's an artifact, creature, enchantment, or land card, the player may put it onto the battlefield.
+        // At the beginning of each player's upkeep, that player reveals the top card of their library. If it's an artifact, creature, enchantment, or land card, the player may put it onto the battlefield.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new GateToTheAetherEffect(), TargetController.ANY, false, true));
     }
 
@@ -69,7 +69,7 @@ class GateToTheAetherEffect extends OneShotEffect {
 
     GateToTheAetherEffect() {
         super(Outcome.PutCardInPlay);
-        this.staticText = "that player reveals the top card of his or her library. If it's an artifact, creature, enchantment, or land card, the player may put it onto the battlefield";
+        this.staticText = "that player reveals the top card of their library. If it's an artifact, creature, enchantment, or land card, the player may put it onto the battlefield";
     }
 
     GateToTheAetherEffect(final GateToTheAetherEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/g/GauntletOfMight.java b/Mage.Sets/src/mage/cards/g/GauntletOfMight.java
index c97a9926862..71015c0bd1a 100644
--- a/Mage.Sets/src/mage/cards/g/GauntletOfMight.java
+++ b/Mage.Sets/src/mage/cards/g/GauntletOfMight.java
@@ -63,9 +63,9 @@ public class GauntletOfMight extends CardImpl {
         // Red creatures get +1/+1.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false)));  
         
-        // Whenever a Mountain is tapped for mana, its controller adds {R} to his or her mana pool.
-        ManaEffect effect = new AddManaToManaPoolTargetControllerEffect(new Mana(ColoredManaSymbol.R), "his or her");
-        effect.setText("its controller adds {R} to his or her mana pool");
+        // Whenever a Mountain is tapped for mana, its controller adds {R} to their mana pool.
+        ManaEffect effect = new AddManaToManaPoolTargetControllerEffect(new Mana(ColoredManaSymbol.R), "their");
+        effect.setText("its controller adds {R} to their mana pool");
         this.addAbility(new TapForManaAllTriggeredManaAbility(
                 effect, filterMountain, SetTargetPointer.PLAYER));        
     }
diff --git a/Mage.Sets/src/mage/cards/g/GauntletOfPower.java b/Mage.Sets/src/mage/cards/g/GauntletOfPower.java
index 5935b6b410a..16aefb95014 100644
--- a/Mage.Sets/src/mage/cards/g/GauntletOfPower.java
+++ b/Mage.Sets/src/mage/cards/g/GauntletOfPower.java
@@ -73,7 +73,7 @@ public class GauntletOfPower extends CardImpl {
         // Creatures of the chosen color get +1/+1.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GauntletOfPowerEffect1()));
 
-        // Whenever a basic land is tapped for mana of the chosen color, its controller adds one mana of that color to his or her mana pool.
+        // Whenever a basic land is tapped for mana of the chosen color, its controller adds one mana of that color to their mana pool.
         this.addAbility(new TapForManaAllTriggeredAbility(new GauntletOfPowerEffectEffect2(), filter, SetTargetPointer.PERMANENT));
     }
 
@@ -198,7 +198,7 @@ class GauntletOfPowerEffectEffect2 extends ManaEffect {
 
     public GauntletOfPowerEffectEffect2() {
         super();
-        staticText = "its controller adds one mana of that color to his or her mana pool";
+        staticText = "its controller adds one mana of that color to their mana pool";
     }
 
     public GauntletOfPowerEffectEffect2(final GauntletOfPowerEffectEffect2 effect) {
diff --git a/Mage.Sets/src/mage/cards/g/GeralfsMindcrusher.java b/Mage.Sets/src/mage/cards/g/GeralfsMindcrusher.java
index 90795de2a1d..887be7754ea 100644
--- a/Mage.Sets/src/mage/cards/g/GeralfsMindcrusher.java
+++ b/Mage.Sets/src/mage/cards/g/GeralfsMindcrusher.java
@@ -53,7 +53,7 @@ public class GeralfsMindcrusher extends CardImpl {
         this.power = new MageInt(5);
         this.toughness = new MageInt(5);
 
-        // When Geralf's Mindcrusher enters the battlefield, target player puts the top five cards of his or her library into his or her graveyard.
+        // When Geralf's Mindcrusher enters the battlefield, target player puts the top five cards of their library into their graveyard.
         Ability ability = new EntersBattlefieldTriggeredAbility(new PutLibraryIntoGraveTargetEffect(5));
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/g/GethLordOfTheVault.java b/Mage.Sets/src/mage/cards/g/GethLordOfTheVault.java
index e375d2631d1..68f470108bf 100644
--- a/Mage.Sets/src/mage/cards/g/GethLordOfTheVault.java
+++ b/Mage.Sets/src/mage/cards/g/GethLordOfTheVault.java
@@ -74,7 +74,7 @@ public class GethLordOfTheVault extends CardImpl {
         // Intimidate
         this.addAbility(IntimidateAbility.getInstance());
         // {X}{B}: Put target artifact or creature card with converted mana cost X from an opponent's graveyard onto the battlefield under your control tapped.
-        // Then that player puts the top X cards of his or her library into his or her graveyard.
+        // Then that player puts the top X cards of their library into their graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GethLordOfTheVaultEffect(), new ManaCostsImpl("{X}{B}"));
         ability.setTargetAdjustment(TargetAdjustment.X_CMC_EQUAL_GY_CARD);
         ability.addTarget(new TargetCardInOpponentsGraveyard(filter));
@@ -96,7 +96,7 @@ class GethLordOfTheVaultEffect extends OneShotEffect {
 
     public GethLordOfTheVaultEffect() {
         super(Outcome.Benefit);
-        staticText = "Put target artifact or creature card with converted mana cost X from an opponent's graveyard onto the battlefield under your control tapped. Then that player puts the top X cards of his or her library into his or her graveyard";
+        staticText = "Put target artifact or creature card with converted mana cost X from an opponent's graveyard onto the battlefield under your control tapped. Then that player puts the top X cards of their library into their graveyard";
     }
 
     public GethLordOfTheVaultEffect(final GethLordOfTheVaultEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/g/GhastlordOfFugue.java b/Mage.Sets/src/mage/cards/g/GhastlordOfFugue.java
index 077fff3119f..208a72e2590 100644
--- a/Mage.Sets/src/mage/cards/g/GhastlordOfFugue.java
+++ b/Mage.Sets/src/mage/cards/g/GhastlordOfFugue.java
@@ -65,7 +65,7 @@ public class GhastlordOfFugue extends CardImpl {
         // Ghastlord of Fugue can't be blocked.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeBlockedSourceEffect(Duration.WhileOnBattlefield)));
 
-        // Whenever Ghastlord of Fugue deals combat damage to a player, that player reveals his or her hand. You choose a card from it. That player exiles that card.
+        // Whenever Ghastlord of Fugue deals combat damage to a player, that player reveals their hand. You choose a card from it. That player exiles that card.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new GhastlordOfFugueEffect(), false, true));
 
     }
@@ -84,7 +84,7 @@ class GhastlordOfFugueEffect extends OneShotEffect {
 
     public GhastlordOfFugueEffect() {
         super(Outcome.Benefit);
-        staticText = "that player reveals his or her hand. You choose a card from it. That player exiles that card";
+        staticText = "that player reveals their hand. You choose a card from it. That player exiles that card";
     }
 
     public GhastlordOfFugueEffect(final GhastlordOfFugueEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/g/GhirapurOrrery.java b/Mage.Sets/src/mage/cards/g/GhirapurOrrery.java
index d7bc2c7851c..b338b9254c3 100644
--- a/Mage.Sets/src/mage/cards/g/GhirapurOrrery.java
+++ b/Mage.Sets/src/mage/cards/g/GhirapurOrrery.java
@@ -53,7 +53,7 @@ public class GhirapurOrrery extends CardImpl {
     public GhirapurOrrery(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}");
 
-        // Each player may play an additional land on each of his or her turns.
+        // Each player may play an additional land on each of their turns.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayAdditionalLandsAllEffect()));
 
         // At the beginning of each player's upkeep, if that player has no cards in hand, that player draws three cards.
diff --git a/Mage.Sets/src/mage/cards/g/GhostQuarter.java b/Mage.Sets/src/mage/cards/g/GhostQuarter.java
index 8265a15ee67..745084db65b 100644
--- a/Mage.Sets/src/mage/cards/g/GhostQuarter.java
+++ b/Mage.Sets/src/mage/cards/g/GhostQuarter.java
@@ -60,7 +60,7 @@ public class GhostQuarter extends CardImpl {
 
         // {T}: Add {C} to your mana pool.
         this.addAbility(new ColorlessManaAbility());
-        // {T}, Sacrifice Ghost Quarter: Destroy target land. Its controller may search his or her library for a basic land card, put it onto the battlefield, then shuffle his or her library.
+        // {T}, Sacrifice Ghost Quarter: Destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield, then shuffle their library.
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
         ability.addTarget(new TargetLandPermanent());
@@ -82,7 +82,7 @@ class GhostQuarterEffect extends OneShotEffect {
 
     public GhostQuarterEffect() {
         super(Outcome.PutLandInPlay);
-        this.staticText = "Its controller may search his or her library for a basic land card, put it onto the battlefield, then shuffle his or her library";
+        this.staticText = "Its controller may search their library for a basic land card, put it onto the battlefield, then shuffle their library";
     }
 
     public GhostQuarterEffect(final GhostQuarterEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/g/GhoulcallersBell.java b/Mage.Sets/src/mage/cards/g/GhoulcallersBell.java
index 8097d38fe13..b8660e8464a 100644
--- a/Mage.Sets/src/mage/cards/g/GhoulcallersBell.java
+++ b/Mage.Sets/src/mage/cards/g/GhoulcallersBell.java
@@ -51,7 +51,7 @@ public class GhoulcallersBell extends CardImpl {
     public GhoulcallersBell(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}");
 
-        // {tap}: Each player puts the top card of his or her library into his or her graveyard.
+        // {tap}: Each player puts the top card of their library into their graveyard.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GhoulcallersBellEffect(), new TapSourceCost()));
     }
 
@@ -69,7 +69,7 @@ class GhoulcallersBellEffect extends OneShotEffect {
 
     public GhoulcallersBellEffect() {
         super(Outcome.Discard);
-        this.staticText = "Each player puts the top card of his or her library into his or her graveyard";
+        this.staticText = "Each player puts the top card of their library into their graveyard";
     }
 
     public GhoulcallersBellEffect(final GhoulcallersBellEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/g/GlassAsp.java b/Mage.Sets/src/mage/cards/g/GlassAsp.java
index acca910b0e9..d94adad68f8 100644
--- a/Mage.Sets/src/mage/cards/g/GlassAsp.java
+++ b/Mage.Sets/src/mage/cards/g/GlassAsp.java
@@ -51,10 +51,10 @@ public class GlassAsp extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);
 
-        // Whenever Glass Asp deals combat damage to a player, that player loses 2 life at the beginning of his or her next draw step unless he or she pays {2} before that step.
+        // Whenever Glass Asp deals combat damage to a player, that player loses 2 life at the beginning of their next draw step unless he or she pays {2} before that step.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new UnlessPaysDelayedEffect(
                 new ManaCostsImpl("{2}"), new LoseLifeTargetEffect(2), PhaseStep.DRAW, true,
-                "that player loses 2 life at the beginning of his or her next draw step unless he or she pays {2} before that draw step."),
+                "that player loses 2 life at the beginning of their next draw step unless he or she pays {2} before that draw step."),
                 false, true));
     }
 
diff --git a/Mage.Sets/src/mage/cards/g/GlimpseTheUnthinkable.java b/Mage.Sets/src/mage/cards/g/GlimpseTheUnthinkable.java
index e91c2f54b6e..313a6a82397 100644
--- a/Mage.Sets/src/mage/cards/g/GlimpseTheUnthinkable.java
+++ b/Mage.Sets/src/mage/cards/g/GlimpseTheUnthinkable.java
@@ -44,7 +44,7 @@ public class GlimpseTheUnthinkable extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{U}{B}");
 
 
-        // Target player puts the top ten cards of his or her library into his or her graveyard.
+        // Target player puts the top ten cards of their library into their graveyard.
         this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(10));
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
diff --git a/Mage.Sets/src/mage/cards/g/GoblinGame.java b/Mage.Sets/src/mage/cards/g/GoblinGame.java
index 5c58cafc2f1..0c84c9199aa 100644
--- a/Mage.Sets/src/mage/cards/g/GoblinGame.java
+++ b/Mage.Sets/src/mage/cards/g/GoblinGame.java
@@ -49,8 +49,8 @@ public class GoblinGame extends CardImpl {
     public GoblinGame(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{5}{R}{R}");
 
-        // Each player hides at least one item, then all players reveal them simultaneously. Each player loses life equal to the number of items he or she revealed. The player who revealed the fewest items then loses half his or her life, rounded up. If two or more players are tied for fewest, each loses half his or her life, rounded up.
-        // Reinterpreted as: Each player secretly chooses a number greater than 0. Then those numbers are revealed. Each player loses life equal to his or her chosen number. The player who revealed the lowest number then loses half his or her life, rounded up. If two or more players are tied for lowest, each loses half his or her life, rounded up.
+        // Each player hides at least one item, then all players reveal them simultaneously. Each player loses life equal to the number of items he or she revealed. The player who revealed the fewest items then loses half their life, rounded up. If two or more players are tied for fewest, each loses half their life, rounded up.
+        // Reinterpreted as: Each player secretly chooses a number greater than 0. Then those numbers are revealed. Each player loses life equal to their chosen number. The player who revealed the lowest number then loses half their life, rounded up. If two or more players are tied for lowest, each loses half their life, rounded up.
         this.getSpellAbility().addEffect(new GoblinGameEffect());
 
     }
@@ -69,7 +69,7 @@ class GoblinGameEffect extends OneShotEffect {
 
     public GoblinGameEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Each player hides at least one item, then all players reveal them simultaneously. Each player loses life equal to the number of items he or she revealed. The player who revealed the fewest items then loses half his or her life, rounded up. If two or more players are tied for fewest, each loses half his or her life, rounded up.";
+        this.staticText = "Each player hides at least one item, then all players reveal them simultaneously. Each player loses life equal to the number of items he or she revealed. The player who revealed the fewest items then loses half their life, rounded up. If two or more players are tied for fewest, each loses half their life, rounded up.";
     }
 
     public GoblinGameEffect(final GoblinGameEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/g/GoblinGuide.java b/Mage.Sets/src/mage/cards/g/GoblinGuide.java
index 29d74310545..c2828ae1883 100644
--- a/Mage.Sets/src/mage/cards/g/GoblinGuide.java
+++ b/Mage.Sets/src/mage/cards/g/GoblinGuide.java
@@ -62,8 +62,8 @@ public class GoblinGuide extends CardImpl {
 
         // Haste
         this.addAbility(HasteAbility.getInstance());
-        // Whenever Goblin Guide attacks, defending player reveals the top card of his or her library.
-        // If it's a land card, that player puts it into his or her hand.
+        // Whenever Goblin Guide attacks, defending player reveals the top card of their library.
+        // If it's a land card, that player puts it into their hand.
         this.addAbility(new GoblinGuideTriggeredAbility(new GoblinGuideEffect(), false));
     }
 
@@ -135,7 +135,7 @@ class GoblinGuideEffect extends OneShotEffect {
 
     public GoblinGuideEffect() {
         super(Outcome.DrawCard);
-        staticText = "defending player reveals the top card of his or her library. If it's a land card, that player puts it into his or her hand";
+        staticText = "defending player reveals the top card of their library. If it's a land card, that player puts it into their hand";
     }
 
     public GoblinGuideEffect(final GoblinGuideEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/g/GraveBirthing.java b/Mage.Sets/src/mage/cards/g/GraveBirthing.java
index 20691bfe40f..c839dff2723 100644
--- a/Mage.Sets/src/mage/cards/g/GraveBirthing.java
+++ b/Mage.Sets/src/mage/cards/g/GraveBirthing.java
@@ -59,7 +59,7 @@ public class GraveBirthing extends CardImpl {
         // Devoid
         this.addAbility(new DevoidAbility(this.color));
 
-        // Target opponent exiles a card from his or her graveyard. You create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
+        // Target opponent exiles a card from their graveyard. You create a 1/1 colorless Eldrazi Scion creature token. It has "Sacrifice this creature: Add {C} to your mana pool."
         this.getSpellAbility().addEffect(new GraveBirthingEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
         Effect effect = new CreateTokenEffect(new EldraziScionToken());
@@ -82,7 +82,7 @@ class GraveBirthingEffect extends OneShotEffect {
 
     public GraveBirthingEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Target opponent exiles a card from his or her graveyard";
+        this.staticText = "Target opponent exiles a card from their graveyard";
     }
 
     public GraveBirthingEffect(final GraveBirthingEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/g/GraveSifter.java b/Mage.Sets/src/mage/cards/g/GraveSifter.java
index c60fe13164d..a82a56f7f75 100644
--- a/Mage.Sets/src/mage/cards/g/GraveSifter.java
+++ b/Mage.Sets/src/mage/cards/g/GraveSifter.java
@@ -63,7 +63,7 @@ public class GraveSifter extends CardImpl {
         this.power = new MageInt(5);
         this.toughness = new MageInt(7);
 
-        // When Grave Sifter enters the battlefield, each player chooses a creature type and returns any number of cards of that type from his or her graveyard to his or her hand.
+        // When Grave Sifter enters the battlefield, each player chooses a creature type and returns any number of cards of that type from their graveyard to their hand.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new GraveSifterEffect(), false));
     }
 
@@ -81,7 +81,7 @@ class GraveSifterEffect extends OneShotEffect {
 
     public GraveSifterEffect() {
         super(Outcome.ReturnToHand);
-        this.staticText = "each player chooses a creature type and returns any number of cards of that type from his or her graveyard to his or her hand";
+        this.staticText = "each player chooses a creature type and returns any number of cards of that type from their graveyard to their hand";
     }
 
     public GraveSifterEffect(final GraveSifterEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/g/Gravestorm.java b/Mage.Sets/src/mage/cards/g/Gravestorm.java
index 179d78d76f8..34975f9b4e4 100644
--- a/Mage.Sets/src/mage/cards/g/Gravestorm.java
+++ b/Mage.Sets/src/mage/cards/g/Gravestorm.java
@@ -54,7 +54,7 @@ public class Gravestorm extends CardImpl {
     public Gravestorm(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{B}{B}{B}");
 
-        // At the beginning of your upkeep, target opponent may exile a card from his or her graveyard. If that player doesn't, you may draw a card.
+        // At the beginning of your upkeep, target opponent may exile a card from their graveyard. If that player doesn't, you may draw a card.
         Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new GravestormEffect(), TargetController.YOU, false);
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
@@ -74,7 +74,7 @@ class GravestormEffect extends OneShotEffect {
 
     public GravestormEffect() {
         super(Outcome.Exile);
-        this.staticText = "At the beginning of your upkeep, target opponent may exile a card from his or her graveyard. If that player doesn't, you may draw a card.";
+        this.staticText = "At the beginning of your upkeep, target opponent may exile a card from their graveyard. If that player doesn't, you may draw a card.";
     }
 
     public GravestormEffect(final GravestormEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/g/GraveyardShovel.java b/Mage.Sets/src/mage/cards/g/GraveyardShovel.java
index 7c633111f80..c210c8e3fae 100644
--- a/Mage.Sets/src/mage/cards/g/GraveyardShovel.java
+++ b/Mage.Sets/src/mage/cards/g/GraveyardShovel.java
@@ -53,7 +53,7 @@ public class GraveyardShovel extends CardImpl {
     public GraveyardShovel(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}");
 
-        // {2}, {tap}: Target player exiles a card from his or her graveyard. If it's a creature card, you gain 2 life.
+        // {2}, {tap}: Target player exiles a card from their graveyard. If it's a creature card, you gain 2 life.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GraveyardShovelEffect(), new GenericManaCost(2));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetPlayer());
@@ -74,7 +74,7 @@ class GraveyardShovelEffect extends OneShotEffect {
 
     public GraveyardShovelEffect() {
         super(Outcome.Exile);
-        this.staticText = "Target player exiles a card from his or her graveyard. If it's a creature card, you gain 2 life";
+        this.staticText = "Target player exiles a card from their graveyard. If it's a creature card, you gain 2 life";
     }
 
     public GraveyardShovelEffect(final GraveyardShovelEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/g/Grindclock.java b/Mage.Sets/src/mage/cards/g/Grindclock.java
index 8a3acf2e2c8..05b1c6f1860 100644
--- a/Mage.Sets/src/mage/cards/g/Grindclock.java
+++ b/Mage.Sets/src/mage/cards/g/Grindclock.java
@@ -74,7 +74,7 @@ class GrindclockEffect extends OneShotEffect {
 
     public GrindclockEffect() {
         super(Outcome.Detriment);
-        staticText = "Target player puts the top X cards of his or her library into his or her graveyard, where X is the number of charge counters on {this}";
+        staticText = "Target player puts the top X cards of their library into their graveyard, where X is the number of charge counters on {this}";
     }
 
     public GrindclockEffect(final GrindclockEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/g/GrindingStation.java b/Mage.Sets/src/mage/cards/g/GrindingStation.java
index 2c857df7ebe..d28abc6b129 100644
--- a/Mage.Sets/src/mage/cards/g/GrindingStation.java
+++ b/Mage.Sets/src/mage/cards/g/GrindingStation.java
@@ -59,7 +59,7 @@ public class GrindingStation extends CardImpl {
     public GrindingStation(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}");
 
-        // {T}, Sacrifice an artifact: Target player puts the top three cards of his or her library into his or her graveyard.
+        // {T}, Sacrifice an artifact: Target player puts the top three cards of their library into their graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutTopCardOfLibraryIntoGraveTargetEffect(3), new TapSourceCost());
         ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter)));
         ability.addTarget(new TargetPlayer());
diff --git a/Mage.Sets/src/mage/cards/g/Grindstone.java b/Mage.Sets/src/mage/cards/g/Grindstone.java
index 63d1753048d..71721e12284 100644
--- a/Mage.Sets/src/mage/cards/g/Grindstone.java
+++ b/Mage.Sets/src/mage/cards/g/Grindstone.java
@@ -50,7 +50,7 @@ public class Grindstone extends CardImpl {
     public Grindstone(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}");
 
-        // {3}, {T}: Target player puts the top two cards of his or her library into his or her graveyard. If both cards share a color, repeat this process.
+        // {3}, {T}: Target player puts the top two cards of their library into their graveyard. If both cards share a color, repeat this process.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GrindstoneEffect(), new ManaCostsImpl("{3}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetPlayer());
@@ -72,7 +72,7 @@ class GrindstoneEffect extends OneShotEffect {
 
     public GrindstoneEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Target player puts the top two cards of his or her library into his or her graveyard. If both cards share a color, repeat this process";
+        this.staticText = "Target player puts the top two cards of their library into their graveyard. If both cards share a color, repeat this process";
     }
 
     public GrindstoneEffect(final GrindstoneEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/g/GrinningTotem.java b/Mage.Sets/src/mage/cards/g/GrinningTotem.java
index 6516baa043a..a9909d8916c 100644
--- a/Mage.Sets/src/mage/cards/g/GrinningTotem.java
+++ b/Mage.Sets/src/mage/cards/g/GrinningTotem.java
@@ -62,7 +62,7 @@ public class GrinningTotem extends CardImpl {
     public GrinningTotem(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}");
 
-        // {2}, {tap}, Sacrifice Grinning Totem: Search target opponent's library for a card and exile it. Then that player shuffles his or her library.
+        // {2}, {tap}, Sacrifice Grinning Totem: Search target opponent's library for a card and exile it. Then that player shuffles their library.
         // Until the beginning of your next upkeep, you may play that card.
         // At the beginning of your next upkeep, if you haven't played it, put it into its owner's graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GrinningTotemSearchAndExileEffect(), new ManaCostsImpl("{2}"));
@@ -86,7 +86,7 @@ class GrinningTotemSearchAndExileEffect extends OneShotEffect {
 
     public GrinningTotemSearchAndExileEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Search target opponent's library for a card and exile it. Then that player shuffles his or her library. " +
+        this.staticText = "Search target opponent's library for a card and exile it. Then that player shuffles their library. " +
                 "Until the beginning of your next upkeep, you may play that card. " +
                 "At the beginning of your next upkeep, if you haven't played it, put it into its owner's graveyard";
     }
diff --git a/Mage.Sets/src/mage/cards/g/GrislySpectacle.java b/Mage.Sets/src/mage/cards/g/GrislySpectacle.java
index be461dde636..fddca207aeb 100644
--- a/Mage.Sets/src/mage/cards/g/GrislySpectacle.java
+++ b/Mage.Sets/src/mage/cards/g/GrislySpectacle.java
@@ -61,7 +61,7 @@ public class GrislySpectacle extends CardImpl {
     public GrislySpectacle(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{B}{B}");
 
-        // Destroy target nonartifact creature. Its controller puts a number of cards equal to that creature's power from the top of his or her library into his or her graveyard.
+        // Destroy target nonartifact creature. Its controller puts a number of cards equal to that creature's power from the top of their library into their graveyard.
         this.getSpellAbility().addEffect(new DestroyTargetEffect());
         this.getSpellAbility().addEffect(new GrislySpectacleEffect());
         this.getSpellAbility().addTarget(new TargetPermanent(filter));
@@ -81,7 +81,7 @@ class GrislySpectacleEffect extends OneShotEffect {
 
     public GrislySpectacleEffect() {
         super(Outcome.DestroyPermanent);
-        this.staticText = "Its controller puts a number of cards equal to that creature's power from the top of his or her library into his or her graveyard";
+        this.staticText = "Its controller puts a number of cards equal to that creature's power from the top of their library into their graveyard";
     }
 
     public GrislySpectacleEffect(final GrislySpectacleEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/g/GruesomeDiscovery.java b/Mage.Sets/src/mage/cards/g/GruesomeDiscovery.java
index d791fe8115b..79403861a50 100644
--- a/Mage.Sets/src/mage/cards/g/GruesomeDiscovery.java
+++ b/Mage.Sets/src/mage/cards/g/GruesomeDiscovery.java
@@ -57,12 +57,12 @@ public class GruesomeDiscovery extends CardImpl {
 
 
         // Target player discards two cards.
-        // Morbid - If a creature died this turn, instead that player reveals his or her hand, you choose two cards from it, then that player discards those cards.
+        // Morbid - If a creature died this turn, instead that player reveals their hand, you choose two cards from it, then that player discards those cards.
         this.getSpellAbility().addEffect(new ConditionalOneShotEffect(
                 new GruesomeDiscoveryEffect(),
                 new DiscardTargetEffect(2),
                 MorbidCondition.instance,
-                "Target player discards two cards. Morbid - If a creature died this turn, instead that player reveals his or her hand, you choose two cards from it, then that player discards those cards"));
+                "Target player discards two cards. Morbid - If a creature died this turn, instead that player reveals their hand, you choose two cards from it, then that player discards those cards"));
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
 
@@ -80,7 +80,7 @@ class GruesomeDiscoveryEffect extends OneShotEffect {
 
     public GruesomeDiscoveryEffect() {
         super(Outcome.Discard);
-        this.staticText = "target player reveals his or her hand, you choose two cards from it, then that player discards those cards";
+        this.staticText = "target player reveals their hand, you choose two cards from it, then that player discards those cards";
     }
 
     public GruesomeDiscoveryEffect(final GruesomeDiscoveryEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/g/GuildFeud.java b/Mage.Sets/src/mage/cards/g/GuildFeud.java
index ac73640d594..c3dceb9c07d 100644
--- a/Mage.Sets/src/mage/cards/g/GuildFeud.java
+++ b/Mage.Sets/src/mage/cards/g/GuildFeud.java
@@ -55,8 +55,8 @@ public class GuildFeud extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{5}{R}");
 
         // At the beginning of your upkeep, target opponent reveals the top three cards
-        // of his or her library, may put a creature card from among them onto the battlefield,
-        // then puts the rest into his or her graveyard. You do the same with the top three
+        // of their library, may put a creature card from among them onto the battlefield,
+        // then puts the rest into their graveyard. You do the same with the top three
         // cards of your library. If two creatures are put onto the battlefield this way,
         // those creatures fight each other.
         Ability ability = new BeginningOfUpkeepTriggeredAbility(new GuildFeudEffect(), TargetController.YOU, false);
@@ -78,7 +78,7 @@ class GuildFeudEffect extends OneShotEffect {
 
     public GuildFeudEffect() {
         super(Outcome.PutCreatureInPlay);
-        staticText = "target opponent reveals the top three cards of his or her library, may put a creature card from among them onto the battlefield, then puts the rest into his or her graveyard. You do the same with the top three cards of your library. If two creatures are put onto the battlefield this way, those creatures fight each other";
+        staticText = "target opponent reveals the top three cards of their library, may put a creature card from among them onto the battlefield, then puts the rest into their graveyard. You do the same with the top three cards of your library. If two creatures are put onto the battlefield this way, those creatures fight each other";
     }
 
     public GuildFeudEffect(final GuildFeudEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/g/Guiltfeeder.java b/Mage.Sets/src/mage/cards/g/Guiltfeeder.java
index c9f737e1709..ba711d169f1 100644
--- a/Mage.Sets/src/mage/cards/g/Guiltfeeder.java
+++ b/Mage.Sets/src/mage/cards/g/Guiltfeeder.java
@@ -53,9 +53,9 @@ public class Guiltfeeder extends CardImpl {
 
         // Fear
         this.addAbility(FearAbility.getInstance());
-        // Whenever Guiltfeeder attacks and isn't blocked, defending player loses 1 life for each card in his or her graveyard.
+        // Whenever Guiltfeeder attacks and isn't blocked, defending player loses 1 life for each card in their graveyard.
         Effect effect = new LoseLifeTargetEffect(new CardsInTargetPlayersGraveyardCount());
-        effect.setText("defending player loses 1 life for each card in his or her graveyard");
+        effect.setText("defending player loses 1 life for each card in their graveyard");
         this.addAbility(new AttacksAndIsNotBlockedTriggeredAbility(effect, false, true));
     }
 
diff --git a/Mage.Sets/src/mage/cards/h/HairStrungKoto.java b/Mage.Sets/src/mage/cards/h/HairStrungKoto.java
index af751cc9c53..5cc017e0b92 100644
--- a/Mage.Sets/src/mage/cards/h/HairStrungKoto.java
+++ b/Mage.Sets/src/mage/cards/h/HairStrungKoto.java
@@ -59,7 +59,7 @@ public class HairStrungKoto extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}");
 
         /* Tap an untapped creature you control: Target player puts the top 
-         * card of his or her library into his or her graveyard. 
+         * card of their library into their graveyard.
          */
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new PutLibraryIntoGraveTargetEffect(1),
diff --git a/Mage.Sets/src/mage/cards/h/HarshScrutiny.java b/Mage.Sets/src/mage/cards/h/HarshScrutiny.java
index 015cd42fb3c..1a24b144528 100644
--- a/Mage.Sets/src/mage/cards/h/HarshScrutiny.java
+++ b/Mage.Sets/src/mage/cards/h/HarshScrutiny.java
@@ -45,7 +45,7 @@ public class HarshScrutiny extends CardImpl {
     public HarshScrutiny(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}");
 
-        // Target opponent reveals his or her hand. You choose a creature card from it. That player discards that card. Scry 1.
+        // Target opponent reveals their hand. You choose a creature card from it. That player discards that card. Scry 1.
         this.getSpellAbility().addTarget(new TargetOpponent());
         this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(new FilterCreatureCard("a creature card")));
         this.getSpellAbility().addEffect(new ScryEffect(1));
diff --git a/Mage.Sets/src/mage/cards/h/HauntingEchoes.java b/Mage.Sets/src/mage/cards/h/HauntingEchoes.java
index 6f0a21e7bb0..1273169ae7a 100644
--- a/Mage.Sets/src/mage/cards/h/HauntingEchoes.java
+++ b/Mage.Sets/src/mage/cards/h/HauntingEchoes.java
@@ -73,7 +73,7 @@ class HauntingEchoesEffect extends OneShotEffect {
 
     public HauntingEchoesEffect() {
         super(Outcome.Detriment);
-        staticText = "Exile all cards from target player's graveyard other than basic land cards. For each card exiled this way, search that player's library for all cards with the same name as that card and exile them. Then that player shuffles his or her library";
+        staticText = "Exile all cards from target player's graveyard other than basic land cards. For each card exiled this way, search that player's library for all cards with the same name as that card and exile them. Then that player shuffles their library";
     }
 
     public HauntingEchoesEffect(final HauntingEchoesEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/h/HavocFestival.java b/Mage.Sets/src/mage/cards/h/HavocFestival.java
index a4b39e69b6b..89a77a9fa90 100644
--- a/Mage.Sets/src/mage/cards/h/HavocFestival.java
+++ b/Mage.Sets/src/mage/cards/h/HavocFestival.java
@@ -50,7 +50,7 @@ public class HavocFestival extends CardImpl {
         // Players can't gain life.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantGainLifeAllEffect()));
 
-        // At the beginning of each player's upkeep, that player loses half his or her life, rounded up.
+        // At the beginning of each player's upkeep, that player loses half their life, rounded up.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new LoseHalfLifeTargetEffect(), TargetController.ANY, false));
 
     }
diff --git a/Mage.Sets/src/mage/cards/h/HeWhoHungers.java b/Mage.Sets/src/mage/cards/h/HeWhoHungers.java
index 8c882c88d61..1ff5cf2e8d7 100644
--- a/Mage.Sets/src/mage/cards/h/HeWhoHungers.java
+++ b/Mage.Sets/src/mage/cards/h/HeWhoHungers.java
@@ -75,7 +75,7 @@ public class HeWhoHungers extends CardImpl {
         //Flying
         this.addAbility(FlyingAbility.getInstance());
 
-        /* {1}, Sacrifice a Spirit: Target opponent reveals his or her hand. You choose a card from it. 
+        /* {1}, Sacrifice a Spirit: Target opponent reveals their hand. You choose a card from it.
          * That player discards that card. Activate this ability only any time you could cast a sorcery. */
         Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardCardYouChooseTargetEffect(), new ManaCostsImpl("{1}"));
         ability.addTarget(new TargetOpponent());
diff --git a/Mage.Sets/src/mage/cards/h/HeadGames.java b/Mage.Sets/src/mage/cards/h/HeadGames.java
index 90211d04c77..0d1b5f7cce6 100644
--- a/Mage.Sets/src/mage/cards/h/HeadGames.java
+++ b/Mage.Sets/src/mage/cards/h/HeadGames.java
@@ -43,7 +43,7 @@ public class HeadGames extends CardImpl {
     public HeadGames(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{B}{B}");
 
-        // Target opponent puts the cards from his or her hand on top of his or her library. Search that player's library for that many cards. The player puts those cards into his or her hand, then shuffles his or her library.
+        // Target opponent puts the cards from their hand on top of their library. Search that player's library for that many cards. The player puts those cards into their hand, then shuffles their library.
         this.getSpellAbility().addEffect(new ReplaceOpponentCardsInHandWithSelectedEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
     }
diff --git a/Mage.Sets/src/mage/cards/h/HeartbeatOfSpring.java b/Mage.Sets/src/mage/cards/h/HeartbeatOfSpring.java
index 828f9fd0bd4..02f620d69ff 100644
--- a/Mage.Sets/src/mage/cards/h/HeartbeatOfSpring.java
+++ b/Mage.Sets/src/mage/cards/h/HeartbeatOfSpring.java
@@ -46,7 +46,7 @@ public class HeartbeatOfSpring extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}");
 
         
-        // Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
+        // Whenever a player taps a land for mana, that player adds one mana to their mana pool of any type that land produced.
         this.addAbility(new TapForManaAllTriggeredManaAbility(
                 new AddManaOfAnyTypeProducedEffect(),
                 new FilterLandPermanent("a player taps a land"),
diff --git a/Mage.Sets/src/mage/cards/h/HedronCrab.java b/Mage.Sets/src/mage/cards/h/HedronCrab.java
index fb162980448..1d95e083bd0 100644
--- a/Mage.Sets/src/mage/cards/h/HedronCrab.java
+++ b/Mage.Sets/src/mage/cards/h/HedronCrab.java
@@ -49,7 +49,7 @@ public class HedronCrab extends CardImpl {
 
         this.power = new MageInt(0);
         this.toughness = new MageInt(2);
-        // Landfall - Whenever a land enters the battlefield under your control, target player puts the top three cards of his or her library into his or her graveyard.
+        // Landfall - Whenever a land enters the battlefield under your control, target player puts the top three cards of their library into their graveyard.
         LandfallAbility ability = new LandfallAbility(new PutLibraryIntoGraveTargetEffect(3), false);
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/h/HelmOfObedience.java b/Mage.Sets/src/mage/cards/h/HelmOfObedience.java
index 4a92862724c..161590b4423 100644
--- a/Mage.Sets/src/mage/cards/h/HelmOfObedience.java
+++ b/Mage.Sets/src/mage/cards/h/HelmOfObedience.java
@@ -54,7 +54,7 @@ public class HelmOfObedience extends CardImpl {
     public HelmOfObedience(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}");
 
-        // {X}, {T}: Target opponent puts cards from the top of his or her library into his or her graveyard until a creature card or X cards are put into that graveyard this way, whichever comes first. If a creature card is put into that graveyard this way, sacrifice Helm of Obedience and put that card onto the battlefield under your control. X can't be 0.
+        // {X}, {T}: Target opponent puts cards from the top of their library into their graveyard until a creature card or X cards are put into that graveyard this way, whichever comes first. If a creature card is put into that graveyard this way, sacrifice Helm of Obedience and put that card onto the battlefield under your control. X can't be 0.
         VariableManaCost xCosts = new VariableManaCost();
         xCosts.setMinX(1);
         SimpleActivatedAbility abilitiy = new SimpleActivatedAbility(Zone.BATTLEFIELD, new HelmOfObedienceEffect(), xCosts);
@@ -81,7 +81,7 @@ class HelmOfObedienceEffect extends OneShotEffect {
     
     public HelmOfObedienceEffect() {
         super(Outcome.Detriment);
-        staticText = "Target opponent puts cards from the top of his or her library into his or her graveyard until a creature card or X cards are put into that graveyard this way, whichever comes first. If a creature card is put into that graveyard this way, sacrifice Helm of Obedience and put that card onto the battlefield under your control. X can't be 0";
+        staticText = "Target opponent puts cards from the top of their library into their graveyard until a creature card or X cards are put into that graveyard this way, whichever comes first. If a creature card is put into that graveyard this way, sacrifice Helm of Obedience and put that card onto the battlefield under your control. X can't be 0";
     }
 
     public HelmOfObedienceEffect(final HelmOfObedienceEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/h/HideSeek.java b/Mage.Sets/src/mage/cards/h/HideSeek.java
index 70791d160e9..f287134edfd 100644
--- a/Mage.Sets/src/mage/cards/h/HideSeek.java
+++ b/Mage.Sets/src/mage/cards/h/HideSeek.java
@@ -61,7 +61,7 @@ public class HideSeek extends SplitCard {
         getLeftHalfCard().getSpellAbility().addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT));
 
         // Seek
-        // Search target opponent's library for a card and exile it. You gain life equal to its converted mana cost. Then that player shuffles his or her library..
+        // Search target opponent's library for a card and exile it. You gain life equal to its converted mana cost. Then that player shuffles their library..
         getRightHalfCard().getSpellAbility().addEffect(new SeekEffect());
         getRightHalfCard().getSpellAbility().addTarget(new TargetOpponent());
 
@@ -81,7 +81,7 @@ class SeekEffect extends OneShotEffect {
 
     public SeekEffect() {
         super(Outcome.GainLife);
-        staticText = "Search target opponent's library for a card and exile it. You gain life equal to its converted mana cost. Then that player shuffles his or her library";
+        staticText = "Search target opponent's library for a card and exile it. You gain life equal to its converted mana cost. Then that player shuffles their library";
     }
 
     public SeekEffect(final SeekEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/h/HighTide.java b/Mage.Sets/src/mage/cards/h/HighTide.java
index 5f03a27c418..6eb596d5c62 100644
--- a/Mage.Sets/src/mage/cards/h/HighTide.java
+++ b/Mage.Sets/src/mage/cards/h/HighTide.java
@@ -56,7 +56,7 @@ public class HighTide extends CardImpl {
     public HighTide(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{U}");
 
-        // Until end of turn, whenever a player taps an Island for mana, that player adds {U} to his or her mana pool.
+        // Until end of turn, whenever a player taps an Island for mana, that player adds {U} to their mana pool.
         this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new HighTideTriggeredAbility()));
 
     }
@@ -80,7 +80,7 @@ class HighTideTriggeredAbility extends DelayedTriggeredManaAbility {
     }
 
     public HighTideTriggeredAbility() {
-        super(new AddManaToManaPoolTargetControllerEffect(new Mana(ColoredManaSymbol.U), "his or her"), Duration.EndOfTurn, false);
+        super(new AddManaToManaPoolTargetControllerEffect(new Mana(ColoredManaSymbol.U), "their"), Duration.EndOfTurn, false);
         this.usesStack = false;
     }
 
@@ -112,6 +112,6 @@ class HighTideTriggeredAbility extends DelayedTriggeredManaAbility {
 
     @Override
     public String getRule() {
-        return "Until end of turn, whenever a player taps an Island for mana, that player adds {U} to his or her mana pool";
+        return "Until end of turn, whenever a player taps an Island for mana, that player adds {U} to their mana pool";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/h/HiredGiant.java b/Mage.Sets/src/mage/cards/h/HiredGiant.java
index 98c0229f925..be57e3f3bd9 100644
--- a/Mage.Sets/src/mage/cards/h/HiredGiant.java
+++ b/Mage.Sets/src/mage/cards/h/HiredGiant.java
@@ -58,7 +58,7 @@ public class HiredGiant extends CardImpl {
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);
 
-        // When Hired Giant enters the battlefield, each other player may search his or her library for a land card and put that card onto the battlefield. Then each player who searched his or her library this way shuffles it.
+        // When Hired Giant enters the battlefield, each other player may search their library for a land card and put that card onto the battlefield. Then each player who searched their library this way shuffles it.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new HiredGiantEffect()));
     }
 
@@ -76,7 +76,7 @@ class HiredGiantEffect extends OneShotEffect {
 
     HiredGiantEffect() {
         super(Outcome.Detriment);
-        this.staticText = "each other player may search his or her library for a land card and put that card onto the battlefield. Then each player who searched his or her library this way shuffles it";
+        this.staticText = "each other player may search their library for a land card and put that card onto the battlefield. Then each player who searched their library this way shuffles it";
     }
 
     HiredGiantEffect(final HiredGiantEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/h/HiredTorturer.java b/Mage.Sets/src/mage/cards/h/HiredTorturer.java
index 2fa36a930b6..9f7676e55c0 100644
--- a/Mage.Sets/src/mage/cards/h/HiredTorturer.java
+++ b/Mage.Sets/src/mage/cards/h/HiredTorturer.java
@@ -68,7 +68,7 @@ public class HiredTorturer extends CardImpl {
         // Defender
         this.addAbility(DefenderAbility.getInstance());
 
-        // {3}{B}, {T}: Target opponent loses 2 life and reveals a card at random from his or her hand.
+        // {3}{B}, {T}: Target opponent loses 2 life and reveals a card at random from their hand.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(2),new ManaCostsImpl("{3}{B}"));
         ability.addCost(new TapSourceCost());
         ability.addEffect(new HiredTorturerEffect());
@@ -92,7 +92,7 @@ class HiredTorturerEffect extends OneShotEffect {
 
     public HiredTorturerEffect() {
         super(Outcome.Detriment);
-        staticText = "and reveals a card at random from his or her hand";
+        staticText = "and reveals a card at random from their hand";
     }
 
     public HiredTorturerEffect(final HiredTorturerEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/h/HiveMind.java b/Mage.Sets/src/mage/cards/h/HiveMind.java
index 6b3a7c0b79e..27f74cd1c77 100644
--- a/Mage.Sets/src/mage/cards/h/HiveMind.java
+++ b/Mage.Sets/src/mage/cards/h/HiveMind.java
@@ -53,7 +53,7 @@ public class HiveMind extends CardImpl {
     public HiveMind(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{5}{U}");
 
-        // Whenever a player casts an instant or sorcery spell, each other player copies that spell. Each of those players may choose new targets for his or her copy.
+        // Whenever a player casts an instant or sorcery spell, each other player copies that spell. Each of those players may choose new targets for their copy.
         this.addAbility(new HiveMindTriggeredAbility());
     }
 
@@ -112,7 +112,7 @@ class HiveMindEffect extends OneShotEffect {
 
     public HiveMindEffect() {
         super(Outcome.Benefit);
-        this.staticText = "each other player copies that spell. Each of those players may choose new targets for his or her copy";
+        this.staticText = "each other player copies that spell. Each of those players may choose new targets for their copy";
     }
 
     public HiveMindEffect(final HiveMindEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/h/HollowSpecter.java b/Mage.Sets/src/mage/cards/h/HollowSpecter.java
index 009c4da2763..59541584aaf 100644
--- a/Mage.Sets/src/mage/cards/h/HollowSpecter.java
+++ b/Mage.Sets/src/mage/cards/h/HollowSpecter.java
@@ -67,7 +67,7 @@ public class HollowSpecter extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // Whenever Hollow Specter deals combat damage to a player, you may pay {X}.
-        // If you do, that player reveals X cards from his or her hand and you choose one of them. That player discards that card.
+        // If you do, that player reveals X cards from their hand and you choose one of them. That player discards that card.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new HollowSpecterEffect(), false, true));
     }
 
@@ -85,7 +85,7 @@ class HollowSpecterEffect extends OneShotEffect {
 
     public HollowSpecterEffect() {
         super(Outcome.Discard);
-        staticText = "you may pay {X}. If you do, that player reveals X cards from his or her hand and you choose one of them. That player discards that card";
+        staticText = "you may pay {X}. If you do, that player reveals X cards from their hand and you choose one of them. That player discards that card";
     }
 
     public HollowSpecterEffect(final HollowSpecterEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/h/HomaridExplorer.java b/Mage.Sets/src/mage/cards/h/HomaridExplorer.java
new file mode 100644
index 00000000000..743142369ba
--- /dev/null
+++ b/Mage.Sets/src/mage/cards/h/HomaridExplorer.java
@@ -0,0 +1,37 @@
+package mage.cards.h;
+
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
+import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.target.TargetPlayer;
+
+import java.util.UUID;
+
+public class HomaridExplorer extends CardImpl {
+
+    public HomaridExplorer(UUID ownerId, CardSetInfo cardSetInfo){
+        super(ownerId, cardSetInfo, new CardType[]{CardType.CREATURE}, "{3}{U}");
+        subtype.add(SubType.HOMARID, SubType.SCOUT);
+        power = new MageInt(3);
+        toughness = new MageInt(3);
+
+        // When Homarid Explorer enters the battlefield, target player puts the top four cards of their library into their graveyard.
+        Ability ability = new EntersBattlefieldTriggeredAbility(new PutLibraryIntoGraveTargetEffect(4));
+        ability.addTarget(new TargetPlayer());
+        this.addAbility(ability);
+    }
+
+    public HomaridExplorer(final HomaridExplorer homaridExplorer){
+        super(homaridExplorer);
+    }
+
+    public HomaridExplorer copy(){
+        return new HomaridExplorer(this);
+    }
+
+}
diff --git a/Mage.Sets/src/mage/cards/h/HourOfGlory.java b/Mage.Sets/src/mage/cards/h/HourOfGlory.java
index cd5c232044a..b11f3759daa 100644
--- a/Mage.Sets/src/mage/cards/h/HourOfGlory.java
+++ b/Mage.Sets/src/mage/cards/h/HourOfGlory.java
@@ -55,7 +55,7 @@ public class HourOfGlory extends CardImpl {
     public HourOfGlory(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{B}");
 
-        // Exile target creature. If that creature was a God, its controller reveals his or her hand and exiles all cards with the same name as that creature.
+        // Exile target creature. If that creature was a God, its controller reveals their hand and exiles all cards with the same name as that creature.
         this.getSpellAbility().addEffect(new HourOfGloryEffect());
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
     }
@@ -74,7 +74,7 @@ class HourOfGloryEffect extends OneShotEffect {
 
     public HourOfGloryEffect() {
         super(Outcome.Exile);
-        this.staticText = "Exile target creature. If that creature was a God, its controller reveals his or her hand and exiles all cards with the same name as that creature";
+        this.staticText = "Exile target creature. If that creature was a God, its controller reveals their hand and exiles all cards with the same name as that creature";
     }
 
     public HourOfGloryEffect(final HourOfGloryEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/h/HuntedWumpus.java b/Mage.Sets/src/mage/cards/h/HuntedWumpus.java
index b306db82354..712c0c2dc48 100644
--- a/Mage.Sets/src/mage/cards/h/HuntedWumpus.java
+++ b/Mage.Sets/src/mage/cards/h/HuntedWumpus.java
@@ -57,7 +57,7 @@ public class HuntedWumpus extends CardImpl {
         this.power = new MageInt(6);
         this.toughness = new MageInt(6);
 
-        // When Hunted Wumpus enters the battlefield, each other player may put a creature card from his or her hand onto the battlefield.
+        // When Hunted Wumpus enters the battlefield, each other player may put a creature card from their hand onto the battlefield.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new HuntedWumpusEffect(), false));
 
     }
@@ -76,7 +76,7 @@ class HuntedWumpusEffect extends OneShotEffect {
 
     public HuntedWumpusEffect() {
         super(Outcome.Detriment);
-        this.staticText = "each other player may put a creature card from his or her hand onto the battlefield";
+        this.staticText = "each other player may put a creature card from their hand onto the battlefield";
     }
 
     public HuntedWumpusEffect(final HuntedWumpusEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/h/HurkylsRecall.java b/Mage.Sets/src/mage/cards/h/HurkylsRecall.java
index 76785338f7a..01a468134cc 100644
--- a/Mage.Sets/src/mage/cards/h/HurkylsRecall.java
+++ b/Mage.Sets/src/mage/cards/h/HurkylsRecall.java
@@ -50,7 +50,7 @@ public class HurkylsRecall extends CardImpl {
     public HurkylsRecall(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{U}");
 
-        // Return all artifacts target player owns to his or her hand.
+        // Return all artifacts target player owns to their hand.
         this.getSpellAbility().addEffect(new HurkylsRecallReturnToHandEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
@@ -69,7 +69,7 @@ class HurkylsRecallReturnToHandEffect extends OneShotEffect {
 
     public HurkylsRecallReturnToHandEffect() {
         super(Outcome.ReturnToHand);
-        staticText = "Return all artifacts target player owns to his or her hand";
+        staticText = "Return all artifacts target player owns to their hand";
     }
 
     public HurkylsRecallReturnToHandEffect(final HurkylsRecallReturnToHandEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/h/Hypergenesis.java b/Mage.Sets/src/mage/cards/h/Hypergenesis.java
index a2879b95d24..d406983e51e 100644
--- a/Mage.Sets/src/mage/cards/h/Hypergenesis.java
+++ b/Mage.Sets/src/mage/cards/h/Hypergenesis.java
@@ -60,7 +60,7 @@ public class Hypergenesis extends CardImpl {
         // Suspend 3-{1}{G}{G}
         this.addAbility(new SuspendAbility(3, new ManaCostsImpl("{1}{G}{G}"), this));
 
-        // Starting with you, each player may put an artifact, creature, enchantment, or land card from his or her hand onto the battlefield. Repeat this process until no one puts a card onto the battlefield.
+        // Starting with you, each player may put an artifact, creature, enchantment, or land card from their hand onto the battlefield. Repeat this process until no one puts a card onto the battlefield.
         this.getSpellAbility().addEffect(new HypergenesisEffect());
     }
 
@@ -85,7 +85,7 @@ class HypergenesisEffect extends OneShotEffect {
 
     HypergenesisEffect() {
         super(Outcome.PutCardInPlay);
-        this.staticText = "Starting with you, each player may put an artifact, creature, enchantment, or land card from his or her hand onto the battlefield. Repeat this process until no one puts a card onto the battlefield.";
+        this.staticText = "Starting with you, each player may put an artifact, creature, enchantment, or land card from their hand onto the battlefield. Repeat this process until no one puts a card onto the battlefield.";
     }
 
     HypergenesisEffect(final HypergenesisEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/i/IgniteMemories.java b/Mage.Sets/src/mage/cards/i/IgniteMemories.java
index 02ecf7e1226..f86fc260814 100644
--- a/Mage.Sets/src/mage/cards/i/IgniteMemories.java
+++ b/Mage.Sets/src/mage/cards/i/IgniteMemories.java
@@ -52,7 +52,7 @@ public class IgniteMemories extends CardImpl {
     public IgniteMemories(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{R}");
 
-        // Target player reveals a card at random from his or her hand. Ignite Memories deals damage to that player equal to that card's converted mana cost.
+        // Target player reveals a card at random from their hand. Ignite Memories deals damage to that player equal to that card's converted mana cost.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new IgniteMemoriesEffect());
         // Storm
@@ -73,7 +73,7 @@ class IgniteMemoriesEffect extends OneShotEffect {
 
     public IgniteMemoriesEffect() {
         super(Outcome.Damage);
-        staticText = "Target player reveals a card at random from his or her hand. {this} deals damage to that player equal to that card's converted mana cost";
+        staticText = "Target player reveals a card at random from their hand. {this} deals damage to that player equal to that card's converted mana cost";
     }
 
     public IgniteMemoriesEffect(final IgniteMemoriesEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/i/IllGottenGains.java b/Mage.Sets/src/mage/cards/i/IllGottenGains.java
index 344e9a035cf..a00bc082b9e 100644
--- a/Mage.Sets/src/mage/cards/i/IllGottenGains.java
+++ b/Mage.Sets/src/mage/cards/i/IllGottenGains.java
@@ -56,10 +56,10 @@ public class IllGottenGains extends CardImpl {
         // Exile Ill-Gotten Gains.
         this.getSpellAbility().addEffect(ExileSpellEffect.getInstance());
 
-        // Each player discards his or her hand,
+        // Each player discards their hand,
         this.getSpellAbility().addEffect(new DiscardHandAllEffect());
 
-        //then returns up to three cards from his or her graveyard to his or her hand.
+        //then returns up to three cards from their graveyard to their hand.
         this.getSpellAbility().addEffect(new IllGottenGainsEffect());
     }
 
@@ -77,7 +77,7 @@ class IllGottenGainsEffect extends OneShotEffect {
 
     IllGottenGainsEffect() {
         super(Outcome.ReturnToHand);
-        this.staticText = ", then returns up to three cards from his or her graveyard to his or her hand.";
+        this.staticText = ", then returns up to three cards from their graveyard to their hand.";
     }
 
     IllGottenGainsEffect(final IllGottenGainsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/i/IncendiaryCommand.java b/Mage.Sets/src/mage/cards/i/IncendiaryCommand.java
index 37376cc9bc0..7cbed799b5d 100644
--- a/Mage.Sets/src/mage/cards/i/IncendiaryCommand.java
+++ b/Mage.Sets/src/mage/cards/i/IncendiaryCommand.java
@@ -70,7 +70,7 @@ public class IncendiaryCommand extends CardImpl {
         mode.getEffects().add(new DestroyTargetEffect());
         mode.getTargets().add(new TargetNonBasicLandPermanent());
         this.getSpellAbility().getModes().addMode(mode);
-        // or each player discards all the cards in his or her hand, then draws that many cards.
+        // or each player discards all the cards in their hand, then draws that many cards.
         mode = new Mode();
         mode.getEffects().add(new IncendiaryCommandDrawEffect());
         this.getSpellAbility().getModes().addMode(mode);
@@ -91,7 +91,7 @@ class IncendiaryCommandDrawEffect extends OneShotEffect {
 
     public IncendiaryCommandDrawEffect() {
         super(Outcome.Detriment);
-        this.staticText = "each player discards all the cards in his or her hand, then draws that many cards";
+        this.staticText = "each player discards all the cards in their hand, then draws that many cards";
     }
 
     public IncendiaryCommandDrawEffect(final IncendiaryCommandDrawEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/i/Incoming.java b/Mage.Sets/src/mage/cards/i/Incoming.java
index 801a6c24724..2ad9b51cc73 100644
--- a/Mage.Sets/src/mage/cards/i/Incoming.java
+++ b/Mage.Sets/src/mage/cards/i/Incoming.java
@@ -52,7 +52,7 @@ public class Incoming extends CardImpl {
     public Incoming(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{4}{G}{G}{G}{G}");
 
-        // Each player searches his or her library for any number of artifact, creature, enchantment, and/or land cards, puts them onto the battlefield, then shuffles his or her library.
+        // Each player searches their library for any number of artifact, creature, enchantment, and/or land cards, puts them onto the battlefield, then shuffles their library.
         this.getSpellAbility().addEffect(new IncomingEffect());
     }
 
@@ -80,7 +80,7 @@ class IncomingEffect extends OneShotEffect {
 
     public IncomingEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Each player searches his or her library for any number of artifact, creature, enchantment, and/or land cards, puts them onto the battlefield, then shuffles his or her library";
+        this.staticText = "Each player searches their library for any number of artifact, creature, enchantment, and/or land cards, puts them onto the battlefield, then shuffles their library";
     }
 
     public IncomingEffect(final IncomingEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/i/IncreasingConfusion.java b/Mage.Sets/src/mage/cards/i/IncreasingConfusion.java
index 58909ce5c84..1390384f801 100644
--- a/Mage.Sets/src/mage/cards/i/IncreasingConfusion.java
+++ b/Mage.Sets/src/mage/cards/i/IncreasingConfusion.java
@@ -50,7 +50,7 @@ public class IncreasingConfusion extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{U}");
 
 
-        // Target player puts the top X cards of his or her library into his or her graveyard. If Increasing Confusion was cast from a graveyard, that player puts twice that many cards into his or her graveyard instead.
+        // Target player puts the top X cards of their library into their graveyard. If Increasing Confusion was cast from a graveyard, that player puts twice that many cards into their graveyard instead.
         this.getSpellAbility().addEffect(new IncreasingConfusionEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
 
@@ -72,7 +72,7 @@ class IncreasingConfusionEffect extends OneShotEffect {
 
     public IncreasingConfusionEffect() {
         super(Outcome.Detriment);
-        staticText = "Target player puts the top X cards of his or her library into his or her graveyard. If {this} was cast from a graveyard, that player puts twice that many cards into his or her graveyard instead";
+        staticText = "Target player puts the top X cards of their library into their graveyard. If {this} was cast from a graveyard, that player puts twice that many cards into their graveyard instead";
     }
 
     public IncreasingConfusionEffect(final IncreasingConfusionEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/i/IndomitableCreativity.java b/Mage.Sets/src/mage/cards/i/IndomitableCreativity.java
index 733e4d19c40..9f5b9235440 100644
--- a/Mage.Sets/src/mage/cards/i/IndomitableCreativity.java
+++ b/Mage.Sets/src/mage/cards/i/IndomitableCreativity.java
@@ -61,7 +61,7 @@ public class IndomitableCreativity extends CardImpl {
     public IndomitableCreativity(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{R}{R}{R}");
 
-        // Destroy X target artifacts and/or creatures. For each permanent destroyed this way, its controller reveals cards from the top of his or her library until an artifact or creature card is revealed and exiles that card. Those players put the exiled card onto the battlefield, then shuffle their libraries.
+        // Destroy X target artifacts and/or creatures. For each permanent destroyed this way, its controller reveals cards from the top of their library until an artifact or creature card is revealed and exiles that card. Those players put the exiled card onto the battlefield, then shuffle their libraries.
         getSpellAbility().addEffect(new IndomitableCreativityEffect());
         this.getSpellAbility().addTarget(new TargetPermanent(filter));
     }
@@ -89,7 +89,7 @@ class IndomitableCreativityEffect extends OneShotEffect {
 
     public IndomitableCreativityEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Destroy X target artifacts and/or creatures. For each permanent destroyed this way, its controller reveals cards from the top of his or her library until an artifact or creature card is revealed and exiles that card. Those players put the exiled card onto the battlefield, then shuffle their libraries";
+        this.staticText = "Destroy X target artifacts and/or creatures. For each permanent destroyed this way, its controller reveals cards from the top of their library until an artifact or creature card is revealed and exiles that card. Those players put the exiled card onto the battlefield, then shuffle their libraries";
     }
 
     public IndomitableCreativityEffect(final IndomitableCreativityEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/i/InduceParanoia.java b/Mage.Sets/src/mage/cards/i/InduceParanoia.java
index 10bb96ffaff..715a0b6a525 100644
--- a/Mage.Sets/src/mage/cards/i/InduceParanoia.java
+++ b/Mage.Sets/src/mage/cards/i/InduceParanoia.java
@@ -53,11 +53,11 @@ public class InduceParanoia extends CardImpl {
     public InduceParanoia(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{U}{U}");
         
-        // Counter target spell. If {B} was spent to cast Induce Paranoia, that spell's controller puts the top X cards of his or her library into his or her graveyard, where X is the spell's converted mana cost.
+        // Counter target spell. If {B} was spent to cast Induce Paranoia, that spell's controller puts the top X cards of their library into their graveyard, where X is the spell's converted mana cost.
         this.getSpellAbility().addEffect(new ConditionalOneShotEffect(
                 new InduceParanoiaEffect(), 
                 new CounterTargetEffect(),
-                new ManaWasSpentCondition(ColoredManaSymbol.B), "Counter target spell. If {B} was spent to cast {this}, that spell's controller puts the top X cards of his or her library into his or her graveyard, where X is the spell's converted mana cost."));
+                new ManaWasSpentCondition(ColoredManaSymbol.B), "Counter target spell. If {B} was spent to cast {this}, that spell's controller puts the top X cards of their library into their graveyard, where X is the spell's converted mana cost."));
                 
         // Counter target spell. 
         this.getSpellAbility().addTarget(new TargetSpell());
@@ -77,7 +77,7 @@ class InduceParanoiaEffect extends OneShotEffect {
 
     InduceParanoiaEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Counter target spell. If {B} was spent to cast {this}, that spell's controller puts the top X cards of his or her library into his or her graveyard, where X is the spell's converted mana cost.";
+        this.staticText = "Counter target spell. If {B} was spent to cast {this}, that spell's controller puts the top X cards of their library into their graveyard, where X is the spell's converted mana cost.";
     }
 
     InduceParanoiaEffect(final InduceParanoiaEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/i/InducedAmnesia.java b/Mage.Sets/src/mage/cards/i/InducedAmnesia.java
index d246437b639..9e1f51a05d2 100644
--- a/Mage.Sets/src/mage/cards/i/InducedAmnesia.java
+++ b/Mage.Sets/src/mage/cards/i/InducedAmnesia.java
@@ -54,7 +54,7 @@ public class InducedAmnesia extends CardImpl {
     public InducedAmnesia(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}");
 
-        // When Induced Amnesia enters the battlefield, target player exiles all the cards in his or her hand face down, then draws that many cards.
+        // When Induced Amnesia enters the battlefield, target player exiles all the cards in their hand face down, then draws that many cards.
         Ability ability = new EntersBattlefieldTriggeredAbility(new InducedAmnesiaExileEffect(), false);
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
@@ -77,7 +77,7 @@ class InducedAmnesiaExileEffect extends OneShotEffect {
 
     public InducedAmnesiaExileEffect() {
         super(Outcome.Detriment);
-        this.staticText = "target player exiles all the cards in his or her hand face down, then draws that many cards";
+        this.staticText = "target player exiles all the cards in their hand face down, then draws that many cards";
     }
 
     public InducedAmnesiaExileEffect(final InducedAmnesiaExileEffect effect) {
@@ -101,7 +101,7 @@ class InducedAmnesiaExileEffect extends OneShotEffect {
                     card.moveToExile(exileId, sourcePermanent.getName(), source.getSourceId(), game);
                     card.setFaceDown(true, game);
                 }
-                game.informPlayers(sourcePermanent.getLogName() + ": " + targetPlayer.getLogName() + " exiles his or her hand face down (" + numberOfCards + "card" + (numberOfCards > 1 ? "s" : "") + ')');
+                game.informPlayers(sourcePermanent.getLogName() + ": " + targetPlayer.getLogName() + " exiles their hand face down (" + numberOfCards + "card" + (numberOfCards > 1 ? "s" : "") + ')');
                 game.applyEffects();
                 targetPlayer.drawCards(numberOfCards, game);
             }
diff --git a/Mage.Sets/src/mage/cards/i/InfernalDenizen.java b/Mage.Sets/src/mage/cards/i/InfernalDenizen.java
index b1526dbe9cf..408f0ed728f 100644
--- a/Mage.Sets/src/mage/cards/i/InfernalDenizen.java
+++ b/Mage.Sets/src/mage/cards/i/InfernalDenizen.java
@@ -74,7 +74,7 @@ public class InfernalDenizen extends CardImpl {
         this.power = new MageInt(5);
         this.toughness = new MageInt(7);
 
-        // At the beginning of your upkeep, sacrifice two Swamps. If you can't, tap Infernal Denizen, and an opponent may gain control of a creature you control of his or her choice for as long as Infernal Denizen remains on the battlefield.
+        // At the beginning of your upkeep, sacrifice two Swamps. If you can't, tap Infernal Denizen, and an opponent may gain control of a creature you control of their choice for as long as Infernal Denizen remains on the battlefield.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new InfernalDenizenEffect(), TargetController.YOU, false));
 
         // {tap}: Gain control of target creature for as long as Infernal Denizen remains on the battlefield.
@@ -109,7 +109,7 @@ class InfernalDenizenEffect extends OneShotEffect {
     InfernalDenizenEffect() {
         super(Outcome.Benefit);
         this.staticText = "sacrifice two Swamps. If you can't, tap {this}, "
-                + "and an opponent may gain control of a creature you control of his or her choice "
+                + "and an opponent may gain control of a creature you control of their choice "
                 + "for as long as {this} remains on the battlefield";
     }
 
diff --git a/Mage.Sets/src/mage/cards/i/InfernalGenesis.java b/Mage.Sets/src/mage/cards/i/InfernalGenesis.java
index 2c62febed94..2c0e8d26acc 100644
--- a/Mage.Sets/src/mage/cards/i/InfernalGenesis.java
+++ b/Mage.Sets/src/mage/cards/i/InfernalGenesis.java
@@ -48,7 +48,7 @@ public class InfernalGenesis extends CardImpl {
     public InfernalGenesis(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{B}{B}");
 
-        // At the beginning of each player's upkeep, that player puts the top card of his or her library into his or her graveyard.
+        // At the beginning of each player's upkeep, that player puts the top card of their library into their graveyard.
         // Then he or she creates X 1/1 black Minion creature tokens, where X is that card's converted mana cost.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new InfernalGenesisEffect(), TargetController.ANY, false));
     }
@@ -67,7 +67,7 @@ class InfernalGenesisEffect extends OneShotEffect {
 
     InfernalGenesisEffect() {
         super(Outcome.PutCreatureInPlay);
-        staticText = "that player puts the top card of his or her library into his or her graveyard. " +
+        staticText = "that player puts the top card of their library into their graveyard. " +
                 "Then he or she creates X 1/1 black Minion creature tokens, where X is that card's converted mana cost";
     }
 
diff --git a/Mage.Sets/src/mage/cards/i/InfernalKirin.java b/Mage.Sets/src/mage/cards/i/InfernalKirin.java
index 8ac95b840b8..c51a43e017b 100644
--- a/Mage.Sets/src/mage/cards/i/InfernalKirin.java
+++ b/Mage.Sets/src/mage/cards/i/InfernalKirin.java
@@ -65,7 +65,7 @@ public class InfernalKirin extends CardImpl {
 
         // Flying
         this.addAbility(FlyingAbility.getInstance());
-        // Whenever you cast a Spirit or Arcane spell, target player reveals his or her hand and discards all cards with that spell's converted mana cost.
+        // Whenever you cast a Spirit or Arcane spell, target player reveals their hand and discards all cards with that spell's converted mana cost.
         Ability ability = new SpellCastControllerTriggeredAbility(Zone.BATTLEFIELD, new InfernalKirinEffect(), StaticFilters.SPIRIT_OR_ARCANE_CARD, false, true);
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
@@ -86,7 +86,7 @@ class InfernalKirinEffect extends OneShotEffect {
 
     public InfernalKirinEffect() {
         super(Outcome.Detriment);
-        this.staticText = "target player reveals his or her hand and discards all cards with that spell's converted mana cost";
+        this.staticText = "target player reveals their hand and discards all cards with that spell's converted mana cost";
     }
 
     public InfernalKirinEffect(final InfernalKirinEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/i/InfernalOffering.java b/Mage.Sets/src/mage/cards/i/InfernalOffering.java
index 46158610570..83077c7d889 100644
--- a/Mage.Sets/src/mage/cards/i/InfernalOffering.java
+++ b/Mage.Sets/src/mage/cards/i/InfernalOffering.java
@@ -63,7 +63,7 @@ public class InfernalOffering extends CardImpl {
         // Choose an opponent. You and that player each sacrifice a creature. Each player who sacrificed a creature this way draws two cards.
         this.getSpellAbility().addEffect(new InfernalOfferingSacrificeEffect());
 
-        // Choose an opponent. Return a creature card from your graveyard to the battlefield, then that player returns a creature card from his or her graveyard to the battlefield.
+        // Choose an opponent. Return a creature card from your graveyard to the battlefield, then that player returns a creature card from their graveyard to the battlefield.
         this.getSpellAbility().addEffect(new InfernalOfferingReturnEffect());
     }
 
@@ -139,7 +139,7 @@ class InfernalOfferingReturnEffect extends OneShotEffect {
 
     InfernalOfferingReturnEffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "Choose an opponent. Return a creature card from your graveyard to the battlefield, then that player returns a creature card from his or her graveyard to the battlefield";
+        this.staticText = "Choose an opponent. Return a creature card from your graveyard to the battlefield, then that player returns a creature card from their graveyard to the battlefield";
     }
 
     InfernalOfferingReturnEffect(final InfernalOfferingReturnEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/i/InfiniteObliteration.java b/Mage.Sets/src/mage/cards/i/InfiniteObliteration.java
index 151b89f6ff0..c226e35f096 100644
--- a/Mage.Sets/src/mage/cards/i/InfiniteObliteration.java
+++ b/Mage.Sets/src/mage/cards/i/InfiniteObliteration.java
@@ -53,7 +53,7 @@ public class InfiniteObliteration extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{B}{B}");
 
         // Name a creature card.  Search target opponent's graveyard, hand, and library
-        // for any number of cards with that name and exile them.  Then that player shuffles his or her library.
+        // for any number of cards with that name and exile them.  Then that player shuffles their library.
         this.getSpellAbility().addEffect(new InfiniteObliterationEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
     }
diff --git a/Mage.Sets/src/mage/cards/i/InkDissolver.java b/Mage.Sets/src/mage/cards/i/InkDissolver.java
index d07d0a735b7..72d735fe67d 100644
--- a/Mage.Sets/src/mage/cards/i/InkDissolver.java
+++ b/Mage.Sets/src/mage/cards/i/InkDissolver.java
@@ -52,7 +52,7 @@ public class InkDissolver extends CardImpl {
         this.toughness = new MageInt(1);
 
         // Kinship - At the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Ink Dissolver, you may reveal it. 
-        // If you do, each opponent puts the top three cards of his or her library into his or her graveyard.
+        // If you do, each opponent puts the top three cards of their library into their graveyard.
         this.addAbility(new KinshipAbility(new PutTopCardOfLibraryIntoGraveEachPlayerEffect(3, TargetController.OPPONENT)));
     }
 
diff --git a/Mage.Sets/src/mage/cards/i/Inquisition.java b/Mage.Sets/src/mage/cards/i/Inquisition.java
index e28f8111197..8ce6fd71a33 100644
--- a/Mage.Sets/src/mage/cards/i/Inquisition.java
+++ b/Mage.Sets/src/mage/cards/i/Inquisition.java
@@ -52,7 +52,7 @@ public class Inquisition extends CardImpl {
     public Inquisition(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{B}");
 
-        // Target player reveals his or her hand. Inquisition deals damage to that player equal to the number of white cards in his or her hand.
+        // Target player reveals their hand. Inquisition deals damage to that player equal to the number of white cards in their hand.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new InquisitionEffect());
     }
@@ -76,7 +76,7 @@ class InquisitionEffect extends OneShotEffect {
 
     public InquisitionEffect() {
         super(Outcome.Exile);
-        staticText = "Target player reveals his or her hand. Inquisition deals damage to that player equal to the number of white cards in his or her hand";
+        staticText = "Target player reveals their hand. Inquisition deals damage to that player equal to the number of white cards in their hand";
     }
 
     public InquisitionEffect(final InquisitionEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/i/InvasiveSurgery.java b/Mage.Sets/src/mage/cards/i/InvasiveSurgery.java
index 74e95311125..8f49c36ad23 100644
--- a/Mage.Sets/src/mage/cards/i/InvasiveSurgery.java
+++ b/Mage.Sets/src/mage/cards/i/InvasiveSurgery.java
@@ -60,7 +60,7 @@ public class InvasiveSurgery extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{U}");
 
         // Counter target sorcery spell.
-        // <i>Delirium</i> &mdash; If there are four or more card types among cards in your graveyard, search the graveyard, hand, and library of that spell's controller for any number of cards with the same name as that spell, exile those cards, then that player shuffles his or her library.
+        // <i>Delirium</i> &mdash; If there are four or more card types among cards in your graveyard, search the graveyard, hand, and library of that spell's controller for any number of cards with the same name as that spell, exile those cards, then that player shuffles their library.
         this.getSpellAbility().addEffect(new InvasiveSurgeryEffect());
         this.getSpellAbility().addTarget(new TargetSpell(filter));
 
@@ -124,6 +124,6 @@ class InvasiveSurgeryEffect extends SearchTargetGraveyardHandLibraryForCardNameA
         return "Counter target sorcery spell.<br><br>"
                 + "<i>Delirium</i> &mdash; If there are four or more card types among cards in your graveyard, "
                 + "search the graveyard, hand, and library of that spell's controller for any number of cards "
-                + "with the same name as that spell, exile those cards, then that player shuffles his or her library";
+                + "with the same name as that spell, exile those cards, then that player shuffles their library";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/i/IpnuRivulet.java b/Mage.Sets/src/mage/cards/i/IpnuRivulet.java
index ca767ac01af..953cdcf4312 100644
--- a/Mage.Sets/src/mage/cards/i/IpnuRivulet.java
+++ b/Mage.Sets/src/mage/cards/i/IpnuRivulet.java
@@ -72,7 +72,7 @@ public class IpnuRivulet extends CardImpl {
         manaAbility.addCost(new PayLifeCost(1));
         this.addAbility(manaAbility);
 
-        // {1}{U}, {t}, Sacrifice a Desert: Target player puts the top four cards of his or her library into his or her graveyard.
+        // {1}{U}, {t}, Sacrifice a Desert: Target player puts the top four cards of their library into their graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(4), new ManaCostsImpl("{1}{U}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(1, 1, filter, true)));
diff --git a/Mage.Sets/src/mage/cards/i/IronMaiden.java b/Mage.Sets/src/mage/cards/i/IronMaiden.java
index 2d8f9230b2e..e22d07f6d11 100644
--- a/Mage.Sets/src/mage/cards/i/IronMaiden.java
+++ b/Mage.Sets/src/mage/cards/i/IronMaiden.java
@@ -49,7 +49,7 @@ public class IronMaiden extends CardImpl {
     public IronMaiden(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}");
 
-        // At the beginning of each opponent's upkeep, Iron Maiden deals X damage to that player, where X is the number of cards in his or her hand minus 4.
+        // At the beginning of each opponent's upkeep, Iron Maiden deals X damage to that player, where X is the number of cards in their hand minus 4.
         Ability ability = new BeginningOfUpkeepTriggeredAbility(new IronMaidenEffect(), TargetController.OPPONENT, false);
         this.addAbility(ability);
     }
@@ -102,7 +102,7 @@ class IronMaidenEffect extends OneShotEffect {
     
     @Override
     public String getText(Mode mode) {
-        return "Iron Maiden deals X damage to that player, where X is the number of cards in his or her hand minus 4";
+        return "Iron Maiden deals X damage to that player, where X is the number of cards in their hand minus 4";
     }
 
 }
diff --git a/Mage.Sets/src/mage/cards/i/IslandSanctuary.java b/Mage.Sets/src/mage/cards/i/IslandSanctuary.java
index fbbdb5dd5eb..4a2c7c933c3 100644
--- a/Mage.Sets/src/mage/cards/i/IslandSanctuary.java
+++ b/Mage.Sets/src/mage/cards/i/IslandSanctuary.java
@@ -93,7 +93,7 @@ class IslandSanctuaryEffect extends ReplacementEffectImpl {
     public boolean replaceEvent(GameEvent event, Ability source, Game game) {
         Player controller = game.getPlayer(event.getPlayerId());
         if (controller != null && controller.chooseUse(outcome, "Skip draw card? (If you do, until your next turn, you can't be attacked except by creatures with flying and/or islandwalk)", source, game)) {
-            game.informPlayers(controller.getLogName() + " skips his or her draw card action. Until his or her next turn, he or she can't be attacked except by creatures with flying and/or islandwalk");
+            game.informPlayers(controller.getLogName() + " skips their draw card action. Until their next turn, he or she can't be attacked except by creatures with flying and/or islandwalk");
             game.addEffect(new CantAttackYouAllEffect(Duration.UntilYourNextTurn, notFlyingorIslandwalkCreatures), source);
             return true;
         }
diff --git a/Mage.Sets/src/mage/cards/i/IsperiaTheInscrutable.java b/Mage.Sets/src/mage/cards/i/IsperiaTheInscrutable.java
index e179e1342a7..7796b02016d 100644
--- a/Mage.Sets/src/mage/cards/i/IsperiaTheInscrutable.java
+++ b/Mage.Sets/src/mage/cards/i/IsperiaTheInscrutable.java
@@ -66,7 +66,7 @@ public class IsperiaTheInscrutable extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
         
-        // Whenever Isperia the Inscrutable deals combat damage to a player, name a card. That player reveals his or her hand. If he or she reveals the named card, search your library for a creature card with flying, reveal it, put it into your hand, then shuffle your library.
+        // Whenever Isperia the Inscrutable deals combat damage to a player, name a card. That player reveals their hand. If he or she reveals the named card, search your library for a creature card with flying, reveal it, put it into your hand, then shuffle your library.
         Effect effect1 = new NameACardEffect(NameACardEffect.TypeOfName.ALL);
         Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(effect1, false, true);
         Effect effect2 = new IsperiaTheInscrutableEffect();
@@ -95,7 +95,7 @@ class IsperiaTheInscrutableEffect extends OneShotEffect {
 
     public IsperiaTheInscrutableEffect() {
         super(Outcome.Neutral);
-        staticText = "That player reveals his or her hand. If he or she reveals the named card, search your library for a creature card with flying, reveal it, put it into your hand, then shuffle your library";
+        staticText = "That player reveals their hand. If he or she reveals the named card, search your library for a creature card with flying, reveal it, put it into your hand, then shuffle your library";
     }
 
     public IsperiaTheInscrutableEffect(final IsperiaTheInscrutableEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/i/IwamoriOfTheOpenFist.java b/Mage.Sets/src/mage/cards/i/IwamoriOfTheOpenFist.java
index de24a431069..862790d6ee0 100644
--- a/Mage.Sets/src/mage/cards/i/IwamoriOfTheOpenFist.java
+++ b/Mage.Sets/src/mage/cards/i/IwamoriOfTheOpenFist.java
@@ -64,7 +64,7 @@ public class IwamoriOfTheOpenFist extends CardImpl {
 
         // Trample
         this.addAbility(TrampleAbility.getInstance());
-        // When Iwamori of the Open Fist enters the battlefield, each opponent may put a legendary creature card from his or her hand onto the battlefield.
+        // When Iwamori of the Open Fist enters the battlefield, each opponent may put a legendary creature card from their hand onto the battlefield.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new IwamoriOfTheOpenFistEffect(), false));
     }
 
@@ -89,7 +89,7 @@ class IwamoriOfTheOpenFistEffect extends OneShotEffect {
 
     public IwamoriOfTheOpenFistEffect() {
         super(Outcome.Detriment);
-        this.staticText = "each opponent may put a legendary creature card from his or her hand onto the battlefield";
+        this.staticText = "each opponent may put a legendary creature card from their hand onto the battlefield";
     }
 
     public IwamoriOfTheOpenFistEffect(final IwamoriOfTheOpenFistEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/j/JaceArchitectOfThought.java b/Mage.Sets/src/mage/cards/j/JaceArchitectOfThought.java
index a0b7f28c869..2928ca8ea6f 100644
--- a/Mage.Sets/src/mage/cards/j/JaceArchitectOfThought.java
+++ b/Mage.Sets/src/mage/cards/j/JaceArchitectOfThought.java
@@ -84,7 +84,7 @@ public class JaceArchitectOfThought extends CardImpl {
         // -2: Reveal the top three cards of your library. An opponent separates those cards into two piles. Put one pile into your hand and the other on the bottom of your library in any order.
         this.addAbility(new LoyaltyAbility(new JaceArchitectOfThoughtEffect2(), -2));
 
-        // -8: For each player, search that player's library for a nonland card and exile it, then that player shuffles his or her library. You may cast those cards without paying their mana costs.
+        // -8: For each player, search that player's library for a nonland card and exile it, then that player shuffles their library. You may cast those cards without paying their mana costs.
         this.addAbility(new LoyaltyAbility(new JaceArchitectOfThoughtEffect3(), -8));
 
     }
@@ -280,7 +280,7 @@ class JaceArchitectOfThoughtEffect3 extends OneShotEffect {
 
     public JaceArchitectOfThoughtEffect3() {
         super(Outcome.PlayForFree);
-        this.staticText = "For each player, search that player's library for a nonland card and exile it, then that player shuffles his or her library. You may cast those cards without paying their mana costs";
+        this.staticText = "For each player, search that player's library for a nonland card and exile it, then that player shuffles their library. You may cast those cards without paying their mana costs";
     }
 
     public JaceArchitectOfThoughtEffect3(final JaceArchitectOfThoughtEffect3 effect) {
diff --git a/Mage.Sets/src/mage/cards/j/JaceBeleren.java b/Mage.Sets/src/mage/cards/j/JaceBeleren.java
index 657dabb79a1..36afd9823c1 100644
--- a/Mage.Sets/src/mage/cards/j/JaceBeleren.java
+++ b/Mage.Sets/src/mage/cards/j/JaceBeleren.java
@@ -61,7 +61,7 @@ public class JaceBeleren extends CardImpl {
         ability1.addTarget(new TargetPlayer());
         this.addAbility(ability1);
 
-        // -10: Target player puts the top twenty cards of his or her library into his or her graveyard.
+        // -10: Target player puts the top twenty cards of their library into their graveyard.
         LoyaltyAbility ability2 = new LoyaltyAbility(new PutLibraryIntoGraveTargetEffect(20), -10);
         ability2.addTarget(new TargetPlayer());
         this.addAbility(ability2);
diff --git a/Mage.Sets/src/mage/cards/j/JaceMemoryAdept.java b/Mage.Sets/src/mage/cards/j/JaceMemoryAdept.java
index d58d51ecf2d..c9449cfd93f 100644
--- a/Mage.Sets/src/mage/cards/j/JaceMemoryAdept.java
+++ b/Mage.Sets/src/mage/cards/j/JaceMemoryAdept.java
@@ -56,13 +56,13 @@ public class JaceMemoryAdept extends CardImpl {
 
         this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(4));
 
-        // +1: Draw a card. Target player puts the top card of his or her library into his or her graveyard.
+        // +1: Draw a card. Target player puts the top card of their library into their graveyard.
         LoyaltyAbility ability1 = new LoyaltyAbility(new DrawCardSourceControllerEffect(1), 1);
         ability1.addEffect(new PutLibraryIntoGraveTargetEffect(1));
         ability1.addTarget(new TargetPlayer());
         this.addAbility(ability1);
 
-        // 0: Target player puts the top ten cards of his or her library into his or her graveyard.
+        // 0: Target player puts the top ten cards of their library into their graveyard.
         LoyaltyAbility ability2 = new LoyaltyAbility(new PutLibraryIntoGraveTargetEffect(10), 0);
         ability2.addTarget(new TargetPlayer());
         this.addAbility(ability2);
diff --git a/Mage.Sets/src/mage/cards/j/JaceTelepathUnbound.java b/Mage.Sets/src/mage/cards/j/JaceTelepathUnbound.java
index 8378a263287..4c1884e2a6b 100644
--- a/Mage.Sets/src/mage/cards/j/JaceTelepathUnbound.java
+++ b/Mage.Sets/src/mage/cards/j/JaceTelepathUnbound.java
@@ -87,7 +87,7 @@ public class JaceTelepathUnbound extends CardImpl {
         ability.addTarget(new TargetCardInYourGraveyard(new FilterInstantOrSorceryCard()));
         this.addAbility(ability);
 
-        // -9: You get an emblem with "Whenever you cast a spell, target opponent puts the top five cards of his or her library into his or her graveyard".
+        // -9: You get an emblem with "Whenever you cast a spell, target opponent puts the top five cards of their library into their graveyard".
         this.addAbility(new LoyaltyAbility(new GetEmblemEffect(new JaceTelepathUnboundEmblem()), -9));
     }
 
diff --git a/Mage.Sets/src/mage/cards/j/JaceTheLivingGuildpact.java b/Mage.Sets/src/mage/cards/j/JaceTheLivingGuildpact.java
index 498d999b873..03a62fd8bf9 100644
--- a/Mage.Sets/src/mage/cards/j/JaceTheLivingGuildpact.java
+++ b/Mage.Sets/src/mage/cards/j/JaceTheLivingGuildpact.java
@@ -82,7 +82,7 @@ public class JaceTheLivingGuildpact extends CardImpl {
         ability.addTarget(new TargetPermanent(filter));
         this.addAbility(ability);
 
-        // -8: Each player shuffles his or her hand and graveyard into his or her library. You draw seven cards.
+        // -8: Each player shuffles their hand and graveyard into their library. You draw seven cards.
         this.addAbility(new LoyaltyAbility(new JaceTheLivingGuildpactEffect(), -8));
 
     }
@@ -101,7 +101,7 @@ class JaceTheLivingGuildpactEffect extends OneShotEffect {
 
     public JaceTheLivingGuildpactEffect() {
         super(Outcome.Neutral);
-        staticText = "Each player shuffles his or her hand and graveyard into his or her library. You draw seven cards";
+        staticText = "Each player shuffles their hand and graveyard into their library. You draw seven cards";
     }
 
     public JaceTheLivingGuildpactEffect(final JaceTheLivingGuildpactEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/j/JaceTheMindSculptor.java b/Mage.Sets/src/mage/cards/j/JaceTheMindSculptor.java
index bd6a19f2bab..beb6aa3e55b 100644
--- a/Mage.Sets/src/mage/cards/j/JaceTheMindSculptor.java
+++ b/Mage.Sets/src/mage/cards/j/JaceTheMindSculptor.java
@@ -75,7 +75,7 @@ public class JaceTheMindSculptor extends CardImpl {
         ability3.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability3);
 
-        // −12: Exile all cards from target player's library, then that player shuffles his or her hand into his or her library.
+        // −12: Exile all cards from target player's library, then that player shuffles their hand into their library.
         LoyaltyAbility ability4 = new LoyaltyAbility(new JaceTheMindSculptorEffect2(), -12);
         ability4.addTarget(new TargetPlayer());
         this.addAbility(ability4);
@@ -136,7 +136,7 @@ class JaceTheMindSculptorEffect2 extends OneShotEffect {
 
     public JaceTheMindSculptorEffect2() {
         super(Outcome.DrawCard);
-        staticText = "Exile all cards from target player's library, then that player shuffles his or her hand into his or her library";
+        staticText = "Exile all cards from target player's library, then that player shuffles their hand into their library";
     }
 
     public JaceTheMindSculptorEffect2(final JaceTheMindSculptorEffect2 effect) {
diff --git a/Mage.Sets/src/mage/cards/j/JaceUnravelerOfSecrets.java b/Mage.Sets/src/mage/cards/j/JaceUnravelerOfSecrets.java
index c2ddc9c34cd..f48f975a46f 100644
--- a/Mage.Sets/src/mage/cards/j/JaceUnravelerOfSecrets.java
+++ b/Mage.Sets/src/mage/cards/j/JaceUnravelerOfSecrets.java
@@ -71,7 +71,7 @@ public class JaceUnravelerOfSecrets extends CardImpl {
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
 
-        // -8: You get an emblem with "Whenever an opponent casts his or her first spell each turn, counter that spell."
+        // -8: You get an emblem with "Whenever an opponent casts their first spell each turn, counter that spell."
         LoyaltyAbility ability2 = new LoyaltyAbility(new GetEmblemEffect(new JaceUnravelerOfSecretsEmblem()), -8);
         this.addAbility(ability2, new SpellsCastWatcher());
 
diff --git a/Mage.Sets/src/mage/cards/j/JacesArchivist.java b/Mage.Sets/src/mage/cards/j/JacesArchivist.java
index 6d46b5460f6..ddda9cfcc0d 100644
--- a/Mage.Sets/src/mage/cards/j/JacesArchivist.java
+++ b/Mage.Sets/src/mage/cards/j/JacesArchivist.java
@@ -57,7 +57,7 @@ public class JacesArchivist extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        // {U}, {T}: Each player discards his or her hand, then draws cards equal to the greatest number of cards a player discarded this way.
+        // {U}, {T}: Each player discards their hand, then draws cards equal to the greatest number of cards a player discarded this way.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JacesArchivistEffect(), new ColoredManaCost(ColoredManaSymbol.U));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
@@ -77,7 +77,7 @@ class JacesArchivistEffect extends OneShotEffect {
 
     JacesArchivistEffect() {
         super(Outcome.Discard);
-        staticText = "Each player discards his or her hand, then draws cards equal to the greatest number of cards a player discarded this way";
+        staticText = "Each player discards their hand, then draws cards equal to the greatest number of cards a player discarded this way";
     }
 
     JacesArchivistEffect(final JacesArchivistEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/j/JacesMindseeker.java b/Mage.Sets/src/mage/cards/j/JacesMindseeker.java
index 1f89f789f70..0df0bc549e8 100644
--- a/Mage.Sets/src/mage/cards/j/JacesMindseeker.java
+++ b/Mage.Sets/src/mage/cards/j/JacesMindseeker.java
@@ -67,7 +67,7 @@ public class JacesMindseeker extends CardImpl {
 
         // Flying
         this.addAbility(FlyingAbility.getInstance());
-        // When Jace's Mindseeker enters the battlefield, target opponent puts the top five cards of his or her library into his or her graveyard.
+        // When Jace's Mindseeker enters the battlefield, target opponent puts the top five cards of their library into their graveyard.
         // You may cast an instant or sorcery card from among them without paying its mana cost.
         Ability ability = new EntersBattlefieldTriggeredAbility(new JaceMindseekerEffect());
         ability.addTarget(new TargetOpponent());
@@ -90,7 +90,7 @@ class JaceMindseekerEffect extends OneShotEffect {
 
     public JaceMindseekerEffect() {
         super(Outcome.PlayForFree);
-        this.staticText = "target opponent puts the top five cards of his or her library into his or her graveyard. You may cast an instant or sorcery card from among them without paying its mana cost";
+        this.staticText = "target opponent puts the top five cards of their library into their graveyard. You may cast an instant or sorcery card from among them without paying its mana cost";
     }
 
     public JaceMindseekerEffect(final JaceMindseekerEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/j/JacesPhantasm.java b/Mage.Sets/src/mage/cards/j/JacesPhantasm.java
index ec79be5a206..0bc5e9962f9 100644
--- a/Mage.Sets/src/mage/cards/j/JacesPhantasm.java
+++ b/Mage.Sets/src/mage/cards/j/JacesPhantasm.java
@@ -56,8 +56,8 @@ public class JacesPhantasm extends CardImpl {
 
         // Flying
         this.addAbility(FlyingAbility.getInstance());
-        // Jace's Phantasm gets +4/+4 as long as an opponent has ten or more cards in his or her graveyard.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostSourceEffect(4, 4, Duration.WhileOnBattlefield), new CardsInOpponentGraveCondition(10), "{this} gets +4/+4 as long as an opponent has ten or more cards in his or her graveyard")));
+        // Jace's Phantasm gets +4/+4 as long as an opponent has ten or more cards in their graveyard.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostSourceEffect(4, 4, Duration.WhileOnBattlefield), new CardsInOpponentGraveCondition(10), "{this} gets +4/+4 as long as an opponent has ten or more cards in their graveyard")));
     }
 
     public JacesPhantasm(final JacesPhantasm card) {
diff --git a/Mage.Sets/src/mage/cards/j/JelevaNephaliasScourge.java b/Mage.Sets/src/mage/cards/j/JelevaNephaliasScourge.java
index 673c16d08e4..19aca22058d 100644
--- a/Mage.Sets/src/mage/cards/j/JelevaNephaliasScourge.java
+++ b/Mage.Sets/src/mage/cards/j/JelevaNephaliasScourge.java
@@ -73,7 +73,7 @@ public class JelevaNephaliasScourge extends CardImpl {
 
         // Flying
         this.addAbility(FlyingAbility.getInstance());
-        // When Jeleva, Nephalia's Scourge enters the battlefield, each player exiles the top X cards of his or her library, where X is the amount of mana spent to cast Jeleva.
+        // When Jeleva, Nephalia's Scourge enters the battlefield, each player exiles the top X cards of their library, where X is the amount of mana spent to cast Jeleva.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new JelevaNephaliasScourgeEffect(), false));
         // Whenever Jeleva attacks, you may cast an instant or sorcery card exiled with it without paying its mana cost.
         this.addAbility(new AttacksTriggeredAbility(new JelevaNephaliasCastEffect(), false), new JelevaNephaliasWatcher());
@@ -94,7 +94,7 @@ class JelevaNephaliasScourgeEffect extends OneShotEffect {
 
     public JelevaNephaliasScourgeEffect() {
         super(Outcome.Benefit);
-        this.staticText = "each player exiles the top X cards of his or her library, where X is the amount of mana spent to cast {this}";
+        this.staticText = "each player exiles the top X cards of their library, where X is the amount of mana spent to cast {this}";
     }
 
     public JelevaNephaliasScourgeEffect(final JelevaNephaliasScourgeEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/j/JestersCap.java b/Mage.Sets/src/mage/cards/j/JestersCap.java
index f0b9f2c0940..ce450034da1 100644
--- a/Mage.Sets/src/mage/cards/j/JestersCap.java
+++ b/Mage.Sets/src/mage/cards/j/JestersCap.java
@@ -55,7 +55,7 @@ public class JestersCap extends CardImpl {
     public JestersCap(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}");
 
-        // {2}, {tap}, Sacrifice Jester's Cap: Search target player's library for three cards and exile them. Then that player shuffles his or her library.
+        // {2}, {tap}, Sacrifice Jester's Cap: Search target player's library for three cards and exile them. Then that player shuffles their library.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new JestersCapEffect(), new ManaCostsImpl("{2}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
@@ -77,7 +77,7 @@ class JestersCapEffect extends OneShotEffect {
 
     public JestersCapEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Search target player's library for three cards and exile them. Then that player shuffles his or her library";
+        this.staticText = "Search target player's library for three cards and exile them. Then that player shuffles their library";
     }
 
     public JestersCapEffect(final JestersCapEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/j/JestersMask.java b/Mage.Sets/src/mage/cards/j/JestersMask.java
index 0507a47f90e..aa7fc29d60c 100644
--- a/Mage.Sets/src/mage/cards/j/JestersMask.java
+++ b/Mage.Sets/src/mage/cards/j/JestersMask.java
@@ -53,7 +53,7 @@ public class JestersMask extends CardImpl {
         // Jester's Mask enters the battlefield tapped.
         this.addAbility(new EntersBattlefieldTappedAbility());
         
-        // {1}, {tap}, Sacrifice Jester's Mask: Target opponent puts the cards from his or her hand on top of his or her library. Search that player's library for that many cards. That player puts those cards into his or her hand, then shuffles his or her library.
+        // {1}, {tap}, Sacrifice Jester's Mask: Target opponent puts the cards from their hand on top of their library. Search that player's library for that many cards. That player puts those cards into their hand, then shuffles their library.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReplaceOpponentCardsInHandWithSelectedEffect(), new ManaCostsImpl<>("{1}"));       
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
diff --git a/Mage.Sets/src/mage/cards/k/KamahlsSummons.java b/Mage.Sets/src/mage/cards/k/KamahlsSummons.java
index a259d5289a3..505c12a9306 100644
--- a/Mage.Sets/src/mage/cards/k/KamahlsSummons.java
+++ b/Mage.Sets/src/mage/cards/k/KamahlsSummons.java
@@ -56,7 +56,7 @@ public class KamahlsSummons extends CardImpl {
     public KamahlsSummons(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{G}");
 
-        // Each player may reveal any number of creature cards from his or her hand. Then each player creates a 2/2 green Bear creature token for each card he or she revealed this way.
+        // Each player may reveal any number of creature cards from their hand. Then each player creates a 2/2 green Bear creature token for each card he or she revealed this way.
         getSpellAbility().addEffect(new KamahlsSummonsEffect());
     }
 
@@ -76,7 +76,7 @@ class KamahlsSummonsEffect extends OneShotEffect {
 
     public KamahlsSummonsEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Each player may reveal any number of creature cards from his or her hand. Then each player creates a 2/2 green Bear creature token for each card he or she revealed this way";
+        this.staticText = "Each player may reveal any number of creature cards from their hand. Then each player creates a 2/2 green Bear creature token for each card he or she revealed this way";
     }
 
     public KamahlsSummonsEffect(final KamahlsSummonsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/k/KarnLiberated.java b/Mage.Sets/src/mage/cards/k/KarnLiberated.java
index 2fd0a3b563e..434c3506ddc 100644
--- a/Mage.Sets/src/mage/cards/k/KarnLiberated.java
+++ b/Mage.Sets/src/mage/cards/k/KarnLiberated.java
@@ -72,7 +72,7 @@ public class KarnLiberated extends CardImpl {
         this.subtype.add(SubType.KARN);
         this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(6));
 
-        // +4: Target player exiles a card from his or her hand.
+        // +4: Target player exiles a card from their hand.
         LoyaltyAbility ability1 = new LoyaltyAbility(new KarnPlayerExileEffect(), 4);
         ability1.addTarget(new TargetPlayer());
         this.addAbility(ability1);
@@ -251,7 +251,7 @@ class KarnPlayerExileEffect extends OneShotEffect {
 
     public KarnPlayerExileEffect() {
         super(Outcome.Exile);
-        staticText = "target player exiles a card from his or her hand.";
+        staticText = "target player exiles a card from their hand.";
     }
 
     public KarnPlayerExileEffect(final KarnPlayerExileEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/k/KeeningStone.java b/Mage.Sets/src/mage/cards/k/KeeningStone.java
index 0cbf41d6205..0f9993221c9 100644
--- a/Mage.Sets/src/mage/cards/k/KeeningStone.java
+++ b/Mage.Sets/src/mage/cards/k/KeeningStone.java
@@ -51,7 +51,7 @@ public class KeeningStone extends CardImpl {
     public KeeningStone(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}");
 
-        // {5}, {tap}: Target player puts the top X cards of his or her library into his or her graveyard, where X is the number of cards in that player's graveyard.
+        // {5}, {tap}: Target player puts the top X cards of their library into their graveyard, where X is the number of cards in that player's graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new KeeningStoneEffect(), new GenericManaCost(5));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetPlayer());
@@ -72,7 +72,7 @@ class KeeningStoneEffect extends OneShotEffect {
 
     public KeeningStoneEffect() {
         super(Outcome.Neutral);
-        this.staticText = "Target player puts the top X cards of his or her library into his or her graveyard, where X is the number of cards in that player's graveyard";
+        this.staticText = "Target player puts the top X cards of their library into their graveyard, where X is the number of cards in that player's graveyard";
     }
 
     public KeeningStoneEffect(final KeeningStoneEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/k/KeeperOfProgenitus.java b/Mage.Sets/src/mage/cards/k/KeeperOfProgenitus.java
index 4fc6232acff..f42be52ece7 100644
--- a/Mage.Sets/src/mage/cards/k/KeeperOfProgenitus.java
+++ b/Mage.Sets/src/mage/cards/k/KeeperOfProgenitus.java
@@ -64,7 +64,7 @@ public class KeeperOfProgenitus extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(3);
 
-        // Whenever a player taps a Mountain, Forest, or Plains for mana, that player adds one mana to his or her mana pool of any type that land produced.
+        // Whenever a player taps a Mountain, Forest, or Plains for mana, that player adds one mana to their mana pool of any type that land produced.
         this.addAbility(new TapForManaAllTriggeredManaAbility(
                 new AddManaOfAnyTypeProducedEffect(),
                 filter, SetTargetPointer.PERMANENT));
diff --git a/Mage.Sets/src/mage/cards/k/KeeperOfTheDead.java b/Mage.Sets/src/mage/cards/k/KeeperOfTheDead.java
index e3dce0a1927..c07b5a45452 100644
--- a/Mage.Sets/src/mage/cards/k/KeeperOfTheDead.java
+++ b/Mage.Sets/src/mage/cards/k/KeeperOfTheDead.java
@@ -83,7 +83,7 @@ public class KeeperOfTheDead extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(2);
 
-        // {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.
+        // {B}, {T}: Choose target opponent who had at least two fewer creature cards in their graveyard than you did as you activated this ability. Destroy target nonblack creature he or she controls.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new KeeperOfTheDeadEffect(), new TapSourceCost());
         ability.addCost(new ManaCostsImpl("{B}"));
         ability.addTarget(new TargetPlayer(1, 1, false, filter));
@@ -130,7 +130,7 @@ class KeeperOfDeadPredicate implements ObjectSourcePlayerPredicate<ObjectSourceP
 
     @Override
     public String toString() {
-        return "opponent who had at least two fewer creature cards in his or her graveyard than you did as you activated this ability";
+        return "opponent who had at least two fewer creature cards in their graveyard than you did as you activated this ability";
     }
 }
 
@@ -197,7 +197,7 @@ class KeeperOfTheDeadEffect extends OneShotEffect {
 
     public KeeperOfTheDeadEffect() {
         super(Outcome.DestroyPermanent);
-        this.staticText = "Destroy target nonblack creature contolled by target opponent who had at least two fewer creature cards in his or her graveyard than you did as you activated this ability";
+        this.staticText = "Destroy target nonblack creature contolled by target opponent who had at least two fewer creature cards in their graveyard than you did as you activated this ability";
     }
 
     public KeeperOfTheDeadEffect(final KeeperOfTheDeadEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/k/KheruMindEater.java b/Mage.Sets/src/mage/cards/k/KheruMindEater.java
index c1e26dd4c66..301a9a144d0 100644
--- a/Mage.Sets/src/mage/cards/k/KheruMindEater.java
+++ b/Mage.Sets/src/mage/cards/k/KheruMindEater.java
@@ -69,7 +69,7 @@ public class KheruMindEater extends CardImpl {
         // Menace
         this.addAbility(new MenaceAbility());
 
-        // Whenever Kheru Mind-Eater deals combat damage to a player, that player exiles a card from his or her hand face down.
+        // Whenever Kheru Mind-Eater deals combat damage to a player, that player exiles a card from their hand face down.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new KheruMindEaterExileEffect(), false, true));
 
         // You may look at and play cards exiled with Kheru Mind-Eater.
@@ -91,7 +91,7 @@ class KheruMindEaterExileEffect extends OneShotEffect {
 
     public KheruMindEaterExileEffect() {
         super(Outcome.Discard);
-        staticText = "that player exiles a card of his or her hand face down";
+        staticText = "that player exiles a card of their hand face down";
     }
 
     public KheruMindEaterExileEffect(final KheruMindEaterExileEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/k/KitesailFreebooter.java b/Mage.Sets/src/mage/cards/k/KitesailFreebooter.java
index f4a359a71bc..1c55127d584 100644
--- a/Mage.Sets/src/mage/cards/k/KitesailFreebooter.java
+++ b/Mage.Sets/src/mage/cards/k/KitesailFreebooter.java
@@ -75,7 +75,7 @@ public class KitesailFreebooter extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
 
-        // When Kitesail Freebooter enters the battlefield, target opponent reveals his or her hand. You choose a noncreature, nonland card from it. Exile that card until Kitesail Freebooter leaves the battlefield.
+        // When Kitesail Freebooter enters the battlefield, target opponent reveals their hand. You choose a noncreature, nonland card from it. Exile that card until Kitesail Freebooter leaves the battlefield.
         Ability ability = new EntersBattlefieldTriggeredAbility(new KitesailFreebooterExileEffect());
         ability.addTarget(new TargetOpponent());
         ability.addEffect(new CreateDelayedTriggeredAbilityEffect(new KitesailFreebooterReturnExiledCardAbility()));
@@ -96,7 +96,7 @@ class KitesailFreebooterExileEffect extends OneShotEffect {
 
     public KitesailFreebooterExileEffect() {
         super(Outcome.Benefit);
-        this.staticText = "target opponent reveals his or her hand. You choose a noncreature, nonland card from it. Exile that card until {this} leaves the battlefield";
+        this.staticText = "target opponent reveals their hand. You choose a noncreature, nonland card from it. Exile that card until {this} leaves the battlefield";
     }
 
     public KitesailFreebooterExileEffect(final KitesailFreebooterExileEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/k/KnacksawClique.java b/Mage.Sets/src/mage/cards/k/KnacksawClique.java
index 8e860db8a81..ec7e7f83a32 100644
--- a/Mage.Sets/src/mage/cards/k/KnacksawClique.java
+++ b/Mage.Sets/src/mage/cards/k/KnacksawClique.java
@@ -70,7 +70,7 @@ public class KnacksawClique extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
         
-        // {1}{U}, {untap}: Target opponent exiles the top card of his or her library. Until end of turn, you may play that card.
+        // {1}{U}, {untap}: Target opponent exiles the top card of their library. Until end of turn, you may play that card.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new KnacksawCliqueEffect(), new ManaCostsImpl("{1}{U}"));
         ability.addCost(new UntapSourceCost());
         ability.addTarget(new TargetOpponent());
@@ -92,7 +92,7 @@ class KnacksawCliqueEffect extends OneShotEffect {
 
     public KnacksawCliqueEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Target opponent exiles the top card of his or her library. Until end of turn, you may play that card";
+        this.staticText = "Target opponent exiles the top card of their library. Until end of turn, you may play that card";
     }
 
     public KnacksawCliqueEffect(final KnacksawCliqueEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/k/KnowledgeExploitation.java b/Mage.Sets/src/mage/cards/k/KnowledgeExploitation.java
index a46e5a5b0e1..366397c5896 100644
--- a/Mage.Sets/src/mage/cards/k/KnowledgeExploitation.java
+++ b/Mage.Sets/src/mage/cards/k/KnowledgeExploitation.java
@@ -56,7 +56,7 @@ public class KnowledgeExploitation extends CardImpl {
         // Prowl {3}{U}
         this.addAbility(new ProwlAbility(this, "{3}{U}"));
         
-        // Search target opponent's library for an instant or sorcery card. You may cast that card without paying its mana cost. Then that player shuffles his or her library.
+        // Search target opponent's library for an instant or sorcery card. You may cast that card without paying its mana cost. Then that player shuffles their library.
         this.getSpellAbility().addEffect(new KnowledgeExploitationEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
     }
@@ -75,7 +75,7 @@ class KnowledgeExploitationEffect extends OneShotEffect {
     
     KnowledgeExploitationEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Search target opponent's library for an instant or sorcery card. You may cast that card without paying its mana cost. Then that player shuffles his or her library";
+        this.staticText = "Search target opponent's library for an instant or sorcery card. You may cast that card without paying its mana cost. Then that player shuffles their library";
     }
     
     KnowledgeExploitationEffect(final KnowledgeExploitationEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/k/KnowledgePool.java b/Mage.Sets/src/mage/cards/k/KnowledgePool.java
index 1a83a89bb88..463766dc068 100644
--- a/Mage.Sets/src/mage/cards/k/KnowledgePool.java
+++ b/Mage.Sets/src/mage/cards/k/KnowledgePool.java
@@ -60,10 +60,10 @@ public class KnowledgePool extends CardImpl {
     public KnowledgePool(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}");
 
-        // Imprint - When Knowledge Pool enters the battlefield, each player exiles the top three cards of his or her library
+        // Imprint - When Knowledge Pool enters the battlefield, each player exiles the top three cards of their library
         this.addAbility(new EntersBattlefieldTriggeredAbility(new KnowledgePoolEffect1(), false));
 
-        // Whenever a player casts a spell from his or her hand, that player exiles it. If the player does, he or she may cast another nonland card exiled with Knowledge Pool without paying that card's mana cost.
+        // Whenever a player casts a spell from their hand, that player exiles it. If the player does, he or she may cast another nonland card exiled with Knowledge Pool without paying that card's mana cost.
         this.addAbility(new KnowledgePoolAbility());
     }
 
@@ -82,7 +82,7 @@ class KnowledgePoolEffect1 extends OneShotEffect {
 
     public KnowledgePoolEffect1() {
         super(Outcome.Neutral);
-        staticText = "each player exiles the top three cards of his or her library";
+        staticText = "each player exiles the top three cards of their library";
     }
 
     public KnowledgePoolEffect1(final KnowledgePoolEffect1 effect) {
@@ -156,7 +156,7 @@ class KnowledgePoolEffect2 extends OneShotEffect {
 
     public KnowledgePoolEffect2() {
         super(Outcome.Neutral);
-        staticText = "Whenever a player casts a spell from his or her hand, that player exiles it. If the player does, he or she may cast another nonland card exiled with {this} without paying that card's mana cost";
+        staticText = "Whenever a player casts a spell from their hand, that player exiles it. If the player does, he or she may cast another nonland card exiled with {this} without paying that card's mana cost";
     }
 
     public KnowledgePoolEffect2(final KnowledgePoolEffect2 effect) {
diff --git a/Mage.Sets/src/mage/cards/k/KozilekButcherOfTruth.java b/Mage.Sets/src/mage/cards/k/KozilekButcherOfTruth.java
index 1cad310e02a..1ba29a5b142 100644
--- a/Mage.Sets/src/mage/cards/k/KozilekButcherOfTruth.java
+++ b/Mage.Sets/src/mage/cards/k/KozilekButcherOfTruth.java
@@ -59,7 +59,7 @@ public class KozilekButcherOfTruth extends CardImpl {
         // Annihilator 4 (Whenever this creature attacks, defending player sacrifices four permanents.)
         this.addAbility(new AnnihilatorAbility(4));
 
-        // When Kozilek is put into a graveyard from anywhere, its owner shuffles his or her graveyard into his or her library.
+        // When Kozilek is put into a graveyard from anywhere, its owner shuffles their graveyard into their library.
         this.addAbility(new PutIntoGraveFromAnywhereSourceTriggeredAbility(new ShuffleIntoLibraryGraveOfSourceOwnerEffect(), false));
     }
 
diff --git a/Mage.Sets/src/mage/cards/k/KraumLudevicsOpus.java b/Mage.Sets/src/mage/cards/k/KraumLudevicsOpus.java
index bc35b0ed996..595432dabde 100644
--- a/Mage.Sets/src/mage/cards/k/KraumLudevicsOpus.java
+++ b/Mage.Sets/src/mage/cards/k/KraumLudevicsOpus.java
@@ -65,7 +65,7 @@ public class KraumLudevicsOpus extends CardImpl {
         // Haste
         this.addAbility(HasteAbility.getInstance());
 
-        // Whenever an opponent casts his or her second spell each turn, draw a card.
+        // Whenever an opponent casts their second spell each turn, draw a card.
         this.addAbility(new KraumLudevicsOpusTriggeredAbility(), new CastSpellLastTurnWatcher());
 
         // Partner
@@ -116,6 +116,6 @@ class KraumLudevicsOpusTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "Whenever an opponent casts his or her second spell each turn, draw a card.";
+        return "Whenever an opponent casts their second spell each turn, draw a card.";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/k/KrosanReclamation.java b/Mage.Sets/src/mage/cards/k/KrosanReclamation.java
index 72b2790bf3e..6b2a2ecd022 100644
--- a/Mage.Sets/src/mage/cards/k/KrosanReclamation.java
+++ b/Mage.Sets/src/mage/cards/k/KrosanReclamation.java
@@ -55,7 +55,7 @@ public class KrosanReclamation extends CardImpl {
     public KrosanReclamation(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{G}");
 
-        // Target player shuffles up to two target cards from his or her graveyard into his or her library.
+        // Target player shuffles up to two target cards from their graveyard into their library.
         this.getSpellAbility().addEffect(new KrosanReclamationEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addTarget(new KrosanReclamationTarget());
@@ -78,7 +78,7 @@ class KrosanReclamationEffect extends OneShotEffect {
 
     public KrosanReclamationEffect() {
         super(Outcome.Neutral);
-        this.staticText = "Target player shuffles up to two target cards from his or her graveyard into his or her library";
+        this.staticText = "Target player shuffles up to two target cards from their graveyard into their library";
     }
 
     public KrosanReclamationEffect(final KrosanReclamationEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/k/Kudzu.java b/Mage.Sets/src/mage/cards/k/Kudzu.java
index d15fb7dda08..398a081c933 100644
--- a/Mage.Sets/src/mage/cards/k/Kudzu.java
+++ b/Mage.Sets/src/mage/cards/k/Kudzu.java
@@ -66,7 +66,7 @@ public class Kudzu extends CardImpl {
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
 
-        // When enchanted land becomes tapped, destroy it. That land's controller attaches Kudzu to a land of his or her choice.
+        // When enchanted land becomes tapped, destroy it. That land's controller attaches Kudzu to a land of their choice.
         this.addAbility(new BecomesTappedAttachedTriggeredAbility(new KudzuEffect(), "enchanted land"));
 
     }
@@ -85,7 +85,7 @@ class KudzuEffect extends OneShotEffect {
 
     public KudzuEffect() {
         super(Outcome.Detriment);
-        staticText = "destroy it. That land's controller attaches {this} to a land of his or her choice";
+        staticText = "destroy it. That land's controller attaches {this} to a land of their choice";
     }
 
     public KudzuEffect(final KudzuEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/k/KynaiosAndTiroOfMeletis.java b/Mage.Sets/src/mage/cards/k/KynaiosAndTiroOfMeletis.java
index 4e09766c15f..5d2a8c4684e 100644
--- a/Mage.Sets/src/mage/cards/k/KynaiosAndTiroOfMeletis.java
+++ b/Mage.Sets/src/mage/cards/k/KynaiosAndTiroOfMeletis.java
@@ -62,7 +62,7 @@ public class KynaiosAndTiroOfMeletis extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(8);
 
-        // At the beginning of your end step, draw a card. Each player may put a land card from his or her hand onto the battlefield, then each opponent who didn't draws a card.
+        // At the beginning of your end step, draw a card. Each player may put a land card from their hand onto the battlefield, then each opponent who didn't draws a card.
         this.addAbility(new BeginningOfEndStepTriggeredAbility(new KynaiosAndTirosEffect(), TargetController.YOU, false));
     }
 
@@ -86,7 +86,7 @@ class KynaiosAndTirosEffect extends OneShotEffect {
 
     public KynaiosAndTirosEffect() {
         super(Outcome.DrawCard);
-        staticText = "draw a card. Each player may put a land card from his or her hand onto the battlefield, then each opponent who didn't draws a card";
+        staticText = "draw a card. Each player may put a land card from their hand onto the battlefield, then each opponent who didn't draws a card";
     }
 
     public KynaiosAndTirosEffect(final KynaiosAndTirosEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/k/KyokiSanitysEclipse.java b/Mage.Sets/src/mage/cards/k/KyokiSanitysEclipse.java
index 1df990a5ad1..d6fc9e8d2c2 100644
--- a/Mage.Sets/src/mage/cards/k/KyokiSanitysEclipse.java
+++ b/Mage.Sets/src/mage/cards/k/KyokiSanitysEclipse.java
@@ -57,7 +57,7 @@ public class KyokiSanitysEclipse extends CardImpl {
         this.power = new MageInt(6);
         this.toughness = new MageInt(4);
 
-        // Whenever you cast a Spirit or Arcane spell, target opponent exiles a card from his or her hand.
+        // Whenever you cast a Spirit or Arcane spell, target opponent exiles a card from their hand.
         Ability ability = new SpellCastControllerTriggeredAbility(new ExileFromZoneTargetEffect(Zone.HAND, null, "", new FilterCard()), StaticFilters.SPIRIT_OR_ARCANE_CARD, false);
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/l/LammastideWeave.java b/Mage.Sets/src/mage/cards/l/LammastideWeave.java
index afd8334d5d4..6f6a3732796 100644
--- a/Mage.Sets/src/mage/cards/l/LammastideWeave.java
+++ b/Mage.Sets/src/mage/cards/l/LammastideWeave.java
@@ -51,7 +51,7 @@ public class LammastideWeave extends CardImpl {
     public LammastideWeave(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{G}");
 
-        // Name a card, then target player puts the top card of his or her library into his or her graveyard. If that card is the named card, you gain life equal to its converted mana cost.
+        // Name a card, then target player puts the top card of their library into their graveyard. If that card is the named card, you gain life equal to its converted mana cost.
         this.getSpellAbility().addEffect(new NameACardEffect(NameACardEffect.TypeOfName.ALL));
         this.getSpellAbility().addEffect(new LammastideWeaveEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
@@ -75,7 +75,7 @@ class LammastideWeaveEffect extends OneShotEffect {
 
     public LammastideWeaveEffect() {
         super(Outcome.DrawCard);
-        this.staticText = ", then target player puts the top card of his or her library into his or her graveyard. "
+        this.staticText = ", then target player puts the top card of their library into their graveyard. "
                 + "If that card is the named card, you gain life equal to its converted mana cost.";
     }
 
diff --git a/Mage.Sets/src/mage/cards/l/LanternOfInsight.java b/Mage.Sets/src/mage/cards/l/LanternOfInsight.java
index 0c51e86d3dc..2fef3b10056 100644
--- a/Mage.Sets/src/mage/cards/l/LanternOfInsight.java
+++ b/Mage.Sets/src/mage/cards/l/LanternOfInsight.java
@@ -50,10 +50,10 @@ public class LanternOfInsight extends CardImpl {
     public LanternOfInsight(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}");
 
-        // Each player plays with the top card of his or her library revealed.
+        // Each player plays with the top card of their library revealed.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayWithTheTopCardRevealedEffect(true)));
         
-        // {tap}, Sacrifice Lantern of Insight: Target player shuffles his or her library.
+        // {tap}, Sacrifice Lantern of Insight: Target player shuffles their library.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShuffleLibraryTargetEffect(), new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
         ability.addTarget(new TargetPlayer());
diff --git a/Mage.Sets/src/mage/cards/l/LaquatussCreativity.java b/Mage.Sets/src/mage/cards/l/LaquatussCreativity.java
index fc1e5366bec..a8c7b4bad48 100644
--- a/Mage.Sets/src/mage/cards/l/LaquatussCreativity.java
+++ b/Mage.Sets/src/mage/cards/l/LaquatussCreativity.java
@@ -49,7 +49,7 @@ public class LaquatussCreativity extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{U}");
 
 
-        // Target player draws cards equal to the number of cards in his or her hand, then discards that many cards.
+        // Target player draws cards equal to the number of cards in their hand, then discards that many cards.
         this.getSpellAbility().addEffect(new LaquatussCreativityEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
@@ -68,7 +68,7 @@ class LaquatussCreativityEffect extends OneShotEffect {
     
     public LaquatussCreativityEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Target player draws cards equal to the number of cards in his or her hand, then discards that many cards.";
+        this.staticText = "Target player draws cards equal to the number of cards in their hand, then discards that many cards.";
     }
     
     public LaquatussCreativityEffect(final LaquatussCreativityEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/l/LastRites.java b/Mage.Sets/src/mage/cards/l/LastRites.java
index 151775f5e1a..430774a983a 100644
--- a/Mage.Sets/src/mage/cards/l/LastRites.java
+++ b/Mage.Sets/src/mage/cards/l/LastRites.java
@@ -59,7 +59,7 @@ public class LastRites extends CardImpl {
     public LastRites(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}");
 
-        // Discard any number of cards. Target player reveals his or her hand, then you choose a nonland card from it for each card discarded this way. That player discards those cards.
+        // Discard any number of cards. Target player reveals their hand, then you choose a nonland card from it for each card discarded this way. That player discards those cards.
         this.getSpellAbility().addEffect(new LastRitesEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
 
@@ -79,7 +79,7 @@ class LastRitesEffect extends OneShotEffect {
 
     LastRitesEffect() {
         super(Outcome.Discard);
-        this.staticText = "Discard any number of cards. Target player reveals his or her hand, then you choose a nonland card from it for each card discarded this way. That player discards those cards";
+        this.staticText = "Discard any number of cards. Target player reveals their hand, then you choose a nonland card from it for each card discarded this way. That player discards those cards";
     }
 
     LastRitesEffect(final LastRitesEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/l/LavaballTrap.java b/Mage.Sets/src/mage/cards/l/LavaballTrap.java
index 9b480e1572a..1074b49c8cb 100644
--- a/Mage.Sets/src/mage/cards/l/LavaballTrap.java
+++ b/Mage.Sets/src/mage/cards/l/LavaballTrap.java
@@ -57,7 +57,7 @@ public class LavaballTrap extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{6}{R}{R}");
         this.subtype.add(SubType.TRAP);
 
-        // If an opponent had two or more lands enter the battlefield under his or her control this turn, you may pay {3}{R}{R} rather than pay Lavaball Trap's mana cost.
+        // If an opponent had two or more lands enter the battlefield under their control this turn, you may pay {3}{R}{R} rather than pay Lavaball Trap's mana cost.
         this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{3}{R}{R}"), LavaballTrapCondition.instance), new PermanentsEnteredBattlefieldWatcher());
 
         // Destroy two target lands. Lavaball Trap deals 4 damage to each creature.
@@ -105,6 +105,6 @@ enum LavaballTrapCondition implements Condition {
 
     @Override
     public String toString() {
-        return "If an opponent had two or more lands enter the battlefield under his or her control this turn";
+        return "If an opponent had two or more lands enter the battlefield under their control this turn";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/l/LayBareTheHeart.java b/Mage.Sets/src/mage/cards/l/LayBareTheHeart.java
index 30b6c9c244a..7c4c63a577e 100644
--- a/Mage.Sets/src/mage/cards/l/LayBareTheHeart.java
+++ b/Mage.Sets/src/mage/cards/l/LayBareTheHeart.java
@@ -56,7 +56,7 @@ public class LayBareTheHeart extends CardImpl {
     public LayBareTheHeart(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{B}");
 
-        // Target opponent reveals his or her hand. You choose a nonlegendary, nonland card from it. That player discards that card.
+        // Target opponent reveals their hand. You choose a nonlegendary, nonland card from it. That player discards that card.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(filter, TargetController.ANY));
     }
diff --git a/Mage.Sets/src/mage/cards/l/LearnFromThePast.java b/Mage.Sets/src/mage/cards/l/LearnFromThePast.java
index 57bf9f9c844..fea5967e705 100644
--- a/Mage.Sets/src/mage/cards/l/LearnFromThePast.java
+++ b/Mage.Sets/src/mage/cards/l/LearnFromThePast.java
@@ -50,7 +50,7 @@ public class LearnFromThePast extends CardImpl {
     public LearnFromThePast(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{U}");
 
-        // Target player shuffles his or her graveyard into his or her library
+        // Target player shuffles their graveyard into their library
         this.getSpellAbility().addEffect(new LearnFromThePastEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
         
@@ -72,7 +72,7 @@ class LearnFromThePastEffect extends OneShotEffect {
     
     LearnFromThePastEffect() {
         super(Outcome.Neutral);
-        this.staticText = "Target player shuffles his or her graveyard into his or her library";
+        this.staticText = "Target player shuffles their graveyard into their library";
     }
     
     LearnFromThePastEffect(final LearnFromThePastEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/l/LensOfClarity.java b/Mage.Sets/src/mage/cards/l/LensOfClarity.java
index 98f2dfde905..391f85231bf 100644
--- a/Mage.Sets/src/mage/cards/l/LensOfClarity.java
+++ b/Mage.Sets/src/mage/cards/l/LensOfClarity.java
@@ -122,7 +122,7 @@ class LensOfClarityLookLibraryEffect extends OneShotEffect {
             Cards cards = new CardsImpl();
             cards.add(card);
             controller.lookAtCards("top card of library - " + controller.getName(), cards, game);
-            game.informPlayers(controller.getLogName() + " looks at the top card of his or her library");
+            game.informPlayers(controller.getLogName() + " looks at the top card of their library");
         } else {
             return false;
         }
diff --git a/Mage.Sets/src/mage/cards/l/LifebaneZombie.java b/Mage.Sets/src/mage/cards/l/LifebaneZombie.java
index cd4c95c5b2f..c3932fd25dd 100644
--- a/Mage.Sets/src/mage/cards/l/LifebaneZombie.java
+++ b/Mage.Sets/src/mage/cards/l/LifebaneZombie.java
@@ -66,7 +66,7 @@ public class LifebaneZombie extends CardImpl {
 
         // Intimidate
         this.addAbility(IntimidateAbility.getInstance());
-        // When Lifebane Zombie enters the battlefield, target opponent reveals his or her hand. You choose a green or white creature card from it and exile that card.
+        // When Lifebane Zombie enters the battlefield, target opponent reveals their hand. You choose a green or white creature card from it and exile that card.
         Ability ability = new EntersBattlefieldTriggeredAbility(new ExileCardYouChooseTargetOpponentEffect(filter));
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);        
diff --git a/Mage.Sets/src/mage/cards/l/LifesFinale.java b/Mage.Sets/src/mage/cards/l/LifesFinale.java
index 26988163f76..af8f8d9749c 100644
--- a/Mage.Sets/src/mage/cards/l/LifesFinale.java
+++ b/Mage.Sets/src/mage/cards/l/LifesFinale.java
@@ -73,7 +73,7 @@ class LifesFinaleEffect extends OneShotEffect {
 
     public LifesFinaleEffect() {
         super(Outcome.DestroyPermanent);
-        staticText = "Destroy all creatures, then search target opponent's library for up to three creature cards and put them into his or her graveyard. Then that player shuffles his or her library";
+        staticText = "Destroy all creatures, then search target opponent's library for up to three creature cards and put them into their graveyard. Then that player shuffles their library";
     }
 
     public LifesFinaleEffect(final LifesFinaleEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/l/LightningShrieker.java b/Mage.Sets/src/mage/cards/l/LightningShrieker.java
index 2765de7bd5d..b48034df1f0 100644
--- a/Mage.Sets/src/mage/cards/l/LightningShrieker.java
+++ b/Mage.Sets/src/mage/cards/l/LightningShrieker.java
@@ -60,9 +60,9 @@ public class LightningShrieker extends CardImpl {
         this.addAbility(TrampleAbility.getInstance());
         // Haste
         this.addAbility(HasteAbility.getInstance());
-        // At the beginning of the end step, Lightning Shrieker's owner shuffles it into his or her library.
+        // At the beginning of the end step, Lightning Shrieker's owner shuffles it into their library.
         Effect effect = new ShuffleIntoLibrarySourceEffect();
-        effect.setText("{this}'s owner shuffles it into his or her library.");
+        effect.setText("{this}'s owner shuffles it into their library.");
         this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.ANY, null, false));
     }
 
diff --git a/Mage.Sets/src/mage/cards/l/LilianaOfTheVeil.java b/Mage.Sets/src/mage/cards/l/LilianaOfTheVeil.java
index 34c16ed54bf..9fb009ef337 100644
--- a/Mage.Sets/src/mage/cards/l/LilianaOfTheVeil.java
+++ b/Mage.Sets/src/mage/cards/l/LilianaOfTheVeil.java
@@ -71,7 +71,7 @@ public class LilianaOfTheVeil extends CardImpl {
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
 
-        // -6: Separate all permanents target player controls into two piles. That player sacrifices all permanents in the pile of his or her choice.
+        // -6: Separate all permanents target player controls into two piles. That player sacrifices all permanents in the pile of their choice.
         ability = new LoyaltyAbility(new LilianaOfTheVeilEffect(), -6);
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
@@ -91,7 +91,7 @@ class LilianaOfTheVeilEffect extends OneShotEffect {
 
     public LilianaOfTheVeilEffect() {
         super(Outcome.Sacrifice);
-        this.staticText = "Separate all permanents target player controls into two piles. That player sacrifices all permanents in the pile of his or her choice";
+        this.staticText = "Separate all permanents target player controls into two piles. That player sacrifices all permanents in the pile of their choice";
     }
 
     public LilianaOfTheVeilEffect(final LilianaOfTheVeilEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/l/LivingDeath.java b/Mage.Sets/src/mage/cards/l/LivingDeath.java
index e504547fd4d..968aa9f8973 100644
--- a/Mage.Sets/src/mage/cards/l/LivingDeath.java
+++ b/Mage.Sets/src/mage/cards/l/LivingDeath.java
@@ -55,7 +55,7 @@ public class LivingDeath extends CardImpl {
     public LivingDeath(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{B}{B}");
 
-        // 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.
+        // Each player exiles all creature cards from their graveyard, then sacrifices all creatures he or she controls, then puts all cards he or she exiled this way onto the battlefield.
         this.getSpellAbility().addEffect(new LivingDeathEffect());
     }
 
@@ -73,7 +73,7 @@ class LivingDeathEffect extends OneShotEffect {
 
     public LivingDeathEffect() {
         super(Outcome.Benefit);
-        this.staticText = "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";
+        this.staticText = "Each player exiles all creature cards from their graveyard, then sacrifices all creatures he or she controls, then puts all cards he or she exiled this way onto the battlefield";
     }
 
     public LivingDeathEffect(final LivingDeathEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/l/LivingEnd.java b/Mage.Sets/src/mage/cards/l/LivingEnd.java
index 5cd0c95f7ed..cb3419298a7 100644
--- a/Mage.Sets/src/mage/cards/l/LivingEnd.java
+++ b/Mage.Sets/src/mage/cards/l/LivingEnd.java
@@ -61,7 +61,7 @@ public class LivingEnd extends CardImpl {
 
         // Suspend 3-{2}{B}{B}
         this.addAbility(new SuspendAbility(3, new ManaCostsImpl("{2}{B}{B}"), this));
-        // Each player exiles all creature cards from his or her graveyard, then sacrifices all creatures
+        // Each player exiles all creature cards from their graveyard, then sacrifices all creatures
         // he or she controls, then puts all cards he or she exiled this way onto the battlefield.
         this.getSpellAbility().addEffect(new LivingEndEffect());
 
@@ -81,7 +81,7 @@ class LivingEndEffect extends OneShotEffect {
 
     public LivingEndEffect() {
         super(Outcome.Benefit);
-        this.staticText = "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";
+        this.staticText = "Each player exiles all creature cards from their graveyard, then sacrifices all creatures he or she controls, then puts all cards he or she exiled this way onto the battlefield";
     }
 
     public LivingEndEffect(final LivingEndEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/l/LoamingShaman.java b/Mage.Sets/src/mage/cards/l/LoamingShaman.java
index 9e202410427..0e204897b7d 100644
--- a/Mage.Sets/src/mage/cards/l/LoamingShaman.java
+++ b/Mage.Sets/src/mage/cards/l/LoamingShaman.java
@@ -61,7 +61,7 @@ public class LoamingShaman extends CardImpl {
         this.power = new MageInt(3);
         this.toughness = new MageInt(2);
 
-        // When Loaming Shaman enters the battlefield, target player shuffles any number of target cards from his or her graveyard into his or her library.
+        // When Loaming Shaman enters the battlefield, target player shuffles any number of target cards from their graveyard into their library.
         Ability ability = new EntersBattlefieldTriggeredAbility(new LoamingShamanEffect(), false);
         ability.addTarget(new TargetPlayer());
         ability.addTarget(new LoamingShamanTargetCardsInGraveyard(0, Integer.MAX_VALUE, new FilterCard("cards in target player's graveyard")));
@@ -82,7 +82,7 @@ class LoamingShamanEffect extends OneShotEffect {
 
     public LoamingShamanEffect() {
         super(Outcome.Benefit);
-        this.staticText = "target player shuffles any number of target cards from his or her graveyard into his or her library";
+        this.staticText = "target player shuffles any number of target cards from their graveyard into their library";
     }
 
     public LoamingShamanEffect(final LoamingShamanEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/l/Lobotomy.java b/Mage.Sets/src/mage/cards/l/Lobotomy.java
index cc06c09d19f..26bdd6e6cbf 100644
--- a/Mage.Sets/src/mage/cards/l/Lobotomy.java
+++ b/Mage.Sets/src/mage/cards/l/Lobotomy.java
@@ -56,7 +56,7 @@ public class Lobotomy extends CardImpl {
     public Lobotomy(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{U}{B}");
 
-        // Target player reveals his or her hand, then you choose a card other than a basic land card from it. Search that player's graveyard, hand, and library for all cards with the same name as the chosen card and exile them. Then that player shuffles his or her library.
+        // Target player reveals their hand, then you choose a card other than a basic land card from it. Search that player's graveyard, hand, and library for all cards with the same name as the chosen card and exile them. Then that player shuffles their library.
         this.getSpellAbility().addEffect(new LobotomyEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
@@ -81,7 +81,7 @@ class LobotomyEffect extends OneShotEffect {
 
     public LobotomyEffect() {
         super(Outcome.Benefit);
-        staticText = "Target player reveals his or her hand, then you choose a card other than a basic land card from it. Search that player's graveyard, hand, and library for all cards with the same name as the chosen card and exile them. Then that player shuffles his or her library";
+        staticText = "Target player reveals their hand, then you choose a card other than a basic land card from it. Search that player's graveyard, hand, and library for all cards with the same name as the chosen card and exile them. Then that player shuffles their library";
     }
 
     public LobotomyEffect(final LobotomyEffect effect) {
@@ -137,7 +137,7 @@ class LobotomyEffect extends OneShotEffect {
             }
 
             // search cards in Library
-            // If the player has no nonland cards in his or her hand, you can still search that player's library and have him or her shuffle it.
+            // If the player has no nonland cards in their hand, you can still search that player's library and have him or her shuffle it.
             if (chosenCard != null || controller.chooseUse(outcome, "Search library anyway?", source, game)) {
                 TargetCardInLibrary targetCardsLibrary = new TargetCardInLibrary(0, Integer.MAX_VALUE, filterNamedCards);
                 controller.searchLibrary(targetCardsLibrary, game, targetPlayer.getId());
diff --git a/Mage.Sets/src/mage/cards/l/LodestoneBauble.java b/Mage.Sets/src/mage/cards/l/LodestoneBauble.java
index 4f8b6609759..60fa3ff2961 100644
--- a/Mage.Sets/src/mage/cards/l/LodestoneBauble.java
+++ b/Mage.Sets/src/mage/cards/l/LodestoneBauble.java
@@ -64,7 +64,7 @@ public class LodestoneBauble extends CardImpl {
     public LodestoneBauble(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{0}");
 
-        // {1}, {T}, Sacrifice Lodestone Bauble: Put up to four target basic land cards from a player's graveyard on top of his or her library in any order. That player draws a card at the beginning of the next turn's upkeep.
+        // {1}, {T}, Sacrifice Lodestone Bauble: Put up to four target basic land cards from a player's graveyard on top of their library in any order. That player draws a card at the beginning of the next turn's upkeep.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LodestoneBaubleEffect(), new GenericManaCost(1));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
@@ -116,7 +116,7 @@ class LodestoneBaubleEffect extends OneShotEffect {
     
     LodestoneBaubleEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Put up to four target basic land cards from a player's graveyard on top of his or her library in any order";
+        this.staticText = "Put up to four target basic land cards from a player's graveyard on top of their library in any order";
     }
 
     LodestoneBaubleEffect(final LodestoneBaubleEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/l/LostHours.java b/Mage.Sets/src/mage/cards/l/LostHours.java
index 3a61f20295e..eeeaa9e983f 100644
--- a/Mage.Sets/src/mage/cards/l/LostHours.java
+++ b/Mage.Sets/src/mage/cards/l/LostHours.java
@@ -54,7 +54,7 @@ public class LostHours extends CardImpl {
     public LostHours(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{B}");
 
-        // Target player reveals his or her hand. You choose a nonland card from it. That player puts that card into his or her library third from the top.
+        // Target player reveals their hand. You choose a nonland card from it. That player puts that card into their library third from the top.
         this.getSpellAbility().addEffect(new LostHoursEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
@@ -79,7 +79,7 @@ class LostHoursEffect extends OneShotEffect {
 
     public LostHoursEffect() {
         super(Outcome.Discard);
-        this.staticText = "Target player reveals his or her hand. You choose a nonland card from it. That player puts that card into his or her library third from the top.";
+        this.staticText = "Target player reveals their hand. You choose a nonland card from it. That player puts that card into their library third from the top.";
     }
     
     public LostHoursEffect(final LostHoursEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/l/LostLegacy.java b/Mage.Sets/src/mage/cards/l/LostLegacy.java
index fc60ec788b4..9a6adc47f87 100644
--- a/Mage.Sets/src/mage/cards/l/LostLegacy.java
+++ b/Mage.Sets/src/mage/cards/l/LostLegacy.java
@@ -50,7 +50,7 @@ public class LostLegacy extends CardImpl {
     public LostLegacy(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{B}{B}");
 
-        // Name a nonartifact, nonland card. Search target player's graveyard, hand and library for any number of cards with that name and exile them. That player shuffles his or her library, then draws a card for each card exiled from hand this way.
+        // Name a nonartifact, nonland card. Search target player's graveyard, hand and library for any number of cards with that name and exile them. That player shuffles their library, then draws a card for each card exiled from hand this way.
         this.getSpellAbility().addEffect((new NameACardEffect(NameACardEffect.TypeOfName.NON_ARTIFACT_AND_NON_LAND_NAME)));
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new LostLegacyEffect());
@@ -101,6 +101,6 @@ class LostLegacyEffect extends SearchTargetGraveyardHandLibraryForCardNameAndExi
 
     @Override
     public String getText(Mode mode) {
-        return "Search target player's graveyard, hand and library for any number of cards with that name and exile them. That player shuffles his or her library, then draws a card for each card exiled from hand this way";
+        return "Search target player's graveyard, hand and library for any number of cards with that name and exile them. That player shuffles their library, then draws a card for each card exiled from hand this way";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/m/MadScienceFairProject.java b/Mage.Sets/src/mage/cards/m/MadScienceFairProject.java
index 0f56b423bc0..a877f684ae9 100644
--- a/Mage.Sets/src/mage/cards/m/MadScienceFairProject.java
+++ b/Mage.Sets/src/mage/cards/m/MadScienceFairProject.java
@@ -52,7 +52,7 @@ public class MadScienceFairProject extends CardImpl {
     public MadScienceFairProject(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
 
-        // {tap}: Roll a six-sided die. On a 3 or lower, target player adds {C} to his or her mana pool. Otherwise, that player adds one mana of any color he or she chooses to his or her mana pool.
+        // {tap}: Roll a six-sided die. On a 3 or lower, target player adds {C} to their mana pool. Otherwise, that player adds one mana of any color he or she chooses to their mana pool.
         this.addAbility(new MadScienceFairProjectManaAbility());
     }
 
@@ -86,7 +86,7 @@ class MadScienceFairManaEffect extends ManaEffect {
 
     public MadScienceFairManaEffect() {
         super();
-        this.staticText = "Roll a six-sided die. On a 3 or lower, target player adds {C} to his or her mana pool. Otherwise, that player adds one mana of any color he or she chooses to his or her mana pool";
+        this.staticText = "Roll a six-sided die. On a 3 or lower, target player adds {C} to their mana pool. Otherwise, that player adds one mana of any color he or she chooses to their mana pool";
     }
 
     public MadScienceFairManaEffect(final MadScienceFairManaEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/MagisterOfWorth.java b/Mage.Sets/src/mage/cards/m/MagisterOfWorth.java
index 9a48ccc4386..1eaf8660a05 100644
--- a/Mage.Sets/src/mage/cards/m/MagisterOfWorth.java
+++ b/Mage.Sets/src/mage/cards/m/MagisterOfWorth.java
@@ -64,9 +64,9 @@ public class MagisterOfWorth extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
 
-        // Will of the council - When Magister of Worth enters the battlefield, starting with you, each player votes for grace or condemnation. If grace gets more votes, each player returns each creature card from his or her graveyard to the battlefield. If condemnation gets more votes or the vote is tied, destroy all creatures other than Magister of Worth.
+        // Will of the council - When Magister of Worth enters the battlefield, starting with you, each player votes for grace or condemnation. If grace gets more votes, each player returns each creature card from their graveyard to the battlefield. If condemnation gets more votes or the vote is tied, destroy all creatures other than Magister of Worth.
         Effect effect = new MagisterOfWorthVoteEffect();
-        effect.setText("Will of the council - When Magister of Worth enters the battlefield, starting with you, each player votes for grace or condemnation. If grace gets more votes, each player returns each creature card from his or her graveyard to the battlefield. If condemnation gets more votes or the vote is tied, destroy all creatures other than Magister of Worth");
+        effect.setText("Will of the council - When Magister of Worth enters the battlefield, starting with you, each player votes for grace or condemnation. If grace gets more votes, each player returns each creature card from their graveyard to the battlefield. If condemnation gets more votes or the vote is tied, destroy all creatures other than Magister of Worth");
         this.addAbility(new EntersBattlefieldTriggeredAbility(effect, false, true));
     }
 
@@ -84,7 +84,7 @@ class MagisterOfWorthVoteEffect extends OneShotEffect {
 
     MagisterOfWorthVoteEffect() {
         super(Outcome.Benefit);
-        this.staticText = "<i>Will of the council</i> - When {this} enters the battlefield, starting with you, each player votes for grace or condemnation. If grace gets more votes, each player returns each creature card from his or her graveyard to the battlefield. If condemnation gets more votes or the vote is tied, destroy all creatures other than {this}.";
+        this.staticText = "<i>Will of the council</i> - When {this} enters the battlefield, starting with you, each player votes for grace or condemnation. If grace gets more votes, each player returns each creature card from their graveyard to the battlefield. If condemnation gets more votes or the vote is tied, destroy all creatures other than {this}.";
     }
 
     MagisterOfWorthVoteEffect(final MagisterOfWorthVoteEffect effect) {
@@ -131,7 +131,7 @@ class MagisterOfWorthReturnFromGraveyardEffect extends OneShotEffect {
 
     public MagisterOfWorthReturnFromGraveyardEffect() {
         super(Outcome.PutCreatureInPlay);
-        staticText = "each player returns each creature card from his or her graveyard to the battlefield";
+        staticText = "each player returns each creature card from their graveyard to the battlefield";
     }
 
     public MagisterOfWorthReturnFromGraveyardEffect(final MagisterOfWorthReturnFromGraveyardEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheAbyss.java b/Mage.Sets/src/mage/cards/m/MagusOfTheAbyss.java
index e9ac9a63f29..ce3e0684674 100644
--- a/Mage.Sets/src/mage/cards/m/MagusOfTheAbyss.java
+++ b/Mage.Sets/src/mage/cards/m/MagusOfTheAbyss.java
@@ -59,7 +59,7 @@ public class MagusOfTheAbyss extends CardImpl {
         this.power = new MageInt(4);
         this.toughness = new MageInt(3);
 
-        // At the beginning of each player's upkeep, destroy target nonartifact creature that player controls of his or her choice. It can't be regenerated.
+        // At the beginning of each player's upkeep, destroy target nonartifact creature that player controls of their choice. It can't be regenerated.
         this.addAbility(new MagusOfTheAbyssTriggeredAbility());
     }
 
@@ -112,6 +112,6 @@ class MagusOfTheAbyssTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "At the beginning of each player's upkeep, destroy target nonartifact creature that player controls of his or her choice. It can't be regenerated.";
+        return "At the beginning of each player's upkeep, destroy target nonartifact creature that player controls of their choice. It can't be regenerated.";
     }
 }
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheJar.java b/Mage.Sets/src/mage/cards/m/MagusOfTheJar.java
index 52f8960a49a..ca6d9073e4b 100644
--- a/Mage.Sets/src/mage/cards/m/MagusOfTheJar.java
+++ b/Mage.Sets/src/mage/cards/m/MagusOfTheJar.java
@@ -64,7 +64,7 @@ public class MagusOfTheJar extends CardImpl {
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);
 
-        // {tap}, Sacrifice Magus of the Jar: Each player exiles all cards from his or her hand face down and draws seven cards. At the beginning of the next end step, each player discards his or her hand and returns to his or her hand each card he or she exiled this way.
+        // {tap}, Sacrifice Magus of the Jar: Each player exiles all cards from their hand face down and draws seven cards. At the beginning of the next end step, each player discards their hand and returns to their hand each card he or she exiled this way.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MagusoftheJarEffect(), new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
@@ -85,7 +85,7 @@ class MagusoftheJarEffect extends OneShotEffect {
 
     public MagusoftheJarEffect() {
         super(Outcome.DrawCard);
-        staticText = "Each player exiles all cards from his or her hand face down and draws seven cards. At the beginning of the next end step, each player discards his or her hand and returns to his or her hand each card he or she exiled this way.";
+        staticText = "Each player exiles all cards from their hand face down and draws seven cards. At the beginning of the next end step, each player discards their hand and returns to their hand each card he or she exiled this way.";
     }
 
     public MagusoftheJarEffect(final MagusoftheJarEffect effect) {
@@ -134,7 +134,7 @@ class MagusoftheJarDelayedEffect extends OneShotEffect {
 
     public MagusoftheJarDelayedEffect() {
         super(Outcome.DrawCard);
-        staticText = "At the beginning of the next end step, each player discards his or her hand and returns to his or her hand each card he or she exiled this way";
+        staticText = "At the beginning of the next end step, each player discards their hand and returns to their hand each card he or she exiled this way";
     }
 
     public MagusoftheJarDelayedEffect(final MagusoftheJarDelayedEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheWheel.java b/Mage.Sets/src/mage/cards/m/MagusOfTheWheel.java
index 2a90b3896a4..01da724ec05 100644
--- a/Mage.Sets/src/mage/cards/m/MagusOfTheWheel.java
+++ b/Mage.Sets/src/mage/cards/m/MagusOfTheWheel.java
@@ -56,7 +56,7 @@ public class MagusOfTheWheel extends CardImpl {
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);
 
-        // {1}{R}, {T}, Sacrifice Magus of the Wheel: Each player discards his or her hand, then draws seven cards.
+        // {1}{R}, {T}, Sacrifice Magus of the Wheel: Each player discards their hand, then draws seven cards.
         Effect effect = new DrawCardAllEffect(7);
         effect.setText(", then draws seven cards");
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DiscardHandAllEffect(), new ManaCostsImpl("{1}{R}"));
diff --git a/Mage.Sets/src/mage/cards/m/ManaCache.java b/Mage.Sets/src/mage/cards/m/ManaCache.java
index e5976b259bf..6094d2a9ba2 100644
--- a/Mage.Sets/src/mage/cards/m/ManaCache.java
+++ b/Mage.Sets/src/mage/cards/m/ManaCache.java
@@ -66,7 +66,7 @@ public class ManaCache extends CardImpl {
         TriggeredAbility ability = new OnEventTriggeredAbility(GameEvent.EventType.END_TURN_STEP_PRE, "beginning of each player's end step", true, new ManaCacheEffect());
         this.addAbility(ability);
         
-        // Remove a charge counter from Mana Cache: Add {C} to your mana pool. Any player may activate this ability but only during his or her turn before the end step.
+        // Remove a charge counter from Mana Cache: Add {C} to your mana pool. Any player may activate this ability but only during their turn before the end step.
         this.addAbility(new ManaCacheManaAbility());
     }
 
@@ -143,6 +143,6 @@ class ManaCacheManaAbility extends ActivatedManaAbilityImpl {
 
     @Override
     public String getRule() {
-        return super.getRule() + " Any player may activate this ability but only during his or her turn before the end step.";
+        return super.getRule() + " Any player may activate this ability but only during their turn before the end step.";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/m/ManaFlare.java b/Mage.Sets/src/mage/cards/m/ManaFlare.java
index 551afacd7ef..ba0283d1331 100644
--- a/Mage.Sets/src/mage/cards/m/ManaFlare.java
+++ b/Mage.Sets/src/mage/cards/m/ManaFlare.java
@@ -45,7 +45,7 @@ public class ManaFlare extends CardImpl {
     public ManaFlare(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}");
 
-        // Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
+        // Whenever a player taps a land for mana, that player adds one mana to their mana pool of any type that land produced.
         this.addAbility(new TapForManaAllTriggeredManaAbility(
                 new AddManaOfAnyTypeProducedEffect(),
                 new FilterLandPermanent("a player taps a land"),
diff --git a/Mage.Sets/src/mage/cards/m/ManaShort.java b/Mage.Sets/src/mage/cards/m/ManaShort.java
index ba2ca93ae6f..567fef5ed66 100644
--- a/Mage.Sets/src/mage/cards/m/ManaShort.java
+++ b/Mage.Sets/src/mage/cards/m/ManaShort.java
@@ -47,7 +47,7 @@ public class ManaShort extends CardImpl {
     public ManaShort(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{U}");
 
-        // Tap all lands target player controls and empty his or her mana pool.
+        // Tap all lands target player controls and empty their mana pool.
         this.getSpellAbility().addEffect(new ManaShortEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
@@ -66,7 +66,7 @@ class ManaShortEffect extends TapAllTargetPlayerControlsEffect {
 
     public ManaShortEffect() {
         super(StaticFilters.FILTER_LANDS);
-        staticText = "Tap all lands target player controls and empty his or her mana pool";
+        staticText = "Tap all lands target player controls and empty their mana pool";
     }
 
     public ManaShortEffect(final ManaShortEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/ManaVapors.java b/Mage.Sets/src/mage/cards/m/ManaVapors.java
index 7ae21cd8de4..58d04a2dd5f 100644
--- a/Mage.Sets/src/mage/cards/m/ManaVapors.java
+++ b/Mage.Sets/src/mage/cards/m/ManaVapors.java
@@ -52,7 +52,7 @@ public class ManaVapors extends CardImpl {
     public ManaVapors(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{U}");
 
-        // Lands target player controls don't untap during his or her next untap step.
+        // Lands target player controls don't untap during their next untap step.
         getSpellAbility().addTarget(new TargetPlayer());
         getSpellAbility().addEffect(new ManaVaporsEffect());
     }
@@ -71,7 +71,7 @@ class ManaVaporsEffect extends OneShotEffect {
 
     ManaVaporsEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Lands target player controls don't untap during his or her next untap step";
+        this.staticText = "Lands target player controls don't untap during their next untap step";
     }
 
     ManaVaporsEffect(final ManaVaporsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/ManicScribe.java b/Mage.Sets/src/mage/cards/m/ManicScribe.java
index f031a12b825..621a1976c27 100644
--- a/Mage.Sets/src/mage/cards/m/ManicScribe.java
+++ b/Mage.Sets/src/mage/cards/m/ManicScribe.java
@@ -55,16 +55,16 @@ public class ManicScribe extends CardImpl {
         this.power = new MageInt(0);
         this.toughness = new MageInt(3);
 
-        // When Manic Scribe enters the battlefield, each opponent puts the top three cards of his or her library into his or her graveyard.
+        // When Manic Scribe enters the battlefield, each opponent puts the top three cards of their library into their graveyard.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new PutTopCardOfLibraryIntoGraveEachPlayerEffect(3, TargetController.OPPONENT), false));
 
         // <i>Delirium</i> &mdash; At the beginning of each opponent's upkeep, if there are four or more card types among cards in your graveyard,
-        // that player puts the top three cards of his or her library into his or her graveyard.
+        // that player puts the top three cards of their library into their graveyard.
         this.addAbility(new ConditionalTriggeredAbility(
                 new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new PutTopCardOfLibraryIntoGraveTargetEffect(3), TargetController.OPPONENT, false, true),
                 DeliriumCondition.instance,
                 "<i>Delirium</i> &mdash; At the beginning of each opponent's upkeep, if there are four or more card types among cards in your graveyard, "
-                        + "that player puts the top three cards of his or her library into his or her graveyard."));
+                        + "that player puts the top three cards of their library into their graveyard."));
     }
 
     public ManicScribe(final ManicScribe card) {
diff --git a/Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java b/Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java
index 35b89caf0f7..79ecad79ce4 100644
--- a/Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java
+++ b/Mage.Sets/src/mage/cards/m/MaralenOfTheMornsong.java
@@ -60,7 +60,7 @@ public class MaralenOfTheMornsong extends CardImpl {
         // Players can't draw cards.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new MaralenOfTheMornsongEffect()));
 
-        // At the beginning of each player's draw step, that player loses 3 life, searches his or her library for a card, puts it into his or her hand, then shuffles his or her library.
+        // At the beginning of each player's draw step, that player loses 3 life, searches their library for a card, puts it into their hand, then shuffles their library.
         this.addAbility(new BeginningOfDrawTriggeredAbility(new MaralenOfTheMornsongEffect2(), TargetController.ANY, false));
 
     }
@@ -112,7 +112,7 @@ class MaralenOfTheMornsongEffect2 extends OneShotEffect {
 
     public MaralenOfTheMornsongEffect2() {
         super(Outcome.LoseLife);
-        staticText = "that player loses 3 life, searches his or her library for a card, puts it into his or her hand, then shuffles his or her library";
+        staticText = "that player loses 3 life, searches their library for a card, puts it into their hand, then shuffles their library";
     }
 
     public MaralenOfTheMornsongEffect2(final MaralenOfTheMornsongEffect2 effect) {
diff --git a/Mage.Sets/src/mage/cards/m/MarduCharm.java b/Mage.Sets/src/mage/cards/m/MarduCharm.java
index f11c1b99888..748f2d3676b 100644
--- a/Mage.Sets/src/mage/cards/m/MarduCharm.java
+++ b/Mage.Sets/src/mage/cards/m/MarduCharm.java
@@ -80,7 +80,7 @@ public class MarduCharm extends CardImpl {
         mode.getEffects().add(new MarduCharmCreateTokenEffect());
         this.getSpellAbility().addMode(mode);
 
-        // <strong>*</strong> Target opponent reveals his or her hand. You choose a noncreature, nonland card from it.  That player discards that card.
+        // <strong>*</strong> Target opponent reveals their hand. You choose a noncreature, nonland card from it.  That player discards that card.
         mode = new Mode();
         mode.getEffects().add(new DiscardCardYouChooseTargetEffect(filter));
         mode.getTargets().add(new TargetOpponent());
diff --git a/Mage.Sets/src/mage/cards/m/MarketFestival.java b/Mage.Sets/src/mage/cards/m/MarketFestival.java
index d025298f16e..5c82800ca61 100644
--- a/Mage.Sets/src/mage/cards/m/MarketFestival.java
+++ b/Mage.Sets/src/mage/cards/m/MarketFestival.java
@@ -67,7 +67,7 @@ public class MarketFestival extends CardImpl {
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
 
-        // Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors to his or her mana pool (in addition to the mana the land produces).
+        // Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors to their mana pool (in addition to the mana the land produces).
         this.addAbility(new MarketFestivalTriggeredAbility());
     }
 
@@ -109,7 +109,7 @@ class MarketFestivalTriggeredAbility extends TriggeredManaAbility {
 
     @Override
     public String getRule() {
-        return "Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors to his or her mana pool <i>(in addition to the mana the land produces)</i>.";
+        return "Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors to their mana pool <i>(in addition to the mana the land produces)</i>.";
     }
 }
 
@@ -117,7 +117,7 @@ class MarketFestivalManaEffect extends ManaEffect {
 
     public MarketFestivalManaEffect() {
         super();
-        this.staticText = "its controller adds two mana in any combination of colors to his or her mana pool";
+        this.staticText = "its controller adds two mana in any combination of colors to their mana pool";
     }
 
     public MarketFestivalManaEffect(final MarketFestivalManaEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/Memoricide.java b/Mage.Sets/src/mage/cards/m/Memoricide.java
index 6bcfe00e25e..8b054b8c26f 100644
--- a/Mage.Sets/src/mage/cards/m/Memoricide.java
+++ b/Mage.Sets/src/mage/cards/m/Memoricide.java
@@ -48,7 +48,7 @@ public class Memoricide extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{B}");
 
         // Name a nonland card. Search target player's graveyard, hand, and library for any number of cards with
-        // that name and exile them. Then that player shuffles his or her library
+        // that name and exile them. Then that player shuffles their library
         this.getSpellAbility().addEffect((new NameACardEffect(NameACardEffect.TypeOfName.NON_LAND_NAME)));
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new MemoricideEffect());
diff --git a/Mage.Sets/src/mage/cards/m/MemoryErosion.java b/Mage.Sets/src/mage/cards/m/MemoryErosion.java
index ac0aeed656b..041aebd6558 100644
--- a/Mage.Sets/src/mage/cards/m/MemoryErosion.java
+++ b/Mage.Sets/src/mage/cards/m/MemoryErosion.java
@@ -50,7 +50,7 @@ public class MemoryErosion extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}{U}");
 
 
-        // Whenever an opponent casts a spell, that player puts the top two cards of his or her library into his or her graveyard.
+        // Whenever an opponent casts a spell, that player puts the top two cards of their library into their graveyard.
         this.addAbility(new SpellCastTriggeredAbility());
     }
 
@@ -94,7 +94,7 @@ class SpellCastTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "Whenever an opponent casts a spell, that player puts the top two cards of his or her library into his or her graveyard";
+        return "Whenever an opponent casts a spell, that player puts the top two cards of their library into their graveyard";
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/m/MemoryJar.java b/Mage.Sets/src/mage/cards/m/MemoryJar.java
index e4461295e05..6fed56a6786 100644
--- a/Mage.Sets/src/mage/cards/m/MemoryJar.java
+++ b/Mage.Sets/src/mage/cards/m/MemoryJar.java
@@ -58,8 +58,8 @@ public class MemoryJar extends CardImpl {
     public MemoryJar(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}");
 
-        // {T}, Sacrifice Memory Jar: Each player exiles all cards from his or her hand face down and draws seven cards.
-        // At the beginning of the next end step, each player discards his or her hand and returns to his or her hand each
+        // {T}, Sacrifice Memory Jar: Each player exiles all cards from their hand face down and draws seven cards.
+        // At the beginning of the next end step, each player discards their hand and returns to their hand each
         //card he or she exiled this way.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MemoryJarEffect(), new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
@@ -81,7 +81,7 @@ class MemoryJarEffect extends OneShotEffect {
 
     public MemoryJarEffect() {
         super(Outcome.DrawCard);
-        staticText = "Each player exiles all cards from his or her hand face down and draws seven cards. At the beginning of the next end step, each player discards his or her hand and returns to his or her hand each card he or she exiled this way.";
+        staticText = "Each player exiles all cards from their hand face down and draws seven cards. At the beginning of the next end step, each player discards their hand and returns to their hand each card he or she exiled this way.";
     }
 
     public MemoryJarEffect(final MemoryJarEffect effect) {
@@ -130,7 +130,7 @@ class MemoryJarDelayedEffect extends OneShotEffect {
 
     public MemoryJarDelayedEffect() {
         super(Outcome.DrawCard);
-        staticText = "At the beginning of the next end step, each player discards his or her hand and returns to his or her hand each card he or she exiled this way";
+        staticText = "At the beginning of the next end step, each player discards their hand and returns to their hand each card he or she exiled this way";
     }
 
     public MemoryJarDelayedEffect(final MemoryJarDelayedEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/MemorySluice.java b/Mage.Sets/src/mage/cards/m/MemorySluice.java
index 58d12ed0b95..91749850180 100644
--- a/Mage.Sets/src/mage/cards/m/MemorySluice.java
+++ b/Mage.Sets/src/mage/cards/m/MemorySluice.java
@@ -44,7 +44,7 @@ public class MemorySluice extends CardImpl {
     public MemorySluice(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{U/B}");
 
-        // Target player puts the top four cards of his or her library into his or her graveyard.
+        // Target player puts the top four cards of their library into their graveyard.
         this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(4));
         this.getSpellAbility().addTarget(new TargetPlayer());
 
diff --git a/Mage.Sets/src/mage/cards/m/MemorysJourney.java b/Mage.Sets/src/mage/cards/m/MemorysJourney.java
index 286fd09c333..7ad033d924a 100644
--- a/Mage.Sets/src/mage/cards/m/MemorysJourney.java
+++ b/Mage.Sets/src/mage/cards/m/MemorysJourney.java
@@ -55,7 +55,7 @@ public class MemorysJourney extends CardImpl {
     public MemorysJourney(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{U}");
 
-        // Target player shuffles up to three target cards from his or her graveyard into his or her library.
+        // Target player shuffles up to three target cards from their graveyard into their library.
         this.getSpellAbility().addEffect(new MemorysJourneyEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addTarget(new MemorysJourneyTarget());
@@ -77,7 +77,7 @@ class MemorysJourneyEffect extends OneShotEffect {
 
     public MemorysJourneyEffect() {
         super(Outcome.Neutral);
-        this.staticText = "Target player shuffles up to three target cards from his or her graveyard into his or her library";
+        this.staticText = "Target player shuffles up to three target cards from their graveyard into their library";
     }
 
     public MemorysJourneyEffect(final MemorysJourneyEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/MerfolkSpy.java b/Mage.Sets/src/mage/cards/m/MerfolkSpy.java
index f248e7cdf9e..30a61f7748f 100644
--- a/Mage.Sets/src/mage/cards/m/MerfolkSpy.java
+++ b/Mage.Sets/src/mage/cards/m/MerfolkSpy.java
@@ -77,7 +77,7 @@ class MerfolkSpyEffect extends OneShotEffect {
 
     public MerfolkSpyEffect() {
         super(Outcome.Detriment);
-        staticText = "that player reveals a card at random from his or her hand";
+        staticText = "that player reveals a card at random from their hand";
     }
 
     public MerfolkSpyEffect(final MerfolkSpyEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/MerrowBonegnawer.java b/Mage.Sets/src/mage/cards/m/MerrowBonegnawer.java
index 87554db3494..ed50927b511 100644
--- a/Mage.Sets/src/mage/cards/m/MerrowBonegnawer.java
+++ b/Mage.Sets/src/mage/cards/m/MerrowBonegnawer.java
@@ -68,7 +68,7 @@ public class MerrowBonegnawer extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        // {tap}: Target player exiles a card from his or her graveyard.
+        // {tap}: Target player exiles a card from their graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ExileFromZoneTargetEffect(Zone.GRAVEYARD, exileId, getIdName(), new FilterCard()), new TapSourceCost());
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/m/MerrowWitsniper.java b/Mage.Sets/src/mage/cards/m/MerrowWitsniper.java
index a83d3818c9a..ba984228c47 100644
--- a/Mage.Sets/src/mage/cards/m/MerrowWitsniper.java
+++ b/Mage.Sets/src/mage/cards/m/MerrowWitsniper.java
@@ -51,7 +51,7 @@ public class MerrowWitsniper extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        // When Merrow Witsniper enters the battlefield, target player puts the top card of his or her library into his or her graveyard.
+        // When Merrow Witsniper enters the battlefield, target player puts the top card of their library into their graveyard.
         Ability ability = new EntersBattlefieldTriggeredAbility(new PutLibraryIntoGraveTargetEffect(1));
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/m/MesmericFiend.java b/Mage.Sets/src/mage/cards/m/MesmericFiend.java
index a8930feceaa..17d7cc9c73e 100644
--- a/Mage.Sets/src/mage/cards/m/MesmericFiend.java
+++ b/Mage.Sets/src/mage/cards/m/MesmericFiend.java
@@ -65,7 +65,7 @@ public class MesmericFiend extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        // When Mesmeric Fiend enters the battlefield, target opponent reveals his or her hand and you choose a nonland card from it. Exile that card.
+        // When Mesmeric Fiend enters the battlefield, target opponent reveals their hand and you choose a nonland card from it. Exile that card.
         Ability ability = new EntersBattlefieldTriggeredAbility(new MesmericFiendExileEffect(), false);
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
@@ -88,7 +88,7 @@ class MesmericFiendExileEffect extends OneShotEffect {
 
     public MesmericFiendExileEffect() {
         super(Outcome.Exile);
-        this.staticText = "target opponent reveals his or her hand and you choose a nonland card from it. Exile that card";
+        this.staticText = "target opponent reveals their hand and you choose a nonland card from it. Exile that card";
     }
 
     public MesmericFiendExileEffect(final MesmericFiendExileEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/MesmericOrb.java b/Mage.Sets/src/mage/cards/m/MesmericOrb.java
index 7d75d012f96..274c8689499 100644
--- a/Mage.Sets/src/mage/cards/m/MesmericOrb.java
+++ b/Mage.Sets/src/mage/cards/m/MesmericOrb.java
@@ -50,9 +50,9 @@ public class MesmericOrb extends CardImpl {
     public MesmericOrb(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}");
 
-        // Whenever a permanent becomes untapped, that permanent's controller puts the top card of his or her library into his or her graveyard.
+        // Whenever a permanent becomes untapped, that permanent's controller puts the top card of their library into their graveyard.
         Effect effect = new PutTopCardOfLibraryIntoGraveTargetEffect(1);
-        effect.setText("that permanent's controller puts the top card of his or her library into his or her graveyard");
+        effect.setText("that permanent's controller puts the top card of their library into their graveyard");
         this.addAbility(new BecomesUntappedPermanentTriggeredAbility(effect, false));
     }
 
diff --git a/Mage.Sets/src/mage/cards/m/Metamorphose.java b/Mage.Sets/src/mage/cards/m/Metamorphose.java
index ef921098ec0..4016d69df5a 100644
--- a/Mage.Sets/src/mage/cards/m/Metamorphose.java
+++ b/Mage.Sets/src/mage/cards/m/Metamorphose.java
@@ -64,7 +64,7 @@ public class Metamorphose extends CardImpl {
     public Metamorphose(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{U}");
 
-        // Put target permanent an opponent controls on top of its owner's library. That opponent may put an artifact, creature, enchantment, or land card from his or her hand onto the battlefield.
+        // Put target permanent an opponent controls on top of its owner's library. That opponent may put an artifact, creature, enchantment, or land card from their hand onto the battlefield.
         this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true));
         this.getSpellAbility().addTarget(new TargetPermanent(filter));
         this.getSpellAbility().addEffect(new MetamorphoseEffect());
@@ -95,7 +95,7 @@ class MetamorphoseEffect extends OneShotEffect {
 
     public MetamorphoseEffect() {
         super(Outcome.PutCardInPlay);
-        this.staticText = "That opponent may put an artifact, creature, enchantment, or land card from his or her hand onto the battlefield.";
+        this.staticText = "That opponent may put an artifact, creature, enchantment, or land card from their hand onto the battlefield.";
     }
 
     public MetamorphoseEffect (final MetamorphoseEffect effect) { super(effect); }
diff --git a/Mage.Sets/src/mage/cards/m/Millstone.java b/Mage.Sets/src/mage/cards/m/Millstone.java
index 5de38066e3e..d274c482fe2 100644
--- a/Mage.Sets/src/mage/cards/m/Millstone.java
+++ b/Mage.Sets/src/mage/cards/m/Millstone.java
@@ -48,7 +48,7 @@ public class Millstone extends CardImpl {
     public Millstone(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}");
 
-        // {2}, {tap}: Target player puts the top two cards of his or her library into his or her graveyard.
+        // {2}, {tap}: Target player puts the top two cards of their library into their graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), new GenericManaCost(2));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetPlayer());
diff --git a/Mage.Sets/src/mage/cards/m/Mimeofacture.java b/Mage.Sets/src/mage/cards/m/Mimeofacture.java
index 540711d763f..85354fdba8e 100644
--- a/Mage.Sets/src/mage/cards/m/Mimeofacture.java
+++ b/Mage.Sets/src/mage/cards/m/Mimeofacture.java
@@ -58,7 +58,7 @@ public class Mimeofacture extends CardImpl {
         // Replicate {3}{U}
         this.addAbility(new ReplicateAbility(this, "{3}{U}"));
 
-        // Choose target permanent an opponent controls. Search that player's library for a card with the same name and put it onto the battlefield under your control. Then that player shuffles his or her library.
+        // Choose target permanent an opponent controls. Search that player's library for a card with the same name and put it onto the battlefield under your control. Then that player shuffles their library.
         this.getSpellAbility().addEffect(new MimeofactureEffect());
         this.getSpellAbility().addTarget(new TargetPermanent(StaticFilters.FILTER_OPPONENTS_PERMANENT));
     }
@@ -79,7 +79,7 @@ class MimeofactureEffect extends OneShotEffect {
         super(Outcome.PutCardInPlay);
         this.staticText = "Choose target permanent an opponent controls. "
                 + "Search that player's library for a card with the same name and put it onto the battlefield under your control. "
-                + "Then that player shuffles his or her library.";
+                + "Then that player shuffles their library.";
     }
 
     MimeofactureEffect(final MimeofactureEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/MinamosMeddling.java b/Mage.Sets/src/mage/cards/m/MinamosMeddling.java
index 3bdfea5c2a0..2f8da691965 100644
--- a/Mage.Sets/src/mage/cards/m/MinamosMeddling.java
+++ b/Mage.Sets/src/mage/cards/m/MinamosMeddling.java
@@ -53,7 +53,7 @@ public class MinamosMeddling extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{U}{U}");
 
 
-        // Counter target spell. That spell's controller reveals his or her hand, then discards each card with the same name as a card spliced onto that spell.
+        // Counter target spell. That spell's controller reveals their hand, then discards each card with the same name as a card spliced onto that spell.
         this.getSpellAbility().addTarget(new TargetSpell(StaticFilters.FILTER_SPELL));
         this.getSpellAbility().addEffect(new MinamosMeddlingCounterTargetEffect());
     }
@@ -72,7 +72,7 @@ class MinamosMeddlingCounterTargetEffect extends OneShotEffect {
 
     public MinamosMeddlingCounterTargetEffect() {
         super(Outcome.Benefit);
-        staticText = "Counter target spell. That spell's controller reveals his or her hand, then discards each card with the same name as a card spliced onto that spell";
+        staticText = "Counter target spell. That spell's controller reveals their hand, then discards each card with the same name as a card spliced onto that spell";
     }
 
     public MinamosMeddlingCounterTargetEffect(final MinamosMeddlingCounterTargetEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/MindFuneral.java b/Mage.Sets/src/mage/cards/m/MindFuneral.java
index 74244100844..c43a3c1119d 100644
--- a/Mage.Sets/src/mage/cards/m/MindFuneral.java
+++ b/Mage.Sets/src/mage/cards/m/MindFuneral.java
@@ -54,7 +54,7 @@ public class MindFuneral extends CardImpl {
 
         
 
-        // Target opponent reveals cards from the top of his or her library until four land cards are revealed. That player puts all cards revealed this way into his or her graveyard.
+        // Target opponent reveals cards from the top of their library until four land cards are revealed. That player puts all cards revealed this way into their graveyard.
         this.getSpellAbility().addEffect(new MindFuneralEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
         
@@ -74,7 +74,7 @@ class MindFuneralEffect extends OneShotEffect {
 
     public MindFuneralEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Target opponent reveals cards from the top of his or her library until four land cards are revealed. That player puts all cards revealed this way into his or her graveyard";
+        this.staticText = "Target opponent reveals cards from the top of their library until four land cards are revealed. That player puts all cards revealed this way into their graveyard";
     }
 
     public MindFuneralEffect(final MindFuneralEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/MindGrind.java b/Mage.Sets/src/mage/cards/m/MindGrind.java
index 7905ae845aa..afbe5b7ec0a 100644
--- a/Mage.Sets/src/mage/cards/m/MindGrind.java
+++ b/Mage.Sets/src/mage/cards/m/MindGrind.java
@@ -53,7 +53,7 @@ public class MindGrind extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{U}{B}");
 
 
-        // Each opponent reveals cards from the top of his or her library until he or she reveals X land cards, then puts all cards revealed this way into his or her graveyard. X can't be 0.
+        // Each opponent reveals cards from the top of their library until he or she reveals X land cards, then puts all cards revealed this way into their graveyard. X can't be 0.
         this.getSpellAbility().addEffect(new MindGrindEffect());
         for (VariableCost cost: this.getSpellAbility().getManaCosts().getVariableCosts()) {
             if (cost instanceof VariableManaCost) {
@@ -77,7 +77,7 @@ class MindGrindEffect extends OneShotEffect {
 
     public MindGrindEffect() {
         super(Outcome.Discard);
-        this.staticText = "Each opponent reveals cards from the top of his or her library until he or she reveals X land cards, then puts all cards revealed this way into his or her graveyard. X can't be 0";
+        this.staticText = "Each opponent reveals cards from the top of their library until he or she reveals X land cards, then puts all cards revealed this way into their graveyard. X can't be 0";
     }
 
     public MindGrindEffect(final MindGrindEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/MindSculpt.java b/Mage.Sets/src/mage/cards/m/MindSculpt.java
index e7edddf21cd..42e3055d60e 100644
--- a/Mage.Sets/src/mage/cards/m/MindSculpt.java
+++ b/Mage.Sets/src/mage/cards/m/MindSculpt.java
@@ -44,7 +44,7 @@ public class MindSculpt extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{U}");
 
 
-        // Target opponent puts the top seven cards of his or her library into his or her graveyard.
+        // Target opponent puts the top seven cards of their library into their graveyard.
         this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(7));
         this.getSpellAbility().addTarget(new TargetOpponent());
     }
diff --git a/Mage.Sets/src/mage/cards/m/MindSlash.java b/Mage.Sets/src/mage/cards/m/MindSlash.java
index bc8b8df742a..92c275cfb9f 100644
--- a/Mage.Sets/src/mage/cards/m/MindSlash.java
+++ b/Mage.Sets/src/mage/cards/m/MindSlash.java
@@ -50,7 +50,7 @@ public class MindSlash extends CardImpl {
     public MindSlash(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}{B}");
 
-        // {B}, Sacrifice a creature: Target opponent reveals his or her hand. You choose a card from it.
+        // {B}, Sacrifice a creature: Target opponent reveals their hand. You choose a card from it.
         // That player discards that card. Activate this ability only any time you could cast a sorcery.
         Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardCardYouChooseTargetEffect(), new ManaCostsImpl("{B}"));
         ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT)));
diff --git a/Mage.Sets/src/mage/cards/m/MindSwords.java b/Mage.Sets/src/mage/cards/m/MindSwords.java
index 7187bdcff5e..3725c851f74 100644
--- a/Mage.Sets/src/mage/cards/m/MindSwords.java
+++ b/Mage.Sets/src/mage/cards/m/MindSwords.java
@@ -74,7 +74,7 @@ public class MindSwords extends CardImpl {
                 new PermanentsOnTheBattlefieldCondition(filterSwamp), null
         ));
 
-        // Each player exiles two cards from his or her hand.
+        // Each player exiles two cards from their hand.
         this.getSpellAbility().addEffect(new MindSwordsEffect());
     }
 
@@ -92,7 +92,7 @@ class MindSwordsEffect extends OneShotEffect {
 
     MindSwordsEffect() {
         super(Outcome.Exile);
-        this.staticText = "Each player exiles two cards from his or her hand.";
+        this.staticText = "Each player exiles two cards from their hand.";
     }
 
     MindSwordsEffect(final MindSwordsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/Mindblaze.java b/Mage.Sets/src/mage/cards/m/Mindblaze.java
index a44c95cbe64..0e3eac4e7fc 100644
--- a/Mage.Sets/src/mage/cards/m/Mindblaze.java
+++ b/Mage.Sets/src/mage/cards/m/Mindblaze.java
@@ -57,10 +57,10 @@ public class Mindblaze extends CardImpl {
     public Mindblaze(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{5}{R}");
 
-        // Name a nonland card and choose a number greater than 0. Target player reveals his or her library.
+        // Name a nonland card and choose a number greater than 0. Target player reveals their library.
         // If that library contains exactly the chosen number of the named card,
         // Mindblaze deals 8 damage to that player.
-        // Then that player shuffles his or her library.
+        // Then that player shuffles their library.
         this.getSpellAbility().addEffect(new MindblazeEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
@@ -80,7 +80,7 @@ class MindblazeEffect extends OneShotEffect {
 
     MindblazeEffect() {
         super(Outcome.Damage);
-        staticText = "Name a nonland card and choose a number greater than 0. Target player reveals his or her library. If that library contains exactly the chosen number of the named card, {this} deals 8 damage to that player. Then that player shuffles his or her library";
+        staticText = "Name a nonland card and choose a number greater than 0. Target player reveals their library. If that library contains exactly the chosen number of the named card, {this} deals 8 damage to that player. Then that player shuffles their library";
     }
 
     MindblazeEffect(final MindblazeEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/MindclawShaman.java b/Mage.Sets/src/mage/cards/m/MindclawShaman.java
index 6847f4a5e67..343c7be3058 100644
--- a/Mage.Sets/src/mage/cards/m/MindclawShaman.java
+++ b/Mage.Sets/src/mage/cards/m/MindclawShaman.java
@@ -62,7 +62,7 @@ public class MindclawShaman extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        // When Mindclaw Shaman enters the battlefield, target opponent reveals his or her hand. You may cast an instant or sorcery card from it without paying its mana cost.
+        // When Mindclaw Shaman enters the battlefield, target opponent reveals their hand. You may cast an instant or sorcery card from it without paying its mana cost.
         Ability ability = new EntersBattlefieldTriggeredAbility(new MindclawShamanEffect(), false);
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
@@ -90,7 +90,7 @@ class MindclawShamanEffect extends OneShotEffect {
     
     public MindclawShamanEffect() {
         super(Outcome.Discard);
-        this.staticText = "target opponent reveals his or her hand. You may cast an instant or sorcery card from it without paying its mana cost";
+        this.staticText = "target opponent reveals their hand. You may cast an instant or sorcery card from it without paying its mana cost";
     }
 
     public MindclawShamanEffect(final MindclawShamanEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/Mindcrank.java b/Mage.Sets/src/mage/cards/m/Mindcrank.java
index 2ac610a2157..ad413d1f592 100644
--- a/Mage.Sets/src/mage/cards/m/Mindcrank.java
+++ b/Mage.Sets/src/mage/cards/m/Mindcrank.java
@@ -53,7 +53,7 @@ public class Mindcrank extends CardImpl {
     public Mindcrank(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}");
 
-        // Whenever an opponent loses life, that player puts that many cards from the top of his or her library into his or her graveyard. 
+        // Whenever an opponent loses life, that player puts that many cards from the top of their library into their graveyard.
         // (Damage dealt by sources without infect causes loss of life.)
         this.addAbility(new MindcrankTriggeredAbility());
     }
@@ -103,7 +103,7 @@ class MindcrankTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "Whenever an opponent loses life, that player puts that many cards from the top of his or her library into his or her graveyard.";
+        return "Whenever an opponent loses life, that player puts that many cards from the top of their library into their graveyard.";
     }
 }
 
diff --git a/Mage.Sets/src/mage/cards/m/MindeyeDrake.java b/Mage.Sets/src/mage/cards/m/MindeyeDrake.java
index 6b5deb36a7e..b75839382e7 100644
--- a/Mage.Sets/src/mage/cards/m/MindeyeDrake.java
+++ b/Mage.Sets/src/mage/cards/m/MindeyeDrake.java
@@ -54,7 +54,7 @@ public class MindeyeDrake extends CardImpl {
 
         // Flying
         this.addAbility(FlyingAbility.getInstance());
-        // When Mindeye Drake dies, target player puts the top five cards of his or her library into his or her graveyard.
+        // When Mindeye Drake dies, target player puts the top five cards of their library into their graveyard.
         Ability ability = new DiesTriggeredAbility(new PutLibraryIntoGraveTargetEffect(5));
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/m/Mindmelter.java b/Mage.Sets/src/mage/cards/m/Mindmelter.java
index 5e4bac6445f..cd62ecbc9c1 100644
--- a/Mage.Sets/src/mage/cards/m/Mindmelter.java
+++ b/Mage.Sets/src/mage/cards/m/Mindmelter.java
@@ -63,9 +63,9 @@ public class Mindmelter extends CardImpl {
         // Mindmelter can't be blocked.
         this.addAbility(new CantBeBlockedSourceAbility());
 
-        // {3}{C}: Target opponent exiles a card from his or her hand. Activate this ability only any time you could cast a sorcery.
+        // {3}{C}: Target opponent exiles a card from their hand. Activate this ability only any time you could cast a sorcery.
         Effect effect = new ExileFromZoneTargetEffect(Zone.HAND, null, "", new FilterCard());
-        effect.setText("Target opponent exiles a card from his or her hand");
+        effect.setText("Target opponent exiles a card from their hand");
         Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{3}{C}"));
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/m/MindsDilation.java b/Mage.Sets/src/mage/cards/m/MindsDilation.java
index b7f93863a60..e19befd169b 100644
--- a/Mage.Sets/src/mage/cards/m/MindsDilation.java
+++ b/Mage.Sets/src/mage/cards/m/MindsDilation.java
@@ -57,7 +57,7 @@ public class MindsDilation extends CardImpl {
     public MindsDilation(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{5}{U}{U}");
 
-        // Whenever an opponent casts his or her first spell each turn, that player exiles the top card of his or her library. If it's a nonland card,
+        // Whenever an opponent casts their first spell each turn, that player exiles the top card of their library. If it's a nonland card,
         // you may cast it without paying its mana cost.
         this.addAbility(new MindsDilationTriggeredAbility(new MindsDilationEffect(), false), new SpellsCastWatcher());
     }
@@ -106,7 +106,7 @@ class MindsDilationTriggeredAbility extends SpellCastOpponentTriggeredAbility {
 
     @Override
     public String getRule() {
-        return "Whenever an opponent casts his or her first spell each turn, that player exiles the top card of his or her library."
+        return "Whenever an opponent casts their first spell each turn, that player exiles the top card of their library."
                 + " If it's a nonland card, you may cast it without paying its mana cost.";
     }
 }
@@ -115,7 +115,7 @@ class MindsDilationEffect extends OneShotEffect {
 
     MindsDilationEffect() {
         super(Outcome.Benefit);
-        this.staticText = "that player exiles the top card of his or her library. If it's a nonland card, you may cast it without paying its mana cost";
+        this.staticText = "that player exiles the top card of their library. If it's a nonland card, you may cast it without paying its mana cost";
     }
 
     MindsDilationEffect(final MindsDilationEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/MindscourDragon.java b/Mage.Sets/src/mage/cards/m/MindscourDragon.java
index 8ec7eb8d144..b94d8c701d6 100644
--- a/Mage.Sets/src/mage/cards/m/MindscourDragon.java
+++ b/Mage.Sets/src/mage/cards/m/MindscourDragon.java
@@ -54,7 +54,7 @@ public class MindscourDragon extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
 
-        // Whenever Mindscour Dragon deals combat damage to an opponent, target player puts the top four cards of his or her library into his or her graveyard.
+        // Whenever Mindscour Dragon deals combat damage to an opponent, target player puts the top four cards of their library into their graveyard.
         Ability ability = new DealsDamageToOpponentTriggeredAbility(new PutLibraryIntoGraveTargetEffect(4), false, true);
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/m/Mindshrieker.java b/Mage.Sets/src/mage/cards/m/Mindshrieker.java
index 62974bd0792..05a7fe31e0b 100644
--- a/Mage.Sets/src/mage/cards/m/Mindshrieker.java
+++ b/Mage.Sets/src/mage/cards/m/Mindshrieker.java
@@ -62,7 +62,7 @@ public class Mindshrieker extends CardImpl {
         this.toughness = new MageInt(1);
 
         this.addAbility(FlyingAbility.getInstance());
-        // {2}: Target player puts the top card of his or her library into his or her graveyard. Mindshrieker gets +X/+X until end of turn, where X is that card's converted mana cost.
+        // {2}: Target player puts the top card of their library into their graveyard. Mindshrieker gets +X/+X until end of turn, where X is that card's converted mana cost.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MindshriekerEffect(), new ManaCostsImpl("{2}"));
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
@@ -83,7 +83,7 @@ class MindshriekerEffect extends OneShotEffect {
 
     public MindshriekerEffect() {
         super(Outcome.BoostCreature);
-        staticText = "Target player puts the top card of his or her library into his or her graveyard. {this} gets +X/+X until end of turn, where X is that card's converted mana cost";
+        staticText = "Target player puts the top card of their library into their graveyard. {this} gets +X/+X until end of turn, where X is that card's converted mana cost";
     }
 
     public MindshriekerEffect(final MindshriekerEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/Mindslicer.java b/Mage.Sets/src/mage/cards/m/Mindslicer.java
index 56439cd6cad..d3a33297253 100644
--- a/Mage.Sets/src/mage/cards/m/Mindslicer.java
+++ b/Mage.Sets/src/mage/cards/m/Mindslicer.java
@@ -49,7 +49,7 @@ public class Mindslicer extends CardImpl {
         this.power = new MageInt(4);
         this.toughness = new MageInt(3);
 
-        // When Mindslicer dies, each player discards his or her hand.
+        // When Mindslicer dies, each player discards their hand.
         this.addAbility(new DiesTriggeredAbility(new DiscardHandAllEffect(),false));
     }
 
diff --git a/Mage.Sets/src/mage/cards/m/MinisterOfInquiries.java b/Mage.Sets/src/mage/cards/m/MinisterOfInquiries.java
index ca2b229e356..c75ee03f19d 100644
--- a/Mage.Sets/src/mage/cards/m/MinisterOfInquiries.java
+++ b/Mage.Sets/src/mage/cards/m/MinisterOfInquiries.java
@@ -59,7 +59,7 @@ public class MinisterOfInquiries extends CardImpl {
         // When Minister of Inquiries enters the the battlefield, you get {E}{E}.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new GetEnergyCountersControllerEffect(2)));
 
-        // {T}. Pay {E}: Target player puts the top three cards of his or her library into his or her graveyard.
+        // {T}. Pay {E}: Target player puts the top three cards of their library into their graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(3), new TapSourceCost());
         ability.addCost(new PayEnergyCost(1));
         ability.addTarget(new TargetPlayer());
diff --git a/Mage.Sets/src/mage/cards/m/MiresToll.java b/Mage.Sets/src/mage/cards/m/MiresToll.java
index 7200704ba7b..eb573464c15 100644
--- a/Mage.Sets/src/mage/cards/m/MiresToll.java
+++ b/Mage.Sets/src/mage/cards/m/MiresToll.java
@@ -57,7 +57,7 @@ public class MiresToll extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}");
 
 
-        // Target player reveals a number of cards from his or her hand equal to the number of Swamps you control. You choose one of them. That player discards that card.
+        // Target player reveals a number of cards from their hand equal to the number of Swamps you control. You choose one of them. That player discards that card.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(TargetController.ANY, new PermanentsOnBattlefieldCount(filter)));
 
diff --git a/Mage.Sets/src/mage/cards/m/MirkoVoskMindDrinker.java b/Mage.Sets/src/mage/cards/m/MirkoVoskMindDrinker.java
index db8b1b084e2..0ada7b25cc8 100644
--- a/Mage.Sets/src/mage/cards/m/MirkoVoskMindDrinker.java
+++ b/Mage.Sets/src/mage/cards/m/MirkoVoskMindDrinker.java
@@ -63,7 +63,7 @@ public class MirkoVoskMindDrinker extends CardImpl {
 
         // Flying
         this.addAbility(FlyingAbility.getInstance());
-        // Whenever Mirko Vosk, Mind Drinker deals combat damage to a player, that player reveals cards from the top of his or her library until he or she reveals four land cards, then puts those cards into his or her graveyard.
+        // Whenever Mirko Vosk, Mind Drinker deals combat damage to a player, that player reveals cards from the top of their library until he or she reveals four land cards, then puts those cards into their graveyard.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new MirkoVoskMindDrinkerEffect(), false, true));
     }
 
@@ -82,7 +82,7 @@ class MirkoVoskMindDrinkerEffect extends OneShotEffect {
 
     public MirkoVoskMindDrinkerEffect() {
         super(Outcome.Benefit);
-        this.staticText = "that player reveals cards from the top of his or her library until he or she reveals four land cards, then puts those cards into his or her graveyard";
+        this.staticText = "that player reveals cards from the top of their library until he or she reveals four land cards, then puts those cards into their graveyard";
     }
 
     public MirkoVoskMindDrinkerEffect(final MirkoVoskMindDrinkerEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/MirrorMadPhantasm.java b/Mage.Sets/src/mage/cards/m/MirrorMadPhantasm.java
index 07e3c92cc50..8322d2d9992 100644
--- a/Mage.Sets/src/mage/cards/m/MirrorMadPhantasm.java
+++ b/Mage.Sets/src/mage/cards/m/MirrorMadPhantasm.java
@@ -61,7 +61,7 @@ public class MirrorMadPhantasm extends CardImpl {
         this.toughness = new MageInt(1);
 
         this.addAbility(FlyingAbility.getInstance());
-        // {1}{U}: Mirror-Mad Phantasm's owner shuffles it into his or her library. If that player does, he or she reveals cards from the top of that library until a card named Mirror-Mad Phantasm is revealed. That player puts that card onto the battlefield and all other cards revealed this way into his or her graveyard.
+        // {1}{U}: Mirror-Mad Phantasm's owner shuffles it into their library. If that player does, he or she reveals cards from the top of that library until a card named Mirror-Mad Phantasm is revealed. That player puts that card onto the battlefield and all other cards revealed this way into their graveyard.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new MirrorMadPhantasmEffect(), new ManaCostsImpl("{1}{U}")));
 
     }
@@ -80,7 +80,7 @@ class MirrorMadPhantasmEffect extends OneShotEffect {
 
     public MirrorMadPhantasmEffect() {
         super(Outcome.Detriment);
-        this.staticText = "{this}'s owner shuffles it into his or her library. If that player does, he or she reveals cards from the top of that library until a card named Mirror-Mad Phantasm is revealed. That player puts that card onto the battlefield and all other cards revealed this way into his or her graveyard";
+        this.staticText = "{this}'s owner shuffles it into their library. If that player does, he or she reveals cards from the top of that library until a card named Mirror-Mad Phantasm is revealed. That player puts that card onto the battlefield and all other cards revealed this way into their graveyard";
     }
 
     public MirrorMadPhantasmEffect(final MirrorMadPhantasmEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/Misinformation.java b/Mage.Sets/src/mage/cards/m/Misinformation.java
index b146b7d17da..f5cc7d8fca4 100644
--- a/Mage.Sets/src/mage/cards/m/Misinformation.java
+++ b/Mage.Sets/src/mage/cards/m/Misinformation.java
@@ -48,7 +48,7 @@ public class Misinformation extends CardImpl {
     public Misinformation(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{B}");
 
-        // Put up to three target cards from an opponent's graveyard on top of his or her library in any order.
+        // Put up to three target cards from an opponent's graveyard on top of their library in any order.
         this.getSpellAbility().addTarget(new TargetCardInOpponentsGraveyard(0, 3, new FilterCard("cards from an opponent's graveyard"), true));
         this.getSpellAbility().addEffect(new MisinformationEffect());
     }
@@ -67,7 +67,7 @@ class MisinformationEffect extends OneShotEffect {
     
     MisinformationEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Put up to three target cards from an opponent's graveyard on top of his or her library in any order";
+        this.staticText = "Put up to three target cards from an opponent's graveyard on top of their library in any order";
     }
     
     MisinformationEffect(final MisinformationEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/Misstep.java b/Mage.Sets/src/mage/cards/m/Misstep.java
index aad6b5b7d5f..efb61441b81 100644
--- a/Mage.Sets/src/mage/cards/m/Misstep.java
+++ b/Mage.Sets/src/mage/cards/m/Misstep.java
@@ -73,7 +73,7 @@ class MisstepEffect extends OneShotEffect {
     
     MisstepEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Creatures target player controls don't untap during his or her next untap step";
+        this.staticText = "Creatures target player controls don't untap during their next untap step";
     }
     
     MisstepEffect(final MisstepEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/MistOfStagnation.java b/Mage.Sets/src/mage/cards/m/MistOfStagnation.java
index 9cfe18d56c0..b4f7823995f 100644
--- a/Mage.Sets/src/mage/cards/m/MistOfStagnation.java
+++ b/Mage.Sets/src/mage/cards/m/MistOfStagnation.java
@@ -58,7 +58,7 @@ public class MistOfStagnation extends CardImpl {
         // Permanents don't untap during their controllers' untap steps.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new DontUntapInControllersUntapStepAllEffect(Duration.WhileOnBattlefield, TargetController.ANY, new FilterPermanent("permanents"))));
 
-        // At the beginning of each player's upkeep, that player chooses a permanent for each card in his or her graveyard, then untaps those permanents.
+        // At the beginning of each player's upkeep, that player chooses a permanent for each card in their graveyard, then untaps those permanents.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new MistOfStagnationEffect(), TargetController.ANY, false));
     }
 
@@ -76,7 +76,7 @@ class MistOfStagnationEffect extends OneShotEffect {
 
     MistOfStagnationEffect() {
         super(Outcome.Benefit);
-        this.staticText = "that player chooses a permanent for each card in his or her graveyard, then untaps those permanents";
+        this.staticText = "that player chooses a permanent for each card in their graveyard, then untaps those permanents";
     }
 
     MistOfStagnationEffect(final MistOfStagnationEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/MnemonicNexus.java b/Mage.Sets/src/mage/cards/m/MnemonicNexus.java
index ebe54e91288..eae49dbd195 100644
--- a/Mage.Sets/src/mage/cards/m/MnemonicNexus.java
+++ b/Mage.Sets/src/mage/cards/m/MnemonicNexus.java
@@ -48,7 +48,7 @@ public class MnemonicNexus extends CardImpl {
     public MnemonicNexus(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{U}");
 
-        // Each player shuffles his or her graveyard into his or her library.
+        // Each player shuffles their graveyard into their library.
         this.getSpellAbility().addEffect(new MnemonicNexusEffect());
     }
 
@@ -66,7 +66,7 @@ class MnemonicNexusEffect extends OneShotEffect {
 
     public MnemonicNexusEffect() {
         super(Outcome.Neutral);
-        staticText = "Each player shuffles his or her graveyard into his or her library";
+        staticText = "Each player shuffles their graveyard into their library";
     }
 
     public MnemonicNexusEffect(final MnemonicNexusEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/MoltenPsyche.java b/Mage.Sets/src/mage/cards/m/MoltenPsyche.java
index 3ae13f9ea55..07700b22e2e 100644
--- a/Mage.Sets/src/mage/cards/m/MoltenPsyche.java
+++ b/Mage.Sets/src/mage/cards/m/MoltenPsyche.java
@@ -54,7 +54,7 @@ public class MoltenPsyche extends CardImpl {
     public MoltenPsyche(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{R}{R}");
 
-        // Each player shuffles the cards from his or her hand into his or her library, then draws that many cards.
+        // Each player shuffles the cards from their hand into their library, then draws that many cards.
         // Metalcraft - If you control three or more artifacts, Molten Psyche deals damage to each opponent equal to the number of cards that player has drawn this turn.
         this.getSpellAbility().addEffect(new MoltenPsycheEffect());
         this.getSpellAbility().addWatcher(new MoltenPsycheWatcher());
@@ -75,7 +75,7 @@ class MoltenPsycheEffect extends OneShotEffect {
 
     public MoltenPsycheEffect() {
         super(Outcome.Neutral);
-        staticText = "Each player shuffles the cards from his or her hand into his or her library, then draws that many cards.\n"
+        staticText = "Each player shuffles the cards from their hand into their library, then draws that many cards.\n"
                 + "<i>Metalcraft</i> - If you control three or more artifacts, {this} deals damage to each opponent equal to the number of cards that player has drawn this turn.";
     }
 
diff --git a/Mage.Sets/src/mage/cards/m/MomentOfSilence.java b/Mage.Sets/src/mage/cards/m/MomentOfSilence.java
index a7f1bf51c4d..617eb94a570 100644
--- a/Mage.Sets/src/mage/cards/m/MomentOfSilence.java
+++ b/Mage.Sets/src/mage/cards/m/MomentOfSilence.java
@@ -43,7 +43,7 @@ public class MomentOfSilence extends CardImpl {
     public MomentOfSilence(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{W}");
 
-        // Target player skips his or her next combat phase this turn.
+        // Target player skips their next combat phase this turn.
         this.getSpellAbility().addEffect(new SkipNextCombatEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
diff --git a/Mage.Sets/src/mage/cards/m/Monomania.java b/Mage.Sets/src/mage/cards/m/Monomania.java
index 4ae17a088b6..837f0fcb4ad 100644
--- a/Mage.Sets/src/mage/cards/m/Monomania.java
+++ b/Mage.Sets/src/mage/cards/m/Monomania.java
@@ -52,7 +52,7 @@ public class Monomania extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{B}{B}");
 
 
-        // Target player chooses a card in his or her hand and discards the rest.
+        // Target player chooses a card in their hand and discards the rest.
         this.getSpellAbility().addEffect(new MonomaniaEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
@@ -73,7 +73,7 @@ class MonomaniaEffect extends OneShotEffect {
 
     public MonomaniaEffect() {
         super(Outcome.Discard);
-        staticText = "Target player chooses a card in his or her hand and discards the rest";
+        staticText = "Target player chooses a card in their hand and discards the rest";
     }
 
     public MonomaniaEffect(final MonomaniaEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/Mudhole.java b/Mage.Sets/src/mage/cards/m/Mudhole.java
index 228b6782505..0b4270f3ebb 100644
--- a/Mage.Sets/src/mage/cards/m/Mudhole.java
+++ b/Mage.Sets/src/mage/cards/m/Mudhole.java
@@ -51,7 +51,7 @@ public class Mudhole extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}");
 
 
-        // Target player exiles all land cards from his or her graveyard.
+        // Target player exiles all land cards from their graveyard.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new MudholeEffect());
     }
@@ -72,7 +72,7 @@ class MudholeEffect extends OneShotEffect {
 
     public MudholeEffect() {
         super(Outcome.Exile);
-        staticText = "Target player exiles all land cards from his or her graveyard";
+        staticText = "Target player exiles all land cards from their graveyard";
     }
 
     public MudholeEffect(final MudholeEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java b/Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java
index 3be621c2b63..ba0285e5c59 100644
--- a/Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java
+++ b/Mage.Sets/src/mage/cards/m/MyojinOfNightsReach.java
@@ -71,7 +71,7 @@ public class MyojinOfNightsReach extends CardImpl {
         // Myojin of Night's Reach is indestructible as long as it has a divinity counter on it.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield),
                 new SourceHasCounterCondition(CounterType.DIVINITY), "{this} is indestructible as long as it has a divinity counter on it")));
-        // Remove a divinity counter from Myojin of Night's Reach: Each opponent discards his or her hand.
+        // Remove a divinity counter from Myojin of Night's Reach: Each opponent discards their hand.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new MyojinOfNightsReachEffect(), new RemoveCountersSourceCost(CounterType.DIVINITY.createInstance()));
         this.addAbility(ability);
     }
@@ -89,7 +89,7 @@ public class MyojinOfNightsReach extends CardImpl {
 class MyojinOfNightsReachEffect extends OneShotEffect {
     public MyojinOfNightsReachEffect() {
         super(Outcome.Discard);
-        staticText = "Each opponent discards his or her hand";
+        staticText = "Each opponent discards their hand";
     }
 
     public MyojinOfNightsReachEffect(final MyojinOfNightsReachEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/m/MyrServitor.java b/Mage.Sets/src/mage/cards/m/MyrServitor.java
index a545f363d54..5a51f1e2f93 100644
--- a/Mage.Sets/src/mage/cards/m/MyrServitor.java
+++ b/Mage.Sets/src/mage/cards/m/MyrServitor.java
@@ -59,11 +59,11 @@ public class MyrServitor extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        // At the beginning of your upkeep, if Myr Servitor is on the battlefield, each player returns all cards named Myr Servitor from his or her graveyard to the battlefield.
+        // At the beginning of your upkeep, if Myr Servitor is on the battlefield, each player returns all cards named Myr Servitor from their graveyard to the battlefield.
         this.addAbility(new ConditionalTriggeredAbility(
                 new BeginningOfUpkeepTriggeredAbility(new MyrServitorReturnEffect(), TargetController.YOU, false),
                 SourceOnBattlefieldCondition.instance,
-                "At the beginning of your upkeep, if {this} is on the battlefield, each player returns all cards named Myr Servitor from his or her graveyard to the battlefield"
+                "At the beginning of your upkeep, if {this} is on the battlefield, each player returns all cards named Myr Servitor from their graveyard to the battlefield"
         ));
 
     }
@@ -88,7 +88,7 @@ class MyrServitorReturnEffect extends OneShotEffect {
 
     public MyrServitorReturnEffect() {
         super(Outcome.PutCardInPlay);
-        this.staticText = "if {this} is on the battlefield, each player returns all cards named Myr Servitor from his or her graveyard to the battlefield";
+        this.staticText = "if {this} is on the battlefield, each player returns all cards named Myr Servitor from their graveyard to the battlefield";
     }
 
     public MyrServitorReturnEffect(final MyrServitorReturnEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/n/NafsAsp.java b/Mage.Sets/src/mage/cards/n/NafsAsp.java
index 57b779039e8..cf8a66a6b37 100644
--- a/Mage.Sets/src/mage/cards/n/NafsAsp.java
+++ b/Mage.Sets/src/mage/cards/n/NafsAsp.java
@@ -51,10 +51,10 @@ public class NafsAsp extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        // Whenever Nafs Asp deals damage to a player, that player loses 1 life at the beginning of his or her next draw step unless he or she pays {1} before that draw step.
+        // Whenever Nafs Asp deals damage to a player, that player loses 1 life at the beginning of their next draw step unless he or she pays {1} before that draw step.
         this.addAbility(new DealsDamageToAPlayerTriggeredAbility(new UnlessPaysDelayedEffect(
             new ManaCostsImpl("{1}"), new LoseLifeTargetEffect(1), PhaseStep.DRAW, true,
-            "that player loses 1 life at the beginning of his or her next draw step unless he or she pays {1} before that draw step."),
+            "that player loses 1 life at the beginning of their next draw step unless he or she pays {1} before that draw step."),
             false, true));
     }
 
diff --git a/Mage.Sets/src/mage/cards/n/NaturalBalance.java b/Mage.Sets/src/mage/cards/n/NaturalBalance.java
index d0ac72c5208..834c375146c 100644
--- a/Mage.Sets/src/mage/cards/n/NaturalBalance.java
+++ b/Mage.Sets/src/mage/cards/n/NaturalBalance.java
@@ -58,7 +58,7 @@ public class NaturalBalance extends CardImpl {
     public NaturalBalance(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{G}{G}");
 
-        // 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 his or her 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 his or her library this way shuffles it.
+        // 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.
         this.getSpellAbility().addEffect(new NaturalBalanceEffect());
     }
 
@@ -75,7 +75,7 @@ public class NaturalBalance extends CardImpl {
 
         public NaturalBalanceEffect() {
             super(Outcome.PutCardInPlay);
-            this.staticText = "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 his or her 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 his or her library this way shuffles it.";
+            this.staticText = "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.";
         }
 
         public NaturalBalanceEffect(final NaturalBalanceEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/n/NaturalSelection.java b/Mage.Sets/src/mage/cards/n/NaturalSelection.java
index f355773e813..604130d7d40 100644
--- a/Mage.Sets/src/mage/cards/n/NaturalSelection.java
+++ b/Mage.Sets/src/mage/cards/n/NaturalSelection.java
@@ -55,7 +55,7 @@ public class NaturalSelection extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{G}");
 
 
-        // Look at the top three cards of target player's library, then put them back in any order. You may have that player shuffle his or her library.
+        // Look at the top three cards of target player's library, then put them back in any order. You may have that player shuffle their library.
         this.getSpellAbility().addEffect(new NaturalSelectionEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
@@ -74,7 +74,7 @@ class  NaturalSelectionEffect extends OneShotEffect {
 
     public  NaturalSelectionEffect() {
         super(Outcome.DrawCard);
-        this.staticText = "look at the top three cards of target player's library, then put them back in any order. You may have that player shuffle his or her library.";
+        this.staticText = "look at the top three cards of target player's library, then put them back in any order. You may have that player shuffle their library.";
     }
 
     public  NaturalSelectionEffect(final  NaturalSelectionEffect effect) {
@@ -118,7 +118,7 @@ class  NaturalSelectionEffect extends OneShotEffect {
             Card card = cards.get(cards.iterator().next(), game);
             card.moveToZone(Zone.LIBRARY, source.getSourceId(), game, true);
         }
-        if (you.chooseUse(Outcome.Neutral, "You may have that player shuffle his or her library", source, game)){
+        if (you.chooseUse(Outcome.Neutral, "You may have that player shuffle their library", source, game)){
             player.shuffleLibrary(source, game);
         }
         return true;
diff --git a/Mage.Sets/src/mage/cards/n/NaturesResurgence.java b/Mage.Sets/src/mage/cards/n/NaturesResurgence.java
index 3ab3ff12fe3..b0dd96ec0bc 100644
--- a/Mage.Sets/src/mage/cards/n/NaturesResurgence.java
+++ b/Mage.Sets/src/mage/cards/n/NaturesResurgence.java
@@ -49,7 +49,7 @@ public class NaturesResurgence extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{G}{G}");
 
 
-        // Each player draws a card for each creature card in his or her graveyard.
+        // Each player draws a card for each creature card in their graveyard.
         this.getSpellAbility().addEffect(new NaturesResurgenceEffect());
     }
 
@@ -69,7 +69,7 @@ class NaturesResurgenceEffect extends OneShotEffect {
     
     public NaturesResurgenceEffect() {
         super(Outcome.DrawCard);
-        staticText = "Each player draws a card for each creature card in his or her graveyard";
+        staticText = "Each player draws a card for each creature card in their graveyard";
     }
 
     public NaturesResurgenceEffect(final NaturesResurgenceEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/n/NavigatorsRuin.java b/Mage.Sets/src/mage/cards/n/NavigatorsRuin.java
index f7f9d417999..5b5dc9bd4aa 100644
--- a/Mage.Sets/src/mage/cards/n/NavigatorsRuin.java
+++ b/Mage.Sets/src/mage/cards/n/NavigatorsRuin.java
@@ -49,11 +49,11 @@ public class NavigatorsRuin extends CardImpl {
     public NavigatorsRuin(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}");
 
-        // Raid - At the beginning of your end step, if you attacked with a creature this turm, target opponent puts the top four cards of his or her library into his or her graveyard.
+        // Raid - At the beginning of your end step, if you attacked with a creature this turm, target opponent puts the top four cards of their library into their graveyard.
         Ability ability = new ConditionalTriggeredAbility(
                 new BeginningOfEndStepTriggeredAbility(new PutLibraryIntoGraveTargetEffect(4), TargetController.YOU, false),
                 RaidCondition.instance,
-                "<i>Raid</i> - At the beginning of your end step, if you attacked with a creature this turn, target opponent puts the top four cards of his or her library into his or her graveyard.");
+                "<i>Raid</i> - At the beginning of your end step, if you attacked with a creature this turn, target opponent puts the top four cards of their library into their graveyard.");
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability, new PlayerAttackedWatcher());
     }
diff --git a/Mage.Sets/src/mage/cards/n/NayaSoulbeast.java b/Mage.Sets/src/mage/cards/n/NayaSoulbeast.java
index 865e9216aa6..da4ca8cfe3f 100644
--- a/Mage.Sets/src/mage/cards/n/NayaSoulbeast.java
+++ b/Mage.Sets/src/mage/cards/n/NayaSoulbeast.java
@@ -66,7 +66,7 @@ public class NayaSoulbeast extends CardImpl {
 
         // Trample
         this.addAbility(TrampleAbility.getInstance());
-        // When you cast Naya Soulbeast, each player reveals the top card of his or her library.
+        // When you cast Naya Soulbeast, each player reveals the top card of their library.
         Ability ability = new CastSourceTriggeredAbility(new NayaSoulbeastCastEffect(), false);
         // Naya Soulbeast enters the battlefield with X +1/+1 counters on it, where X is the total converted mana cost of all cards revealed this way.
         ability.addEffect(new NayaSoulbeastReplacementEffect());
@@ -87,7 +87,7 @@ class NayaSoulbeastCastEffect extends OneShotEffect {
 
     public NayaSoulbeastCastEffect() {
         super(Outcome.Benefit);
-        this.staticText = "each player reveals the top card of his or her library";
+        this.staticText = "each player reveals the top card of their library";
     }
 
     public NayaSoulbeastCastEffect(final NayaSoulbeastCastEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/n/Nebuchadnezzar.java b/Mage.Sets/src/mage/cards/n/Nebuchadnezzar.java
index 2a6dca23b20..bf7ba4b3cde 100644
--- a/Mage.Sets/src/mage/cards/n/Nebuchadnezzar.java
+++ b/Mage.Sets/src/mage/cards/n/Nebuchadnezzar.java
@@ -63,7 +63,7 @@ public class Nebuchadnezzar extends CardImpl {
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);
 
-        // {X}, {T}: Choose a card name. Target opponent reveals X cards at random from his or her hand. Then that player discards all cards with that name revealed this way. Activate this ability only during your turn.
+        // {X}, {T}: Choose a card name. Target opponent reveals X cards at random from their hand. Then that player discards all cards with that name revealed this way. Activate this ability only during your turn.
         Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new NameACardEffect(NameACardEffect.TypeOfName.ALL), new ManaCostsImpl("{X}"), MyTurnCondition.instance);
         ability.addCost(new TapSourceCost());
         ability.addEffect(new NebuchadnezzarEffect());
@@ -85,7 +85,7 @@ class NebuchadnezzarEffect extends OneShotEffect {
 
     public NebuchadnezzarEffect() {
         super(Outcome.Detriment);
-        staticText = "Target opponent reveals X cards at random from his or her hand. Then that player discards all cards with that name revealed this way";
+        staticText = "Target opponent reveals X cards at random from their hand. Then that player discards all cards with that name revealed this way";
     }
 
     public NebuchadnezzarEffect(final NebuchadnezzarEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/n/NecromasterDragon.java b/Mage.Sets/src/mage/cards/n/NecromasterDragon.java
index 274c4556235..f7abcdf79ae 100644
--- a/Mage.Sets/src/mage/cards/n/NecromasterDragon.java
+++ b/Mage.Sets/src/mage/cards/n/NecromasterDragon.java
@@ -58,7 +58,7 @@ public class NecromasterDragon extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
         
-        // Whenever Necromaster Dragon deals combat damage to a player, you may pay {2}. If you do, create a 2/2 black Zombie creature token and each opponent puts the top two cards of his or her library into his or her graveyard
+        // Whenever Necromaster Dragon deals combat damage to a player, you may pay {2}. If you do, create a 2/2 black Zombie creature token and each opponent puts the top two cards of their library into their graveyard
         Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(
             new DoIfCostPaid(new CreateTokenEffect(new ZombieToken(), 1), new ManaCostsImpl("{2}")), false);
         ability.addEffect(new PutTopCardOfLibraryIntoGraveEachPlayerEffect(2, TargetController.OPPONENT));
diff --git a/Mage.Sets/src/mage/cards/n/NecroticPlague.java b/Mage.Sets/src/mage/cards/n/NecroticPlague.java
index d2d09529b13..f4601bb5b1a 100644
--- a/Mage.Sets/src/mage/cards/n/NecroticPlague.java
+++ b/Mage.Sets/src/mage/cards/n/NecroticPlague.java
@@ -80,7 +80,7 @@ public class NecroticPlague extends CardImpl {
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
         // Enchanted creature has "At the beginning of your upkeep, sacrifice this creature."
-        // When enchanted creature dies, its controller chooses target creature one of his or her opponents controls. Return Necrotic Plague from its owner's graveyard to the battlefield attached to that creature.
+        // When enchanted creature dies, its controller chooses target creature one of their opponents controls. Return Necrotic Plague from its owner's graveyard to the battlefield attached to that creature.
         Ability gainedAbility = new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceEffect(), TargetController.YOU, false);
         Effect effect = new GainAbilityAttachedEffect(gainedAbility, AttachmentType.AURA, Duration.WhileOnBattlefield);
         effect.setText("Enchanted creature has \"At the beginning of your upkeep, sacrifice this creature.\"");
@@ -123,7 +123,7 @@ class NecroticPlagueEffect extends OneShotEffect {
 
     public NecroticPlagueEffect() {
         super(Outcome.PutCardInPlay);
-        staticText = "its controller chooses target creature one of his or her opponents controls. Return {this} from its owner's graveyard to the battlefield attached to that creature";
+        staticText = "its controller chooses target creature one of their opponents controls. Return {this} from its owner's graveyard to the battlefield attached to that creature";
     }
 
     public NecroticPlagueEffect(final NecroticPlagueEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/n/NemesisOfReason.java b/Mage.Sets/src/mage/cards/n/NemesisOfReason.java
index 3974c7b9e98..4dd5109451e 100644
--- a/Mage.Sets/src/mage/cards/n/NemesisOfReason.java
+++ b/Mage.Sets/src/mage/cards/n/NemesisOfReason.java
@@ -56,9 +56,9 @@ public class NemesisOfReason extends CardImpl {
         this.power = new MageInt(3);
         this.toughness = new MageInt(7);
         
-        // Whenever Nemesis of Reason attacks, defending player puts the top ten cards of his or her library into his or her graveyard.
+        // Whenever Nemesis of Reason attacks, defending player puts the top ten cards of their library into their graveyard.
         Effect effect = new PutLibraryIntoGraveTargetEffect(10);
-        effect.setText("defending player puts the top ten cards of his or her library into his or her graveyard");
+        effect.setText("defending player puts the top ten cards of their library into their graveyard");
         this.addAbility(new NemesisOfReasonTriggeredAbility(effect));
     }
 
@@ -106,6 +106,6 @@ class NemesisOfReasonTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "Whenever {this} attacks, defending player puts the top ten cards of his or her library into his or her graveyard.";
+        return "Whenever {this} attacks, defending player puts the top ten cards of their library into their graveyard.";
     }
 }
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/cards/n/NephaliaDrownyard.java b/Mage.Sets/src/mage/cards/n/NephaliaDrownyard.java
index de9eda58f3c..0734739e6ad 100644
--- a/Mage.Sets/src/mage/cards/n/NephaliaDrownyard.java
+++ b/Mage.Sets/src/mage/cards/n/NephaliaDrownyard.java
@@ -51,7 +51,7 @@ public class NephaliaDrownyard extends CardImpl {
         // {T}: Add 1 to your mana pool.
         this.addAbility(new ColorlessManaAbility());
 
-        // {1}{U}{B}, {T}: Target player puts the top three cards of his or her library into his or her graveyard.
+        // {1}{U}{B}, {T}: Target player puts the top three cards of their library into their graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(3), new ManaCostsImpl("{1}{U}{B}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetPlayer());
diff --git a/Mage.Sets/src/mage/cards/n/NeverendingTorment.java b/Mage.Sets/src/mage/cards/n/NeverendingTorment.java
index fa1345e768c..9dcd9b78eab 100644
--- a/Mage.Sets/src/mage/cards/n/NeverendingTorment.java
+++ b/Mage.Sets/src/mage/cards/n/NeverendingTorment.java
@@ -54,7 +54,7 @@ public class NeverendingTorment extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{B}{B}");
 
 
-        // Search target player's library for X cards, where X is the number of cards in your hand, and exile them. Then that player shuffles his or her library.
+        // Search target player's library for X cards, where X is the number of cards in your hand, and exile them. Then that player shuffles their library.
         this.getSpellAbility().addEffect(new NeverendingTormentEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
 
@@ -76,7 +76,7 @@ class NeverendingTormentEffect extends OneShotEffect {
 
     public NeverendingTormentEffect() {
         super(Outcome.Benefit);
-        staticText = "Search target player's library for X cards, where X is the number of cards in your hand, and exile them. Then that player shuffles his or her library";
+        staticText = "Search target player's library for X cards, where X is the number of cards in your hand, and exile them. Then that player shuffles their library";
     }
 
     public NeverendingTormentEffect(final NeverendingTormentEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/n/NewFrontiers.java b/Mage.Sets/src/mage/cards/n/NewFrontiers.java
index 0f82486a84a..246b24e817a 100644
--- a/Mage.Sets/src/mage/cards/n/NewFrontiers.java
+++ b/Mage.Sets/src/mage/cards/n/NewFrontiers.java
@@ -51,7 +51,7 @@ public class NewFrontiers extends CardImpl {
     public NewFrontiers(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{G}");
 
-        // Each player may search his or her library for up to X basic land cards and put them onto the battlefield tapped. Then each player who searched his or her library this way shuffles it.
+        // Each player may search their library for up to X basic land cards and put them onto the battlefield tapped. Then each player who searched their library this way shuffles it.
         this.getSpellAbility().addEffect(new NewFrontiersEffect());
     }
 
@@ -69,7 +69,7 @@ class NewFrontiersEffect extends OneShotEffect {
 
     public NewFrontiersEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Each player may search his or her library for up to X basic land cards and put them onto the battlefield tapped. Then each player who searched his or her library this way shuffles it";
+        this.staticText = "Each player may search their library for up to X basic land cards and put them onto the battlefield tapped. Then each player who searched their library this way shuffles it";
     }
 
     public NewFrontiersEffect(final NewFrontiersEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/n/NezumiShortfang.java b/Mage.Sets/src/mage/cards/n/NezumiShortfang.java
index 7deb035d6cb..76528582aef 100644
--- a/Mage.Sets/src/mage/cards/n/NezumiShortfang.java
+++ b/Mage.Sets/src/mage/cards/n/NezumiShortfang.java
@@ -95,7 +95,7 @@ class StabwhiskerTheOdious extends Token {
         power = new MageInt(3);
         toughness = new MageInt(3);
 
-        // At the beginning of each opponent's upkeep, that player loses 1 life for each card fewer than three in his or her hand.
+        // At the beginning of each opponent's upkeep, that player loses 1 life for each card fewer than three in their hand.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(
                 Zone.BATTLEFIELD, new StabwhiskerLoseLifeEffect(), TargetController.OPPONENT, false, true));
     }
@@ -105,7 +105,7 @@ class StabwhiskerLoseLifeEffect extends OneShotEffect {
 
     public StabwhiskerLoseLifeEffect() {
         super(Outcome.LoseLife);
-        this.staticText = "that player loses 1 life for each card fewer than three in his or her hand";
+        this.staticText = "that player loses 1 life for each card fewer than three in their hand";
     }
 
     public StabwhiskerLoseLifeEffect(final StabwhiskerLoseLifeEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/n/NicolBolas.java b/Mage.Sets/src/mage/cards/n/NicolBolas.java
index a9c7c581f31..32cc0440753 100644
--- a/Mage.Sets/src/mage/cards/n/NicolBolas.java
+++ b/Mage.Sets/src/mage/cards/n/NicolBolas.java
@@ -62,7 +62,7 @@ public class NicolBolas extends CardImpl {
         // At the beginning of your upkeep, sacrifice Nicol Bolas unless you pay {U}{B}{R}.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeSourceUnlessPaysEffect(new ManaCostsImpl("{U}{B}{R}")), TargetController.YOU, false));
 
-        // Whenever Nicol Bolas deals damage to an opponent, that player discards his or her hand.
+        // Whenever Nicol Bolas deals damage to an opponent, that player discards their hand.
         this.addAbility(new DealsDamageToOpponentTriggeredAbility(new DiscardHandTargetEffect("that player"), false, false, true));
     }
 
diff --git a/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java b/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java
index ed909628df1..c0a91b3b523 100644
--- a/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java
+++ b/Mage.Sets/src/mage/cards/n/NicolBolasGodPharaoh.java
@@ -74,12 +74,12 @@ public class NicolBolasGodPharaoh extends CardImpl {
 
         this.addAbility(new PlanswalkerEntersWithLoyalityCountersAbility(7));
 
-        // +2: Target opponent exiles cards from the top of his or her library until he or she exiles a nonland card. Until end of turn, you may cast that card without paying its mana cost.
+        // +2: Target opponent exiles cards from the top of their library until he or she exiles a nonland card. Until end of turn, you may cast that card without paying its mana cost.
         LoyaltyAbility ability = new LoyaltyAbility(new NicolBolasGodPharaohPlusTwoEffect(), 2);
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
 
-        // +1: Each opponent exiles two cards from his or her hand.
+        // +1: Each opponent exiles two cards from their hand.
         this.addAbility(new LoyaltyAbility(new NicolBolasGodPharaohPlusOneEffect(), 1));
 
         // -4: Nicol Bolas, God-Pharaoh deals 7 damage to target creature or player.
@@ -105,7 +105,7 @@ class NicolBolasGodPharaohPlusOneEffect extends OneShotEffect {
 
     NicolBolasGodPharaohPlusOneEffect() {
         super(Outcome.Exile);
-        this.staticText = "Each opponent exiles two cards from his or her hand.";
+        this.staticText = "Each opponent exiles two cards from their hand.";
     }
 
     NicolBolasGodPharaohPlusOneEffect(final NicolBolasGodPharaohPlusOneEffect effect) {
@@ -157,7 +157,7 @@ class NicolBolasGodPharaohPlusTwoEffect extends OneShotEffect {
 
     public NicolBolasGodPharaohPlusTwoEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Target opponent exiles cards from the top of his or her library until he or she exiles a nonland card. Until end of turn, you may cast that card without paying its mana cost";
+        this.staticText = "Target opponent exiles cards from the top of their library until he or she exiles a nonland card. Until end of turn, you may cast that card without paying its mana cost";
     }
 
     public NicolBolasGodPharaohPlusTwoEffect(final NicolBolasGodPharaohPlusTwoEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/n/NightTerrors.java b/Mage.Sets/src/mage/cards/n/NightTerrors.java
index 40930132f3e..b4092b3f7de 100644
--- a/Mage.Sets/src/mage/cards/n/NightTerrors.java
+++ b/Mage.Sets/src/mage/cards/n/NightTerrors.java
@@ -52,7 +52,7 @@ public class NightTerrors extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}");
 
 
-        // Target player reveals his or her hand. You choose a nonland card from it. Exile that card.
+        // Target player reveals their hand. You choose a nonland card from it. Exile that card.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new NightTerrorsEffect());
     }
@@ -71,7 +71,7 @@ class NightTerrorsEffect extends OneShotEffect {
 
     public NightTerrorsEffect() {
         super(Outcome.Exile);
-        this.staticText = "Target player reveals his or her hand. You choose a nonland card from it. Exile that card";
+        this.staticText = "Target player reveals their hand. You choose a nonland card from it. Exile that card";
     }
 
     public NightTerrorsEffect(final NightTerrorsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/n/NightmareIncursion.java b/Mage.Sets/src/mage/cards/n/NightmareIncursion.java
index f1460e7f007..689ce01e66d 100644
--- a/Mage.Sets/src/mage/cards/n/NightmareIncursion.java
+++ b/Mage.Sets/src/mage/cards/n/NightmareIncursion.java
@@ -56,7 +56,7 @@ public class NightmareIncursion extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{B}");
 
 
-        // Search target player's library for up to X cards, where X is the number of Swamps you control, and exile them. Then that player shuffles his or her library.
+        // Search target player's library for up to X cards, where X is the number of Swamps you control, and exile them. Then that player shuffles their library.
         Effect effect = new NightmareIncursionEffect();
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(effect);
@@ -86,7 +86,7 @@ class NightmareIncursionEffect extends OneShotEffect {
 
     public NightmareIncursionEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Search target player's library for up to X cards, where X is the number of Swamps you control, and exile them. Then that player shuffles his or her library";
+        this.staticText = "Search target player's library for up to X cards, where X is the number of Swamps you control, and exile them. Then that player shuffles their library";
     }
 
     public NightmareIncursionEffect(final NightmareIncursionEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/n/NightmareVoid.java b/Mage.Sets/src/mage/cards/n/NightmareVoid.java
index d614572db16..40d01d33177 100644
--- a/Mage.Sets/src/mage/cards/n/NightmareVoid.java
+++ b/Mage.Sets/src/mage/cards/n/NightmareVoid.java
@@ -46,7 +46,7 @@ public class NightmareVoid extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{B}");
 
 
-        // Target player reveals his or her hand. You choose a card from it. That player discards that card.
+        // Target player reveals their hand. You choose a card from it. That player discards that card.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(TargetController.ANY));
         // Dredge 2
diff --git a/Mage.Sets/src/mage/cards/n/Nightsnare.java b/Mage.Sets/src/mage/cards/n/Nightsnare.java
index eec3563212c..d818efae858 100644
--- a/Mage.Sets/src/mage/cards/n/Nightsnare.java
+++ b/Mage.Sets/src/mage/cards/n/Nightsnare.java
@@ -53,7 +53,7 @@ public class Nightsnare extends CardImpl {
     public Nightsnare(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{B}");
 
-        // Target opponent reveals his or her hand. You may choose a nonland card from it. If you do, that player discards that card. If you don't, that player discards two cards.
+        // Target opponent reveals their hand. You may choose a nonland card from it. If you do, that player discards that card. If you don't, that player discards two cards.
         this.getSpellAbility().addTarget(new TargetOpponent());
         this.getSpellAbility().addEffect(new NightsnareDiscardEffect());
     }
@@ -72,7 +72,7 @@ class NightsnareDiscardEffect extends OneShotEffect {
 
     public NightsnareDiscardEffect() {
         super(Outcome.Discard);
-        staticText = "Target opponent reveals his or her hand. You may choose a nonland card from it. If you do, that player discards that card. If you don't, that player discards two cards";
+        staticText = "Target opponent reveals their hand. You may choose a nonland card from it. If you do, that player discards that card. If you don't, that player discards two cards";
     }
 
     public NightsnareDiscardEffect(final NightsnareDiscardEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/n/NightveilSpecter.java b/Mage.Sets/src/mage/cards/n/NightveilSpecter.java
index c9cb96360f4..8d31e951361 100644
--- a/Mage.Sets/src/mage/cards/n/NightveilSpecter.java
+++ b/Mage.Sets/src/mage/cards/n/NightveilSpecter.java
@@ -76,7 +76,7 @@ public class NightveilSpecter extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
 
-        // Whenever Nightveil Specter deals combat damage to a player, that player exiles the top card of his or her library.     
+        // Whenever Nightveil Specter deals combat damage to a player, that player exiles the top card of their library.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new NightveilSpecterExileEffect(), false, true));
 
         // You may play cards exiled with Nightveil Specter.
@@ -97,7 +97,7 @@ class NightveilSpecterExileEffect extends OneShotEffect {
 
     public NightveilSpecterExileEffect() {
         super(Outcome.Discard);
-        staticText = "that player exiles the top card of his or her library";
+        staticText = "that player exiles the top card of their library";
     }
 
     public NightveilSpecterExileEffect(final NightveilSpecterExileEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/n/NobleBenefactor.java b/Mage.Sets/src/mage/cards/n/NobleBenefactor.java
index c35f585be8d..c39d414af5d 100644
--- a/Mage.Sets/src/mage/cards/n/NobleBenefactor.java
+++ b/Mage.Sets/src/mage/cards/n/NobleBenefactor.java
@@ -58,7 +58,7 @@ public class NobleBenefactor extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        // When Noble Benefactor dies, each player may search his or her library for a card and put that card into his or her hand. Then each player who searched his or her library this way shuffles it.
+        // When Noble Benefactor dies, each player may search their library for a card and put that card into their hand. Then each player who searched their library this way shuffles it.
         this.addAbility(new DiesTriggeredAbility(new NobleBenefactorEffect()));
     }
 
@@ -76,7 +76,7 @@ class NobleBenefactorEffect extends OneShotEffect {
 
     public NobleBenefactorEffect() {
         super(Outcome.Benefit);
-        this.staticText = "each player may search his or her library for a card and put that card into his or her hand. Then each player who searched his or her library this way shuffles it";
+        this.staticText = "each player may search their library for a card and put that card into their hand. Then each player who searched their library this way shuffles it";
     }
 
     public NobleBenefactorEffect(final NobleBenefactorEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/n/NoeticScales.java b/Mage.Sets/src/mage/cards/n/NoeticScales.java
index b0d2b2d0689..646b284af17 100644
--- a/Mage.Sets/src/mage/cards/n/NoeticScales.java
+++ b/Mage.Sets/src/mage/cards/n/NoeticScales.java
@@ -51,7 +51,7 @@ public class NoeticScales extends CardImpl {
     public NoeticScales(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}");
 
-        // At the beginning of each player's upkeep, return to its owner's hand each creature that player controls with power greater than the number of cards in his or her hand.
+        // At the beginning of each player's upkeep, return to its owner's hand each creature that player controls with power greater than the number of cards in their hand.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new NoeticScalesEffect(), TargetController.ANY, false, true));
     }
 
@@ -69,7 +69,7 @@ class NoeticScalesEffect extends OneShotEffect {
 
     public NoeticScalesEffect() {
         super(Outcome.ReturnToHand);
-        this.staticText = "return to its owner's hand each creature that player controls with power greater than the number of cards in his or her hand";
+        this.staticText = "return to its owner's hand each creature that player controls with power greater than the number of cards in their hand";
     }
 
     public NoeticScalesEffect(final NoeticScalesEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/n/NogginWhack.java b/Mage.Sets/src/mage/cards/n/NogginWhack.java
index 22a167e1ba4..1152e7deff0 100644
--- a/Mage.Sets/src/mage/cards/n/NogginWhack.java
+++ b/Mage.Sets/src/mage/cards/n/NogginWhack.java
@@ -60,7 +60,7 @@ public class NogginWhack extends CardImpl {
 
         // Prowl {1}{B}
         this.addAbility(new ProwlAbility(this, "{1}{B}"));
-        // Target player reveals three cards from his or her hand. You choose two of them. That player discards those cards.
+        // Target player reveals three cards from their hand. You choose two of them. That player discards those cards.
         this.getSpellAbility().addEffect(new NogginWhackEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
 
@@ -80,7 +80,7 @@ class NogginWhackEffect extends OneShotEffect {
 
     public NogginWhackEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Target player reveals three cards from his or her hand. You choose two of them. That player discards those cards";
+        this.staticText = "Target player reveals three cards from their hand. You choose two of them. That player discards those cards";
     }
 
     public NogginWhackEffect(final NogginWhackEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/n/NotionThief.java b/Mage.Sets/src/mage/cards/n/NotionThief.java
index 1d2ef506151..f093f6c9578 100644
--- a/Mage.Sets/src/mage/cards/n/NotionThief.java
+++ b/Mage.Sets/src/mage/cards/n/NotionThief.java
@@ -62,7 +62,7 @@ public class NotionThief extends CardImpl {
 
         // Flash
         this.addAbility(FlashAbility.getInstance());
-        // If an opponent would draw a card except the first one he or she draws in each of his or her draw steps, instead that player skips that draw and you draw a card.
+        // If an opponent would draw a card except the first one he or she draws in each of their draw steps, instead that player skips that draw and you draw a card.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new NotionThiefReplacementEffect()), new CardsDrawnDuringDrawStepWatcher());
 
     }
@@ -81,7 +81,7 @@ class NotionThiefReplacementEffect extends ReplacementEffectImpl {
 
     public NotionThiefReplacementEffect() {
         super(Duration.WhileOnBattlefield, Outcome.Benefit);
-        staticText = "If an opponent would draw a card except the first one he or she draws in each of his or her draw steps, instead that player skips that draw and you draw a card";
+        staticText = "If an opponent would draw a card except the first one he or she draws in each of their draw steps, instead that player skips that draw and you draw a card";
     }
 
     public NotionThiefReplacementEffect(final NotionThiefReplacementEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/n/NullmageAdvocate.java b/Mage.Sets/src/mage/cards/n/NullmageAdvocate.java
index a7a11626944..f325dc6bafe 100644
--- a/Mage.Sets/src/mage/cards/n/NullmageAdvocate.java
+++ b/Mage.Sets/src/mage/cards/n/NullmageAdvocate.java
@@ -60,9 +60,9 @@ public class NullmageAdvocate extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(3);
 
-        // {tap}: Return two target cards from an opponent's graveyard to his or her hand. Destroy target artifact or enchantment.
+        // {tap}: Return two target cards from an opponent's graveyard to their hand. Destroy target artifact or enchantment.
         Effect effect = new ReturnFromGraveyardToHandTargetEffect();
-        effect.setText("Return two target cards from an opponent's graveyard to his or her hand");
+        effect.setText("Return two target cards from an opponent's graveyard to their hand");
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost());
 
         effect = new DestroyTargetEffect("Destroy target artifact or enchantment");
diff --git a/Mage.Sets/src/mage/cards/o/OKagachiVengefulKami.java b/Mage.Sets/src/mage/cards/o/OKagachiVengefulKami.java
index b76c8584ac5..7fc8769ba37 100644
--- a/Mage.Sets/src/mage/cards/o/OKagachiVengefulKami.java
+++ b/Mage.Sets/src/mage/cards/o/OKagachiVengefulKami.java
@@ -75,7 +75,7 @@ public class OKagachiVengefulKami extends CardImpl {
         // Trample
         this.addAbility(TrampleAbility.getInstance());
 
-        // Whenever O-Kagachi, Vengeful Kami deals combat damage to a player, if that player attacked you during his or her last turn, exile target nonland permanent that player controls
+        // Whenever O-Kagachi, Vengeful Kami deals combat damage to a player, if that player attacked you during their last turn, exile target nonland permanent that player controls
         OKagachiVengefulKamiTriggeredAbility ability = new OKagachiVengefulKamiTriggeredAbility();
         ability.addWatcher(new PlayersAttackedLastTurnWatcher());
         this.addAbility(ability);
@@ -142,7 +142,7 @@ class OKagachiVengefulKamiTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "Whenever {this} deals combat damage to a player, if that player attacked you during his or her last turn, exile target nonland permanent that player controls";
+        return "Whenever {this} deals combat damage to a player, if that player attacked you during their last turn, exile target nonland permanent that player controls";
     }
 }
 
@@ -150,7 +150,7 @@ class OKagachiVengefulKamiEffect extends OneShotEffect {
 
     public OKagachiVengefulKamiEffect() {
         super(Outcome.Benefit);
-        this.staticText = "if that player attacked you during his or her last turn, exile target nonland permanent that player controls";
+        this.staticText = "if that player attacked you during their last turn, exile target nonland permanent that player controls";
     }
 
     public OKagachiVengefulKamiEffect(final OKagachiVengefulKamiEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/o/OathOfDruids.java b/Mage.Sets/src/mage/cards/o/OathOfDruids.java
index f3217435aed..8b4566fe658 100644
--- a/Mage.Sets/src/mage/cards/o/OathOfDruids.java
+++ b/Mage.Sets/src/mage/cards/o/OathOfDruids.java
@@ -65,7 +65,7 @@ public class OathOfDruids extends CardImpl {
     public OathOfDruids(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}");
 
-        // At the beginning of each player's upkeep, that player chooses target player who controls more creatures than he or she does and is his or her opponent. The first player may reveal cards from the top of his or her library until he or she reveals a creature card. If he or she does, that player puts that card onto the battlefield and all other cards revealed this way into his or her graveyard.
+        // At the beginning of each player's upkeep, that player chooses target player who controls more creatures than he or she does and is their opponent. The first player may reveal cards from the top of their library until he or she reveals a creature card. If he or she does, that player puts that card onto the battlefield and all other cards revealed this way into their graveyard.
         Ability ability = new BeginningOfUpkeepTriggeredAbility(new OathOfDruidsEffect(), TargetController.ANY, false);
         ability.addTarget(new TargetPlayer(1, 1, false, filter));
         originalId = ability.getOriginalId();
@@ -121,7 +121,7 @@ class OathOfDruidsPredicate implements ObjectSourcePlayerPredicate<ObjectSourceP
 
     @Override
     public String toString() {
-        return "player who controls more creatures than he or she does and is his or her opponent";
+        return "player who controls more creatures than he or she does and is their opponent";
     }
 }
 
@@ -129,9 +129,9 @@ class OathOfDruidsEffect extends OneShotEffect {
 
     public OathOfDruidsEffect() {
         super(Outcome.PutCardInPlay);
-        staticText = "that player chooses target player who controls more creatures than he or she does and is his or her opponent. "
-                + "The first player may reveal cards from the top of his or her library until he or she reveals a creature card. "
-                + "If he or she does, that player puts that card onto the battlefield and all other cards revealed this way into his or her graveyard";
+        staticText = "that player chooses target player who controls more creatures than he or she does and is their opponent. "
+                + "The first player may reveal cards from the top of their library until he or she reveals a creature card. "
+                + "If he or she does, that player puts that card onto the battlefield and all other cards revealed this way into their graveyard";
     }
 
     public OathOfDruidsEffect(OathOfDruidsEffect effect) {
@@ -151,7 +151,7 @@ class OathOfDruidsEffect extends OneShotEffect {
         if (!player.chooseUse(Outcome.Benefit, "Use this ability?", source, game)) {
             return true;
         }
-        //The first player may reveal cards from the top of his or her library
+        //The first player may reveal cards from the top of their library
         while (creatureCard == null && player.getLibrary().hasCards()) {
             Card card = player.getLibrary().removeFromTop(game);
             revealed.add(card);
@@ -168,7 +168,7 @@ class OathOfDruidsEffect extends OneShotEffect {
         if (creatureCard != null) {
             player.moveCards(creatureCard, Zone.BATTLEFIELD, source, game);
         }
-        // and all other cards revealed this way into his or her graveyard
+        // and all other cards revealed this way into their graveyard
         player.moveCards(nonCreatureCards, Zone.GRAVEYARD, source, game);
         return true;
     }
diff --git a/Mage.Sets/src/mage/cards/o/OathOfGhouls.java b/Mage.Sets/src/mage/cards/o/OathOfGhouls.java
index e52386607ac..23df2de0545 100644
--- a/Mage.Sets/src/mage/cards/o/OathOfGhouls.java
+++ b/Mage.Sets/src/mage/cards/o/OathOfGhouls.java
@@ -68,7 +68,7 @@ public class OathOfGhouls extends CardImpl {
     public OathOfGhouls(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}");
 
-        // At the beginning of each player's upkeep, that player chooses target player whose graveyard has fewer creature cards in it than his or her graveyard does and is his or her opponent. The first player may return a creature card from his or her graveyard to his or her hand.
+        // At the beginning of each player's upkeep, that player chooses target player whose graveyard has fewer creature cards in it than their graveyard does and is their opponent. The first player may return a creature card from their graveyard to their hand.
         Ability ability = new BeginningOfUpkeepTriggeredAbility(new OathOfGhoulsEffect(), TargetController.ANY, false);
         ability.addTarget(new TargetPlayer(1, 1, false, filter));
         this.addAbility(ability);
@@ -125,7 +125,7 @@ class OathOfGhoulsPredicate implements ObjectSourcePlayerPredicate<ObjectSourceP
 
     @Override
     public String toString() {
-        return "player whose graveyard has fewer creature cards in it than his or her graveyard does and is his or her opponent";
+        return "player whose graveyard has fewer creature cards in it than their graveyard does and is their opponent";
     }
 }
 
@@ -140,7 +140,7 @@ class OathOfGhoulsEffect extends OneShotEffect {
 
     public OathOfGhoulsEffect() {
         super(Outcome.Benefit);
-        staticText = "that player chooses target player whose graveyard has fewer creature cards in it than his or her graveyard does and is his or her opponent. The first player may return a creature card from his or her graveyard to his or her hand";
+        staticText = "that player chooses target player whose graveyard has fewer creature cards in it than their graveyard does and is their opponent. The first player may return a creature card from their graveyard to their hand";
     }
 
     public OathOfGhoulsEffect(OathOfGhoulsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/o/OathOfLieges.java b/Mage.Sets/src/mage/cards/o/OathOfLieges.java
index 38479085ffc..c8d6524d4bd 100644
--- a/Mage.Sets/src/mage/cards/o/OathOfLieges.java
+++ b/Mage.Sets/src/mage/cards/o/OathOfLieges.java
@@ -66,7 +66,7 @@ public class OathOfLieges extends CardImpl {
     public OathOfLieges(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}");
 
-        // At the beginning of each player's upkeep, that player chooses target player who controls more lands than he or she does and is his or her opponent. The first player may search his or her library for a basic land card, put that card onto the battlefield, then shuffle his or her library.
+        // At the beginning of each player's upkeep, that player chooses target player who controls more lands than he or she does and is their opponent. The first player may search their library for a basic land card, put that card onto the battlefield, then shuffle their library.
         Ability ability = new BeginningOfUpkeepTriggeredAbility(new OathOfLiegesEffect(), TargetController.ANY, false);
         ability.addTarget(new TargetPlayer(1, 1, false, FILTER));
         originalId = ability.getOriginalId();
@@ -101,8 +101,8 @@ class OathOfLiegesEffect extends OneShotEffect {
 
     public OathOfLiegesEffect() {
         super(Outcome.Benefit);
-        this.staticText = "that player chooses target player who controls more lands than he or she does and is his or her opponent. "
-                + "The first player may search his or her library for a basic land card, put that card onto the battlefield, then shuffle his or her library";
+        this.staticText = "that player chooses target player who controls more lands than he or she does and is their opponent. "
+                + "The first player may search their library for a basic land card, put that card onto the battlefield, then shuffle their library";
     }
 
     public OathOfLiegesEffect(final OathOfLiegesEffect effect) {
@@ -153,6 +153,6 @@ class OathOfLiegesPredicate implements ObjectSourcePlayerPredicate<ObjectSourceP
 
     @Override
     public String toString() {
-        return "player who controls more lands than he or she does and is his or her opponent";
+        return "player who controls more lands than he or she does and is their opponent";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/o/OathOfMages.java b/Mage.Sets/src/mage/cards/o/OathOfMages.java
index b40c1a995c2..728cb6abf67 100644
--- a/Mage.Sets/src/mage/cards/o/OathOfMages.java
+++ b/Mage.Sets/src/mage/cards/o/OathOfMages.java
@@ -60,7 +60,7 @@ public class OathOfMages extends CardImpl {
     public OathOfMages(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}");
 
-        // At the beginning of each player's upkeep, that player chooses target player who has more life than he or she does and is his or her opponent. The first player may have Oath of Mages deal 1 damage to the second player.
+        // At the beginning of each player's upkeep, that player chooses target player who has more life than he or she does and is their opponent. The first player may have Oath of Mages deal 1 damage to the second player.
         Ability ability = new BeginningOfUpkeepTriggeredAbility(new OathOfMagesEffect(), TargetController.ANY, false);
         ability.addTarget(new TargetPlayer(1, 1, false, filter));
         this.addAbility(ability);
@@ -110,7 +110,7 @@ class OathOfMagesPredicate implements ObjectSourcePlayerPredicate<ObjectSourcePl
 
     @Override
     public String toString() {
-        return "player who has more life than he or she does and is his or her opponent";
+        return "player who has more life than he or she does and is their opponent";
     }
 }
 
@@ -118,7 +118,7 @@ class OathOfMagesEffect extends OneShotEffect {
 
     public OathOfMagesEffect() {
         super(Outcome.Damage);
-        staticText = "that player chooses target player who has more life than he or she does and is his or her opponent. The first player may have Oath of Mages deal 1 damage to the second player";
+        staticText = "that player chooses target player who has more life than he or she does and is their opponent. The first player may have Oath of Mages deal 1 damage to the second player";
     }
 
     public OathOfMagesEffect(OathOfMagesEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/o/OathOfScholars.java b/Mage.Sets/src/mage/cards/o/OathOfScholars.java
index 9f2d48acfb8..f463d2e3b91 100644
--- a/Mage.Sets/src/mage/cards/o/OathOfScholars.java
+++ b/Mage.Sets/src/mage/cards/o/OathOfScholars.java
@@ -60,7 +60,7 @@ public class OathOfScholars extends CardImpl {
     public OathOfScholars(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{U}");
 
-        // At the beginning of each player's upkeep, that player chooses target player who has more cards in hand than he or she does and is his or her opponent. The first player may discard his or her hand and draw three cards.
+        // At the beginning of each player's upkeep, that player chooses target player who has more cards in hand than he or she does and is their opponent. The first player may discard their hand and draw three cards.
         Ability ability = new BeginningOfUpkeepTriggeredAbility(new OathOfScholarsEffect(), TargetController.ANY, false);
         ability.addTarget(new TargetPlayer(1, 1, false, filter));
         this.addAbility(ability);
@@ -119,7 +119,7 @@ class OathOfScholarsEffect extends OneShotEffect {
 
     public OathOfScholarsEffect() {
         super(Outcome.PutCardInPlay);
-        staticText = "that player chooses target player who has more cards in hand than he or she does and is his or her opponent. The first player may discard his or her hand and draw three cards";
+        staticText = "that player chooses target player who has more cards in hand than he or she does and is their opponent. The first player may discard their hand and draw three cards";
     }
 
     public OathOfScholarsEffect(OathOfScholarsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/o/ObNixilisUnshackled.java b/Mage.Sets/src/mage/cards/o/ObNixilisUnshackled.java
index ef0de6ad01f..20ef8ac2e4c 100644
--- a/Mage.Sets/src/mage/cards/o/ObNixilisUnshackled.java
+++ b/Mage.Sets/src/mage/cards/o/ObNixilisUnshackled.java
@@ -71,7 +71,7 @@ public class ObNixilisUnshackled extends CardImpl {
         // Trample
         this.addAbility(TrampleAbility.getInstance());
         
-        // Whenever an opponent searches his or her library, that player sacrifices a creature and loses 10 life.
+        // Whenever an opponent searches their library, that player sacrifices a creature and loses 10 life.
         this.addAbility(new ObNixilisUnshackledTriggeredAbility());
         
         // Whenever another creature dies, put at +1/+1 counter on Ob Nixilis, Unshackled.
@@ -120,7 +120,7 @@ class ObNixilisUnshackledTriggeredAbility extends TriggeredAbilityImpl {
     
     @Override
     public String getRule() {
-        return "Whenever an opponent searches his or her library, that player sacrifices a creature and loses 10 life.";
+        return "Whenever an opponent searches their library, that player sacrifices a creature and loses 10 life.";
     }
 }
 
diff --git a/Mage.Sets/src/mage/cards/o/Oblation.java b/Mage.Sets/src/mage/cards/o/Oblation.java
index c71001a1bf1..fef4b582dc9 100644
--- a/Mage.Sets/src/mage/cards/o/Oblation.java
+++ b/Mage.Sets/src/mage/cards/o/Oblation.java
@@ -49,7 +49,7 @@ public class Oblation extends CardImpl {
     public Oblation(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{W}");
 
-        // The owner of target nonland permanent shuffles it into his or her library, then draws two cards.
+        // The owner of target nonland permanent shuffles it into their library, then draws two cards.
         this.getSpellAbility().addEffect(new OblationEffect());
         this.getSpellAbility().addTarget(new TargetNonlandPermanent());
     }
@@ -68,7 +68,7 @@ class OblationEffect extends OneShotEffect {
 
     OblationEffect() {
         super(Outcome.Removal);
-        this.staticText = "The owner of target nonland permanent shuffles it into his or her library, then draws two cards";
+        this.staticText = "The owner of target nonland permanent shuffles it into their library, then draws two cards";
     }
 
     OblationEffect(final OblationEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/o/OblivionSower.java b/Mage.Sets/src/mage/cards/o/OblivionSower.java
index cc6d3de5633..98b41acdfbc 100644
--- a/Mage.Sets/src/mage/cards/o/OblivionSower.java
+++ b/Mage.Sets/src/mage/cards/o/OblivionSower.java
@@ -63,7 +63,7 @@ public class OblivionSower extends CardImpl {
         this.power = new MageInt(5);
         this.toughness = new MageInt(8);
 
-        // When you cast Oblivion Sower, target opponent exiles the top four cards of his or her library, then you may put any number of land cards that player owns from exile onto the battlefield under your control.
+        // When you cast Oblivion Sower, target opponent exiles the top four cards of their library, then you may put any number of land cards that player owns from exile onto the battlefield under your control.
         Ability ability = new CastSourceTriggeredAbility(new ExileCardsFromTopOfLibraryTargetEffect(4, "target opponent"), false);
         ability.addEffect(new OblivionSowerEffect());
         ability.addTarget(new TargetOpponent());
diff --git a/Mage.Sets/src/mage/cards/o/OldGrowthDryads.java b/Mage.Sets/src/mage/cards/o/OldGrowthDryads.java
index a0dfc49a7df..ab50ffac64f 100644
--- a/Mage.Sets/src/mage/cards/o/OldGrowthDryads.java
+++ b/Mage.Sets/src/mage/cards/o/OldGrowthDryads.java
@@ -60,7 +60,7 @@ public class OldGrowthDryads extends CardImpl {
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);
 
-        // When Old-Growth Dryads enters the battlefield, each opponent may search his or her library for a basic land card, put it onto the battlefield tapped, then shuffle his or her library.
+        // When Old-Growth Dryads enters the battlefield, each opponent may search their library for a basic land card, put it onto the battlefield tapped, then shuffle their library.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new OldGrowthDryadsEffect()));
     }
 
@@ -78,7 +78,7 @@ class OldGrowthDryadsEffect extends OneShotEffect {
 
     OldGrowthDryadsEffect() {
         super(Outcome.Detriment);
-        this.staticText = "each opponent may search his or her library for a basic land card, put it onto the battlefield tapped, then shuffle his or her library";
+        this.staticText = "each opponent may search their library for a basic land card, put it onto the battlefield tapped, then shuffle their library";
     }
 
     OldGrowthDryadsEffect(final OldGrowthDryadsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/o/OmenMachine.java b/Mage.Sets/src/mage/cards/o/OmenMachine.java
index bd9cc8e6829..3d16258df18 100644
--- a/Mage.Sets/src/mage/cards/o/OmenMachine.java
+++ b/Mage.Sets/src/mage/cards/o/OmenMachine.java
@@ -58,7 +58,7 @@ public class OmenMachine extends CardImpl {
         // Players can't draw cards.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OmenMachineEffect()));
 
-        // At the beginning of each player's draw step, that player exiles the top card of his or her library. If it's a land card, the player puts it onto the battlefield. Otherwise, the player casts it without paying its mana cost if able.
+        // At the beginning of each player's draw step, that player exiles the top card of their library. If it's a land card, the player puts it onto the battlefield. Otherwise, the player casts it without paying its mana cost if able.
         this.addAbility(new BeginningOfDrawTriggeredAbility(new OmenMachineEffect2(), TargetController.ANY, false));
     }
 
@@ -109,7 +109,7 @@ class OmenMachineEffect2 extends OneShotEffect {
 
     public OmenMachineEffect2() {
         super(Outcome.PlayForFree);
-        staticText = "that player exiles the top card of his or her library. If it's a land card, the player puts it onto the battlefield. Otherwise, the player casts it without paying its mana cost if able";
+        staticText = "that player exiles the top card of their library. If it's a land card, the player puts it onto the battlefield. Otherwise, the player casts it without paying its mana cost if able";
     }
 
     public OmenMachineEffect2(final OmenMachineEffect2 effect) {
diff --git a/Mage.Sets/src/mage/cards/o/OonaQueenOfTheFae.java b/Mage.Sets/src/mage/cards/o/OonaQueenOfTheFae.java
index 722a4a46957..687958b8907 100644
--- a/Mage.Sets/src/mage/cards/o/OonaQueenOfTheFae.java
+++ b/Mage.Sets/src/mage/cards/o/OonaQueenOfTheFae.java
@@ -68,7 +68,7 @@ public class OonaQueenOfTheFae extends CardImpl {
 
         // Flying
         this.addAbility(FlyingAbility.getInstance());
-        // {X}{UB}: Choose a color. Target opponent exiles the top X cards of his or her library. For each card of the chosen color exiled this way, create a 1/1 blue and black Faerie Rogue creature token with flying.
+        // {X}{UB}: Choose a color. Target opponent exiles the top X cards of their library. For each card of the chosen color exiled this way, create a 1/1 blue and black Faerie Rogue creature token with flying.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OonaQueenOfTheFaeEffect(), new ManaCostsImpl("{X}{U/B}"));
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
@@ -88,7 +88,7 @@ class OonaQueenOfTheFaeEffect extends OneShotEffect {
 
     public OonaQueenOfTheFaeEffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "Choose a color. Target opponent exiles the top X cards of his or her library. For each card of the chosen color exiled this way, create a 1/1 blue and black Faerie Rogue creature token with flying";
+        this.staticText = "Choose a color. Target opponent exiles the top X cards of their library. For each card of the chosen color exiled this way, create a 1/1 blue and black Faerie Rogue creature token with flying";
     }
 
     public OonaQueenOfTheFaeEffect(final OonaQueenOfTheFaeEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/o/OrnateKanzashi.java b/Mage.Sets/src/mage/cards/o/OrnateKanzashi.java
index 4e9e6daf00f..d2970bef0ae 100644
--- a/Mage.Sets/src/mage/cards/o/OrnateKanzashi.java
+++ b/Mage.Sets/src/mage/cards/o/OrnateKanzashi.java
@@ -61,7 +61,7 @@ public class OrnateKanzashi extends CardImpl {
     public OrnateKanzashi(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}");
 
-        // {2}, {T}: Target opponent exiles the top card of his or her library. You may play that card this turn.
+        // {2}, {T}: Target opponent exiles the top card of their library. You may play that card this turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OrnateKanzashiEffect(), new GenericManaCost(2));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetOpponent());
@@ -83,7 +83,7 @@ class OrnateKanzashiEffect extends OneShotEffect {
 
     public OrnateKanzashiEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Target opponent exiles the top card of his or her library. You may play that card this turn";
+        this.staticText = "Target opponent exiles the top card of their library. You may play that card this turn";
     }
 
     public OrnateKanzashiEffect(final OrnateKanzashiEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/o/Ostracize.java b/Mage.Sets/src/mage/cards/o/Ostracize.java
index b73f70d256f..726b4682a83 100644
--- a/Mage.Sets/src/mage/cards/o/Ostracize.java
+++ b/Mage.Sets/src/mage/cards/o/Ostracize.java
@@ -45,7 +45,7 @@ public class Ostracize extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}");
 
 
-        // Target opponent reveals his or her hand. You choose a creature card from it. That player discards that card.
+        // Target opponent reveals their hand. You choose a creature card from it. That player discards that card.
         this.getSpellAbility().addTarget(new TargetOpponent());
         this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(new FilterCreatureCard("a creature card")));
     }
diff --git a/Mage.Sets/src/mage/cards/o/Overabundance.java b/Mage.Sets/src/mage/cards/o/Overabundance.java
index 07b0406c99f..cf0670223b0 100644
--- a/Mage.Sets/src/mage/cards/o/Overabundance.java
+++ b/Mage.Sets/src/mage/cards/o/Overabundance.java
@@ -48,7 +48,7 @@ public class Overabundance extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{R}{G}");
         
 
-        // Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced, and Overabundance deals 1 damage to him or her.
+        // Whenever a player taps a land for mana, that player adds one mana to their mana pool of any type that land produced, and Overabundance deals 1 damage to him or her.
         this.addAbility(new TapForManaAllTriggeredManaAbility(
                 new AddManaOfAnyTypeProducedEffect(),
                 new FilterLandPermanent( "a player taps a land"),
diff --git a/Mage.Sets/src/mage/cards/o/Overgrowth.java b/Mage.Sets/src/mage/cards/o/Overgrowth.java
index 2b6eb337a0e..2182b818d60 100644
--- a/Mage.Sets/src/mage/cards/o/Overgrowth.java
+++ b/Mage.Sets/src/mage/cards/o/Overgrowth.java
@@ -65,7 +65,7 @@ public class Overgrowth extends CardImpl {
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
-        // Whenever enchanted land is tapped for mana, its controller adds {G}{G} to his or her mana pool.        
+        // Whenever enchanted land is tapped for mana, its controller adds {G}{G} to their mana pool.
         this.addAbility(new OvergrowthTriggeredAbility());
     }
 
@@ -83,7 +83,7 @@ class OvergrowthTriggeredAbility extends TriggeredManaAbility {
 
 
     public OvergrowthTriggeredAbility() {
-        super(Zone.BATTLEFIELD, new AddManaToManaPoolTargetControllerEffect(Mana.GreenMana(2), "his or her"));
+        super(Zone.BATTLEFIELD, new AddManaToManaPoolTargetControllerEffect(Mana.GreenMana(2), "their"));
     }
 
     public OvergrowthTriggeredAbility(final OvergrowthTriggeredAbility ability) {
@@ -116,6 +116,6 @@ class OvergrowthTriggeredAbility extends TriggeredManaAbility {
 
     @Override
     public String getRule() {
-        return "Whenever enchanted land is tapped for mana, its controller adds {G}{G} to his or her mana pool";
+        return "Whenever enchanted land is tapped for mana, its controller adds {G}{G} to their mana pool";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/p/Pandemonium.java b/Mage.Sets/src/mage/cards/p/Pandemonium.java
index 38802297f5b..20c2b01668f 100644
--- a/Mage.Sets/src/mage/cards/p/Pandemonium.java
+++ b/Mage.Sets/src/mage/cards/p/Pandemonium.java
@@ -54,7 +54,7 @@ public class Pandemonium extends CardImpl {
     public Pandemonium(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}");
 
-        // Whenever a creature enters the battlefield, that creature's controller may have it deal damage equal to its power to target creature or player of his or her choice.
+        // Whenever a creature enters the battlefield, that creature's controller may have it deal damage equal to its power to target creature or player of their choice.
         Ability ability = new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new PandemoniumEffect(), StaticFilters.FILTER_PERMANENT_CREATURE, false, SetTargetPointer.PERMANENT, "");
         ability.addTarget(new TargetCreatureOrPlayer());
         originalId = ability.getOriginalId();
@@ -87,7 +87,7 @@ class PandemoniumEffect extends OneShotEffect {
 
     public PandemoniumEffect() {
         super(Outcome.Benefit);
-        this.staticText = "that creature's controller may have it deal damage equal to its power to target creature or player of his or her choice";
+        this.staticText = "that creature's controller may have it deal damage equal to its power to target creature or player of their choice";
     }
 
     public PandemoniumEffect(final PandemoniumEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/ParallaxNexus.java b/Mage.Sets/src/mage/cards/p/ParallaxNexus.java
index 8af960867a6..39f4dc1f0c0 100644
--- a/Mage.Sets/src/mage/cards/p/ParallaxNexus.java
+++ b/Mage.Sets/src/mage/cards/p/ParallaxNexus.java
@@ -58,14 +58,14 @@ public class ParallaxNexus extends CardImpl {
         // Fading 5
         this.addAbility(new FadingAbility(5, this));
 
-        // Remove a fade counter from Parallax Nexus: Target opponent exiles a card from his or her hand. Activate this ability only any time you could cast a sorcery.
+        // Remove a fade counter from Parallax Nexus: Target opponent exiles a card from their hand. Activate this ability only any time you could cast a sorcery.
         Effect effect = new ExileFromZoneTargetEffect(Zone.HAND, exileId, "Parallax Nexus", new FilterCard());
-        effect.setText("Target opponent exiles a card from his or her hand");
+        effect.setText("Target opponent exiles a card from their hand");
         Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, effect, new RemoveCountersSourceCost(CounterType.FADE.createInstance()));
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
 
-        // When Parallax Nexus leaves the battlefield, each player returns to his or her hand all cards he or she owns exiled with Parallax Nexus.
+        // When Parallax Nexus leaves the battlefield, each player returns to their hand all cards he or she owns exiled with Parallax Nexus.
         this.addAbility(new LeavesBattlefieldTriggeredAbility(new ReturnFromExileEffect(exileId, Zone.HAND), false));
     }
 
diff --git a/Mage.Sets/src/mage/cards/p/ParanoidDelusions.java b/Mage.Sets/src/mage/cards/p/ParanoidDelusions.java
index ceb76017202..f965517241a 100644
--- a/Mage.Sets/src/mage/cards/p/ParanoidDelusions.java
+++ b/Mage.Sets/src/mage/cards/p/ParanoidDelusions.java
@@ -45,7 +45,7 @@ public class ParanoidDelusions extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{U}{B}");
 
 
-        // Target player puts the top three cards of his or her library into his or her graveyard.
+        // Target player puts the top three cards of their library into their graveyard.
         this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(3));
         this.getSpellAbility().addTarget(new TargetPlayer());
         // Cipher
diff --git a/Mage.Sets/src/mage/cards/p/PathToExile.java b/Mage.Sets/src/mage/cards/p/PathToExile.java
index dea0fdf4310..72969a02170 100644
--- a/Mage.Sets/src/mage/cards/p/PathToExile.java
+++ b/Mage.Sets/src/mage/cards/p/PathToExile.java
@@ -53,8 +53,8 @@ public class PathToExile extends CardImpl {
     public PathToExile(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{W}");
 
-        // Exile target creature. Its controller may search his or her library for a basic land card,
-        // put that card onto the battlefield tapped, then shuffle his or her library.
+        // Exile target creature. Its controller may search their library for a basic land card,
+        // put that card onto the battlefield tapped, then shuffle their library.
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
         this.getSpellAbility().addEffect(new PathToExileEffect());
     }
@@ -73,7 +73,7 @@ class PathToExileEffect extends OneShotEffect {
 
     public PathToExileEffect() {
         super(Outcome.Exile);
-        staticText = "Exile target creature. Its controller may search his or her library for a basic land card, put that card onto the battlefield tapped, then shuffle his or her library";
+        staticText = "Exile target creature. Its controller may search their library for a basic land card, put that card onto the battlefield tapped, then shuffle their library";
     }
 
     public PathToExileEffect(final PathToExileEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/PatriarchsBidding.java b/Mage.Sets/src/mage/cards/p/PatriarchsBidding.java
index 123c26d5635..a0c18a8fb3f 100644
--- a/Mage.Sets/src/mage/cards/p/PatriarchsBidding.java
+++ b/Mage.Sets/src/mage/cards/p/PatriarchsBidding.java
@@ -54,7 +54,7 @@ public class PatriarchsBidding extends CardImpl {
     public PatriarchsBidding(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{B}{B}");
 
-        // Each player chooses a creature type. Each player returns all creature cards of a type chosen this way from his or her graveyard to the battlefield.
+        // Each player chooses a creature type. Each player returns all creature cards of a type chosen this way from their graveyard to the battlefield.
         this.getSpellAbility().addEffect(new PatriarchsBiddingEffect());
     }
 
@@ -72,7 +72,7 @@ class PatriarchsBiddingEffect extends OneShotEffect {
 
     public PatriarchsBiddingEffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "each player chooses a creature type. Each player returns all creature cards of a type chosen this way from his or her graveyard to the battlefield";
+        this.staticText = "each player chooses a creature type. Each player returns all creature cards of a type chosen this way from their graveyard to the battlefield";
     }
 
     public PatriarchsBiddingEffect(final PatriarchsBiddingEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/PatternOfRebirth.java b/Mage.Sets/src/mage/cards/p/PatternOfRebirth.java
index 0627c27f123..4610720f696 100644
--- a/Mage.Sets/src/mage/cards/p/PatternOfRebirth.java
+++ b/Mage.Sets/src/mage/cards/p/PatternOfRebirth.java
@@ -62,9 +62,9 @@ public class PatternOfRebirth extends CardImpl {
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
 
-        // When enchanted creature dies, that creature's controller may search his or her library for a creature card and put that card onto the battlefield. If that player does, he or she shuffles his or her library.
+        // When enchanted creature dies, that creature's controller may search their library for a creature card and put that card onto the battlefield. If that player does, he or she shuffles their library.
         Effect effect = new SearchLibraryPutInPlayTargetPlayerEffect(new TargetCardInLibrary(new FilterCreatureCard()), false, true, Outcome.PutCreatureInPlay);
-        effect.setText("that creature's controller may search his or her library for a creature card and put that card onto the battlefield. If that player does, he or she shuffles his or her library");
+        effect.setText("that creature's controller may search their library for a creature card and put that card onto the battlefield. If that player does, he or she shuffles their library");
         this.addAbility(new DiesAttachedTriggeredAbility(effect, "enchanted creature", true, true, SetTargetPointer.ATTACHED_TO_CONTROLLER));
 
     }
diff --git a/Mage.Sets/src/mage/cards/p/PerishTheThought.java b/Mage.Sets/src/mage/cards/p/PerishTheThought.java
index 6fc5469a4c7..aa21c9abb30 100644
--- a/Mage.Sets/src/mage/cards/p/PerishTheThought.java
+++ b/Mage.Sets/src/mage/cards/p/PerishTheThought.java
@@ -51,7 +51,7 @@ public class PerishTheThought extends CardImpl {
     public PerishTheThought(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{B}");
 
-        // Target opponent reveals his or her hand. You choose a card from it. That player shuffles that card into his or her library.
+        // Target opponent reveals their hand. You choose a card from it. That player shuffles that card into their library.
         this.getSpellAbility().addEffect(new PerishTheThoughtEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
     }
@@ -72,7 +72,7 @@ class PerishTheThoughtEffect extends OneShotEffect {
 
     public PerishTheThoughtEffect() {
         super(Outcome.Neutral);
-        this.staticText = "Target opponent reveals his or her hand. You choose a card from it. That player shuffles that card into his or her library";
+        this.staticText = "Target opponent reveals their hand. You choose a card from it. That player shuffles that card into their library";
     }
 
     public PerishTheThoughtEffect(final PerishTheThoughtEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/PermafrostTrap.java b/Mage.Sets/src/mage/cards/p/PermafrostTrap.java
index f5f22e90d30..a570418039a 100644
--- a/Mage.Sets/src/mage/cards/p/PermafrostTrap.java
+++ b/Mage.Sets/src/mage/cards/p/PermafrostTrap.java
@@ -55,7 +55,7 @@ public class PermafrostTrap extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{U}{U}");
         this.subtype.add(SubType.TRAP);
 
-        // If an opponent had a green creature enter the battlefield under his or her control this turn, you may pay {U} rather than pay Permafrost Trap's mana cost.
+        // If an opponent had a green creature enter the battlefield under their control this turn, you may pay {U} rather than pay Permafrost Trap's mana cost.
         this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{U}"), PermafrostTrapCondition.instance), new PermanentsEnteredBattlefieldWatcher());
 
         // Tap up to two target creatures. Those creatures don't untap during their controller's next untap step.
@@ -98,6 +98,6 @@ enum PermafrostTrapCondition implements Condition {
 
     @Override
     public String toString() {
-        return "If an opponent had a green creature enter the battlefield under his or her control this turn";
+        return "If an opponent had a green creature enter the battlefield under their control this turn";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/p/Perplex.java b/Mage.Sets/src/mage/cards/p/Perplex.java
index b8e7d73d5d1..aa4122b14ab 100644
--- a/Mage.Sets/src/mage/cards/p/Perplex.java
+++ b/Mage.Sets/src/mage/cards/p/Perplex.java
@@ -47,9 +47,9 @@ public class Perplex extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{U}{B}");
 
 
-        // Counter target spell unless its controller discards his or her hand.
+        // Counter target spell unless its controller discards their hand.
         Effect effect = new CounterUnlessPaysEffect(new DiscardHandCost());
-        effect.setText("Counter target spell unless its controller discards his or her hand");
+        effect.setText("Counter target spell unless its controller discards their hand");
         this.getSpellAbility().addEffect(effect);
         this.getSpellAbility().addTarget(new TargetSpell());
         // Transmute {1}{U}{B}
diff --git a/Mage.Sets/src/mage/cards/p/Persecute.java b/Mage.Sets/src/mage/cards/p/Persecute.java
index b13cd5158a1..089541d6d93 100644
--- a/Mage.Sets/src/mage/cards/p/Persecute.java
+++ b/Mage.Sets/src/mage/cards/p/Persecute.java
@@ -52,7 +52,7 @@ public class Persecute extends CardImpl {
     public Persecute(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{B}{B}");
 
-        // Choose a color. Target player reveals his or her hand and discards all cards of that color.
+        // Choose a color. Target player reveals their hand and discards all cards of that color.
         this.getSpellAbility().addEffect(new PersecuteEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
 
@@ -72,7 +72,7 @@ class PersecuteEffect extends OneShotEffect {
 
     public PersecuteEffect() {
         super(Outcome.Discard);
-        this.staticText = "Choose a color. Target player reveals his or her hand and discards all cards of that color";
+        this.staticText = "Choose a color. Target player reveals their hand and discards all cards of that color";
     }
 
     public PersecuteEffect(final PersecuteEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/PersonalIncarnation.java b/Mage.Sets/src/mage/cards/p/PersonalIncarnation.java
index a9cdf4be71a..b24c3cbef3f 100644
--- a/Mage.Sets/src/mage/cards/p/PersonalIncarnation.java
+++ b/Mage.Sets/src/mage/cards/p/PersonalIncarnation.java
@@ -66,7 +66,7 @@ public class PersonalIncarnation extends CardImpl {
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PersonalIncarnationRedirectEffect(), new GenericManaCost(0));
         ability.setMayActivate(TargetController.OWNER);
         this.addAbility(ability);
-        // When Personal Incarnation dies, its owner loses half his or her life, rounded up.
+        // When Personal Incarnation dies, its owner loses half their life, rounded up.
         this.addAbility(new DiesTriggeredAbility(new PersonalIncarnationLoseHalfLifeEffect()));
     }
 
@@ -112,7 +112,7 @@ class PersonalIncarnationLoseHalfLifeEffect extends OneShotEffect {
 
     public PersonalIncarnationLoseHalfLifeEffect() {
         super(Outcome.LoseLife);
-        staticText = "its owner lose half his or her life, rounded up";
+        staticText = "its owner lose half their life, rounded up";
     }
 
     public PersonalIncarnationLoseHalfLifeEffect(final PersonalIncarnationLoseHalfLifeEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/PetraSphinx.java b/Mage.Sets/src/mage/cards/p/PetraSphinx.java
index f2a9737758a..968a6474129 100644
--- a/Mage.Sets/src/mage/cards/p/PetraSphinx.java
+++ b/Mage.Sets/src/mage/cards/p/PetraSphinx.java
@@ -59,7 +59,7 @@ public class PetraSphinx extends CardImpl {
         this.power = new MageInt(3);
         this.toughness = new MageInt(4);
 
-        // {tap}: Target player chooses a card name, then reveals the top card of his or her library. If that card has the chosen name, that player puts it into his or her hand. If it doesn't, the player puts it into his or her graveyard.
+        // {tap}: Target player chooses a card name, then reveals the top card of their library. If that card has the chosen name, that player puts it into their hand. If it doesn't, the player puts it into their graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PetraSphinxEffect(), new TapSourceCost());
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
@@ -80,7 +80,7 @@ class PetraSphinxEffect extends OneShotEffect {
 
     public PetraSphinxEffect() {
         super(Outcome.DrawCard);
-        staticText = "Target player chooses a card name, then reveals the top card of his or her library. If that card has the chosen name, that player puts it into his or her hand. If it doesn't, the player puts it into his or her graveyard";
+        staticText = "Target player chooses a card name, then reveals the top card of their library. If that card has the chosen name, that player puts it into their hand. If it doesn't, the player puts it into their graveyard";
     }
 
     public PetraSphinxEffect(final PetraSphinxEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/PhenaxGodOfDeception.java b/Mage.Sets/src/mage/cards/p/PhenaxGodOfDeception.java
index ad4ca2a1764..22e932cbf96 100644
--- a/Mage.Sets/src/mage/cards/p/PhenaxGodOfDeception.java
+++ b/Mage.Sets/src/mage/cards/p/PhenaxGodOfDeception.java
@@ -66,13 +66,13 @@ public class PhenaxGodOfDeception extends CardImpl {
         Effect effect = new LoseCreatureTypeSourceEffect(new DevotionCount(ColoredManaSymbol.U, ColoredManaSymbol.B), 7);
         effect.setText("As long as your devotion to blue and black is less than seven, Phenax isn't a creature");
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));           
-        // Creatures you control have "{T}: Target player puts the top X cards of his or her library into his or her graveyard, where X is this creature's toughness."        
+        // Creatures you control have "{T}: Target player puts the top X cards of their library into their graveyard, where X is this creature's toughness."
         effect = new PutTopCardOfLibraryIntoGraveTargetEffect(SourcePermanentToughnessValue.getInstance());
-        effect.setText("Target player puts the top X cards of his or her library into his or her graveyard, where X is this creature's toughness");
+        effect.setText("Target player puts the top X cards of their library into their graveyard, where X is this creature's toughness");
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost());
         ability.addTarget(new TargetPlayer());
         effect = new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, StaticFilters.FILTER_PERMANENT_CREATURES,false);
-        effect.setText("Creatures you control have \"{T}: Target player puts the top X cards of his or her library into his or her graveyard, where X is this creature's toughness.\"");
+        effect.setText("Creatures you control have \"{T}: Target player puts the top X cards of their library into their graveyard, where X is this creature's toughness.\"");
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
     }
 
diff --git a/Mage.Sets/src/mage/cards/p/Phytotitan.java b/Mage.Sets/src/mage/cards/p/Phytotitan.java
index b8e680b2df6..fe71c86c6f0 100644
--- a/Mage.Sets/src/mage/cards/p/Phytotitan.java
+++ b/Mage.Sets/src/mage/cards/p/Phytotitan.java
@@ -57,7 +57,7 @@ public class Phytotitan extends CardImpl {
         this.power = new MageInt(7);
         this.toughness = new MageInt(2);
 
-        // When Phytotitan dies, return it to the battlefield tapped under its owner's control at the beginning of his or her next upkeep.
+        // When Phytotitan dies, return it to the battlefield tapped under its owner's control at the beginning of their next upkeep.
         this.addAbility(new DiesTriggeredAbility(new PhytotitanEffect()));
     }
 
@@ -73,7 +73,7 @@ public class Phytotitan extends CardImpl {
 
 class PhytotitanEffect extends OneShotEffect {
 
-    private static final String effectText = "return it to the battlefield tapped under its owner's control at the beginning of his or her next upkeep";
+    private static final String effectText = "return it to the battlefield tapped under its owner's control at the beginning of their next upkeep";
 
     PhytotitanEffect() {
         super(Outcome.Benefit);
diff --git a/Mage.Sets/src/mage/cards/p/PickTheBrain.java b/Mage.Sets/src/mage/cards/p/PickTheBrain.java
index af925fcf81e..4ad0e4d5bd6 100644
--- a/Mage.Sets/src/mage/cards/p/PickTheBrain.java
+++ b/Mage.Sets/src/mage/cards/p/PickTheBrain.java
@@ -53,8 +53,8 @@ public class PickTheBrain extends CardImpl {
     public PickTheBrain(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{B}");
 
-        // Target opponent reveals his or her hand. You choose a nonland card from it and exile that card.
-        // <i>Delirium</i> &mdash; If there are four or more card types among cards in your graveyard, search that player's graveyard, hand, and library for any number of cards with the same name as the exiled card, exile those cards, then that player shuffles his or her library.
+        // Target opponent reveals their hand. You choose a nonland card from it and exile that card.
+        // <i>Delirium</i> &mdash; If there are four or more card types among cards in your graveyard, search that player's graveyard, hand, and library for any number of cards with the same name as the exiled card, exile those cards, then that player shuffles their library.
         this.getSpellAbility().addEffect(new PickTheBrainEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
     }
@@ -111,9 +111,9 @@ class PickTheBrainEffect extends SearchTargetGraveyardHandLibraryForCardNameAndE
 
     @Override
     public String getText(Mode mode) {
-        return "Target opponent reveals his or her hand. You choose a nonland card from it and exile that card.<br><br>"
+        return "Target opponent reveals their hand. You choose a nonland card from it and exile that card.<br><br>"
                 + "<i>Delirium</i> &mdash; If there are four or more card types among cards in your graveyard, "
                 + "search that player's graveyard, hand, and library for any number of cards "
-                + "with the same name as the exiled card, exile those cards, then that player shuffles his or her library";
+                + "with the same name as the exiled card, exile those cards, then that player shuffles their library";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/p/PilferedPlans.java b/Mage.Sets/src/mage/cards/p/PilferedPlans.java
index 9fb3e7af68b..2d6c085a55d 100644
--- a/Mage.Sets/src/mage/cards/p/PilferedPlans.java
+++ b/Mage.Sets/src/mage/cards/p/PilferedPlans.java
@@ -45,7 +45,7 @@ public class PilferedPlans extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{U}{B}");
 
 
-        // Target player puts the top two cards of his or her library into his or her graveyard. Draw two cards.
+        // Target player puts the top two cards of their library into their graveyard. Draw two cards.
         this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(2));
         this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2));
         this.getSpellAbility().addTarget(new TargetPlayer());
diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersFavor.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersFavor.java
index bfdc0a2bf9c..ed4fecfe8dc 100644
--- a/Mage.Sets/src/mage/cards/p/PlaneswalkersFavor.java
+++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersFavor.java
@@ -59,7 +59,7 @@ public class PlaneswalkersFavor extends CardImpl {
     public PlaneswalkersFavor(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{G}");
 
-        // {3}{G}: Target opponent reveals a card at random from his or her hand. Target creature gets +X/+X until end of turn, where X is the revealed card's converted mana cost.
+        // {3}{G}: Target opponent reveals a card at random from their hand. Target creature gets +X/+X until end of turn, where X is the revealed card's converted mana cost.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PlaneswalkersFavorEffect(), new ManaCostsImpl("{3}{G}"));
         Target target = new TargetOpponent();
         ability.addTarget(target);
@@ -82,7 +82,7 @@ class PlaneswalkersFavorEffect extends OneShotEffect {
 
     public PlaneswalkersFavorEffect() {
         super(Outcome.Damage);
-        staticText = "Target opponent reveals a card at random from his or her hand. Target creature gets +X/+X until end of turn, where X is the revealed card's converted mana cost";
+        staticText = "Target opponent reveals a card at random from their hand. Target creature gets +X/+X until end of turn, where X is the revealed card's converted mana cost";
     }
 
     public PlaneswalkersFavorEffect(final PlaneswalkersFavorEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java
index ca92fba3da4..f18e9953fb2 100644
--- a/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java
+++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersFury.java
@@ -53,7 +53,7 @@ public class PlaneswalkersFury extends CardImpl {
     public PlaneswalkersFury(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}");
 
-        // {3}{R}: Target opponent reveals a card at random from his or her hand. Planeswalker's Fury deals damage equal to that card's converted mana cost to that player. Activate this ability only any time you could cast a sorcery.
+        // {3}{R}: Target opponent reveals a card at random from their hand. Planeswalker's Fury deals damage equal to that card's converted mana cost to that player. Activate this ability only any time you could cast a sorcery.
         Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new PlaneswalkersFuryEffect(), new ManaCostsImpl("{3}{R}"));
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
@@ -73,7 +73,7 @@ class PlaneswalkersFuryEffect extends OneShotEffect {
 
     public PlaneswalkersFuryEffect() {
         super(Outcome.Damage);
-        staticText = "Target opponent reveals a card at random from his or her hand. Planeswalker's Fury deals damage equal to that card's converted mana cost to that player";
+        staticText = "Target opponent reveals a card at random from their hand. Planeswalker's Fury deals damage equal to that card's converted mana cost to that player";
     }
 
     public PlaneswalkersFuryEffect(final PlaneswalkersFuryEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java
index 0e4783a325e..7f6725acfb2 100644
--- a/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java
+++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersMirth.java
@@ -53,7 +53,7 @@ public class PlaneswalkersMirth extends CardImpl {
     public PlaneswalkersMirth(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}");
 
-        // {3}{W}: Target opponent reveals a card at random from his or her hand. You gain life equal to that card's converted mana cost.
+        // {3}{W}: Target opponent reveals a card at random from their hand. You gain life equal to that card's converted mana cost.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PlaneswalkersMirthEffect(), new ManaCostsImpl("{3}{W}"));
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
@@ -73,7 +73,7 @@ class PlaneswalkersMirthEffect extends OneShotEffect {
 
     public PlaneswalkersMirthEffect() {
         super(Outcome.Damage);
-        staticText = "Target opponent reveals a card at random from his or her hand. You gain life equal to that card's converted mana cost";
+        staticText = "Target opponent reveals a card at random from their hand. You gain life equal to that card's converted mana cost";
     }
 
     public PlaneswalkersMirthEffect(final PlaneswalkersMirthEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersMischief.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersMischief.java
index a313513140c..f076ba8725f 100644
--- a/Mage.Sets/src/mage/cards/p/PlaneswalkersMischief.java
+++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersMischief.java
@@ -66,7 +66,7 @@ public class PlaneswalkersMischief extends CardImpl {
     public PlaneswalkersMischief(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}");
 
-        // {3}{U}: Target opponent reveals a card at random from his or her hand. If it's an instant or sorcery card, exile it. You may cast it without paying its mana cost for as long as it remains exiled. At the beginning of the next end step, if you haven't cast it, return it to its owner's hand. Activate this ability only any time you could cast a sorcery.
+        // {3}{U}: Target opponent reveals a card at random from their hand. If it's an instant or sorcery card, exile it. You may cast it without paying its mana cost for as long as it remains exiled. At the beginning of the next end step, if you haven't cast it, return it to its owner's hand. Activate this ability only any time you could cast a sorcery.
         Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new PlaneswalkersMischiefEffect(), new ManaCostsImpl("{3}{U}"));
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
@@ -87,7 +87,7 @@ class PlaneswalkersMischiefEffect extends OneShotEffect {
 
     public PlaneswalkersMischiefEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Target opponent reveals a card at random from his or her hand. If it's an instant or sorcery card, exile it. You may cast it without paying its mana cost for as long as it remains exiled. At the beginning of the next end step, if you haven't cast it, return it to its owner's hand.";
+        this.staticText = "Target opponent reveals a card at random from their hand. If it's an instant or sorcery card, exile it. You may cast it without paying its mana cost for as long as it remains exiled. At the beginning of the next end step, if you haven't cast it, return it to its owner's hand.";
     }
 
     public PlaneswalkersMischiefEffect(final PlaneswalkersMischiefEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/PlaneswalkersScorn.java b/Mage.Sets/src/mage/cards/p/PlaneswalkersScorn.java
index 0d20028aee3..1d49986883f 100644
--- a/Mage.Sets/src/mage/cards/p/PlaneswalkersScorn.java
+++ b/Mage.Sets/src/mage/cards/p/PlaneswalkersScorn.java
@@ -59,7 +59,7 @@ public class PlaneswalkersScorn extends CardImpl {
     public PlaneswalkersScorn(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{B}");
 
-        // {3}{B}: Target opponent reveals a card at random from his or her hand. Target creature gets -X/-X until end of turn, where X is the revealed card's converted mana cost. Activate this ability only any time you could cast a sorcery.
+        // {3}{B}: Target opponent reveals a card at random from their hand. Target creature gets -X/-X until end of turn, where X is the revealed card's converted mana cost. Activate this ability only any time you could cast a sorcery.
         Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new PlaneswalkersScornEffect(), new ManaCostsImpl("{3}{B}"));
         Target target = new TargetOpponent();
         ability.addTarget(target);
@@ -82,7 +82,7 @@ class PlaneswalkersScornEffect extends OneShotEffect {
 
     public PlaneswalkersScornEffect() {
         super(Outcome.Damage);
-        staticText = "Target opponent reveals a card at random from his or her hand. Target creature gets -X/-X until end of turn, where X is the revealed card's converted mana cost";
+        staticText = "Target opponent reveals a card at random from their hand. Target creature gets -X/-X until end of turn, where X is the revealed card's converted mana cost";
     }
 
     public PlaneswalkersScornEffect(final PlaneswalkersScornEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/PlungeIntoDarkness.java b/Mage.Sets/src/mage/cards/p/PlungeIntoDarkness.java
index 51fe169745d..4a06e7898d8 100644
--- a/Mage.Sets/src/mage/cards/p/PlungeIntoDarkness.java
+++ b/Mage.Sets/src/mage/cards/p/PlungeIntoDarkness.java
@@ -165,7 +165,7 @@ class PlungeIntoDarknessSearchEffect extends OneShotEffect {
                 if (card != null) {
                     cards.remove(card);
                     card.moveToZone(Zone.HAND, source.getSourceId(), game, false);
-                    game.informPlayers("Plunge into Darkness: " + player.getLogName() + " puts a card into his or her hand");
+                    game.informPlayers("Plunge into Darkness: " + player.getLogName() + " puts a card into their hand");
                 }
             }
             for (UUID cardId : cards) {
diff --git a/Mage.Sets/src/mage/cards/p/Polymorph.java b/Mage.Sets/src/mage/cards/p/Polymorph.java
index ae75ecf5241..64839348b74 100644
--- a/Mage.Sets/src/mage/cards/p/Polymorph.java
+++ b/Mage.Sets/src/mage/cards/p/Polymorph.java
@@ -58,8 +58,8 @@ public class Polymorph extends CardImpl {
         // Destroy target creature. It can't be regenerated.
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
         this.getSpellAbility().addEffect(new DestroyTargetEffect(true));
-        // Its controller reveals cards from the top of his or her library until he or she reveals a creature card.
-        // The player puts that card onto the battlefield, then shuffles all other cards revealed this way into his or her library.
+        // Its controller reveals cards from the top of their library until he or she reveals a creature card.
+        // The player puts that card onto the battlefield, then shuffles all other cards revealed this way into their library.
         this.getSpellAbility().addEffect(new PolymorphEffect());
     }
 
@@ -77,7 +77,7 @@ class PolymorphEffect extends OneShotEffect {
 
     public PolymorphEffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "Its controller reveals cards from the top of his or her library until he or she reveals a creature card. The player puts that card onto the battlefield, then shuffles all other cards revealed this way into his or her library";
+        this.staticText = "Its controller reveals cards from the top of their library until he or she reveals a creature card. The player puts that card onto the battlefield, then shuffles all other cards revealed this way into their library";
     }
 
     public PolymorphEffect(final PolymorphEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/Portent.java b/Mage.Sets/src/mage/cards/p/Portent.java
index eb60e7326dc..b935c52e672 100644
--- a/Mage.Sets/src/mage/cards/p/Portent.java
+++ b/Mage.Sets/src/mage/cards/p/Portent.java
@@ -56,7 +56,7 @@ public class Portent extends CardImpl {
     public Portent(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{U}");
 
-        // Look at the top three cards of target player's library, then put them back in any order. You may have that player shuffle his or her library.
+        // Look at the top three cards of target player's library, then put them back in any order. You may have that player shuffle their library.
         this.getSpellAbility().addEffect(new PortentEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
         // Draw a card at the beginning of the next turn's upkeep.
@@ -77,7 +77,7 @@ class  PortentEffect extends OneShotEffect {
 
     public  PortentEffect() {
         super(Outcome.DrawCard);
-        this.staticText = "look at the top three cards of target player's library, then put them back in any order. You may have that player shuffle his or her library.";
+        this.staticText = "look at the top three cards of target player's library, then put them back in any order. You may have that player shuffle their library.";
     }
 
     public  PortentEffect(final  PortentEffect effect) {
@@ -121,7 +121,7 @@ class  PortentEffect extends OneShotEffect {
             Card card = cards.get(cards.iterator().next(), game);
             card.moveToZone(Zone.LIBRARY, source.getSourceId(), game, true);
         }
-        if (you.chooseUse(Outcome.Neutral, "You may have that player shuffle his or her library", source, game)){
+        if (you.chooseUse(Outcome.Neutral, "You may have that player shuffle their library", source, game)){
             player.shuffleLibrary(source, game);
         }
         return true;
diff --git a/Mage.Sets/src/mage/cards/p/PossibilityStorm.java b/Mage.Sets/src/mage/cards/p/PossibilityStorm.java
index 5595ed16ed3..6ccd585beb2 100644
--- a/Mage.Sets/src/mage/cards/p/PossibilityStorm.java
+++ b/Mage.Sets/src/mage/cards/p/PossibilityStorm.java
@@ -58,10 +58,10 @@ public class PossibilityStorm extends CardImpl {
     public PossibilityStorm(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{3}{R}{R}");
 
-        // Whenever a player casts a spell from his or her hand, that player exiles it, then exiles cards from
-        // the top of his or her library until he or she exiles a card that shares a card type with it. That
+        // Whenever a player casts a spell from their hand, that player exiles it, then exiles cards from
+        // the top of their library until he or she exiles a card that shares a card type with it. That
         // player may cast that card without paying its mana cost. Then he or she puts all cards exiled with
-        // Possibility Storm on the bottom of his or her library in a random order.
+        // Possibility Storm on the bottom of their library in a random order.
         this.addAbility(new PossibilityStormTriggeredAbility());
     }
 
@@ -111,7 +111,7 @@ class PossibilityStormTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "Whenever a player casts a spell from his or her hand, " + super.getRule();
+        return "Whenever a player casts a spell from their hand, " + super.getRule();
     }
 }
 
@@ -119,7 +119,7 @@ class PossibilityStormEffect extends OneShotEffect {
 
     public PossibilityStormEffect() {
         super(Outcome.Neutral);
-        staticText = "that player exiles it, then exiles cards from the top of his or her library until he or she exiles a card that shares a card type with it. That player may cast that card without paying its mana cost. Then he or she puts all cards exiled with {this} on the bottom of his or her library in a random order";
+        staticText = "that player exiles it, then exiles cards from the top of their library until he or she exiles a card that shares a card type with it. That player may cast that card without paying its mana cost. Then he or she puts all cards exiled with {this} on the bottom of their library in a random order";
     }
 
     public PossibilityStormEffect(final PossibilityStormEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/PowerSink.java b/Mage.Sets/src/mage/cards/p/PowerSink.java
index 6876100c93d..4ed69dbe9a1 100644
--- a/Mage.Sets/src/mage/cards/p/PowerSink.java
+++ b/Mage.Sets/src/mage/cards/p/PowerSink.java
@@ -56,7 +56,7 @@ public class PowerSink extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{X}{U}");
 
 
-        // Counter target spell unless its controller pays {X}. If he or she doesn't, that player taps all lands with mana abilities he or she controls and empties his or her mana pool.
+        // Counter target spell unless its controller pays {X}. If he or she doesn't, that player taps all lands with mana abilities he or she controls and empties their mana pool.
         this.getSpellAbility().addEffect(new PowerSinkCounterUnlessPaysEffect());
         this.getSpellAbility().addTarget(new TargetSpell());
     }
@@ -75,7 +75,7 @@ class PowerSinkCounterUnlessPaysEffect extends OneShotEffect {
 
     public PowerSinkCounterUnlessPaysEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Counter target spell unless its controller pays {X}. If he or she doesn't, that player taps all lands with mana abilities he or she controls and empties his or her mana pool.";
+        this.staticText = "Counter target spell unless its controller pays {X}. If he or she doesn't, that player taps all lands with mana abilities he or she controls and empties their mana pool.";
     }
 
     public PowerSinkCounterUnlessPaysEffect(final PowerSinkCounterUnlessPaysEffect effect) {
@@ -123,7 +123,7 @@ class PowerSinkCounterUnlessPaysEffect extends OneShotEffect {
                         }
                     }
 
-                    // ...and empties his or her mana pool
+                    // ...and empties their mana pool
                     player.getManaPool().emptyPool(game);
                 }
                 return true;
diff --git a/Mage.Sets/src/mage/cards/p/Pox.java b/Mage.Sets/src/mage/cards/p/Pox.java
index 0c9e424bb12..8f713f04a25 100644
--- a/Mage.Sets/src/mage/cards/p/Pox.java
+++ b/Mage.Sets/src/mage/cards/p/Pox.java
@@ -53,7 +53,7 @@ public class Pox extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}{B}{B}");
 
 
-        // 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.
+        // Each player loses a third of their life, then discards a third of the cards in their 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.
         this.getSpellAbility().addEffect(new PoxEffect());
     }
 
@@ -71,7 +71,7 @@ class PoxEffect extends OneShotEffect {
     
     PoxEffect() {
         super(Outcome.Detriment);
-        this.staticText = "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.";
+        this.staticText = "Each player loses a third of their life, then discards a third of the cards in their 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.";
     }
     
     PoxEffect(final PoxEffect effect) {
@@ -87,7 +87,7 @@ class PoxEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         if (controller != null) {
-            // Each player loses a third of his or her life,
+            // Each player loses a third of their life,
             for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) {
                 Player player = game.getPlayer(playerId);
                 if (player != null) {
@@ -95,7 +95,7 @@ class PoxEffect extends OneShotEffect {
                     player.loseLife(lifeToLose, game, false);
                 }
             }
-            // then discards a third of the cards in his or her hand,
+            // then discards a third of the cards in their hand,
             for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) {
                 Player player = game.getPlayer(playerId);
                 if (player != null) {
diff --git a/Mage.Sets/src/mage/cards/p/PraetorsGrasp.java b/Mage.Sets/src/mage/cards/p/PraetorsGrasp.java
index 75dde761800..969bbb868dc 100644
--- a/Mage.Sets/src/mage/cards/p/PraetorsGrasp.java
+++ b/Mage.Sets/src/mage/cards/p/PraetorsGrasp.java
@@ -56,7 +56,7 @@ public class PraetorsGrasp extends CardImpl {
     public PraetorsGrasp(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{B}{B}");
 
-        // Search target opponent's library for a card and exile it face down. Then that player shuffles his or her library. You may look at and play that card for as long as it remains exiled.
+        // Search target opponent's library for a card and exile it face down. Then that player shuffles their library. You may look at and play that card for as long as it remains exiled.
         this.getSpellAbility().addEffect(new PraetorsGraspEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
     }
@@ -75,7 +75,7 @@ class PraetorsGraspEffect extends OneShotEffect {
 
     public PraetorsGraspEffect() {
         super(Outcome.PlayForFree);
-        staticText = "Search target opponent's library for a card and exile it face down. Then that player shuffles his or her library. You may look at and play that card for as long as it remains exiled";
+        staticText = "Search target opponent's library for a card and exile it face down. Then that player shuffles their library. You may look at and play that card for as long as it remains exiled";
     }
 
     public PraetorsGraspEffect(final PraetorsGraspEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/Predict.java b/Mage.Sets/src/mage/cards/p/Predict.java
index 20d76ac8662..61d9e11c35b 100644
--- a/Mage.Sets/src/mage/cards/p/Predict.java
+++ b/Mage.Sets/src/mage/cards/p/Predict.java
@@ -51,7 +51,7 @@ public class Predict extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{U}");
 
 
-        // Name a card, then target player puts the top card of his or her library into his or her graveyard. If that card is the named card, you draw two cards. Otherwise, you draw a card.
+        // Name a card, then target player puts the top card of their library into their graveyard. If that card is the named card, you draw two cards. Otherwise, you draw a card.
         this.getSpellAbility().addEffect(new NameACardEffect(NameACardEffect.TypeOfName.ALL));
         this.getSpellAbility().addEffect(new PredictEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
@@ -71,7 +71,7 @@ class PredictEffect extends OneShotEffect {
 
     public PredictEffect() {
         super(Outcome.DrawCard);
-        this.staticText = ", then target player puts the top card of his or her library into his or her graveyard. "
+        this.staticText = ", then target player puts the top card of their library into their graveyard. "
                 + "If that card is the named card, you draw two cards. Otherwise, you draw a card.";
     }
     
diff --git a/Mage.Sets/src/mage/cards/p/PrimalCommand.java b/Mage.Sets/src/mage/cards/p/PrimalCommand.java
index 7049b20ce0a..5bd1add2c54 100644
--- a/Mage.Sets/src/mage/cards/p/PrimalCommand.java
+++ b/Mage.Sets/src/mage/cards/p/PrimalCommand.java
@@ -78,7 +78,7 @@ public class PrimalCommand extends CardImpl {
         Target target = new TargetPermanent(filterNonCreature);
         mode.getTargets().add(target);
         this.getSpellAbility().getModes().addMode(mode);
-        // or target player shuffles his or her graveyard into his or her library;
+        // or target player shuffles their graveyard into their library;
         mode = new Mode();
         mode.getEffects().add(new PrimalCommandShuffleGraveyardEffect());
         mode.getTargets().add(new TargetPlayer());
@@ -104,7 +104,7 @@ class PrimalCommandShuffleGraveyardEffect extends OneShotEffect {
 
     public PrimalCommandShuffleGraveyardEffect() {
         super(Outcome.Neutral);
-        this.staticText = "target player shuffles his or her graveyard into his or her library";
+        this.staticText = "target player shuffles their graveyard into their library";
     }
 
     public PrimalCommandShuffleGraveyardEffect(final PrimalCommandShuffleGraveyardEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/ProbeDroid.java b/Mage.Sets/src/mage/cards/p/ProbeDroid.java
index f59886959ce..0ad7fed49d1 100644
--- a/Mage.Sets/src/mage/cards/p/ProbeDroid.java
+++ b/Mage.Sets/src/mage/cards/p/ProbeDroid.java
@@ -52,7 +52,7 @@ public class ProbeDroid extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        // When Probe Droid enters the battlefield, target player reveals his or her hand.
+        // When Probe Droid enters the battlefield, target player reveals their hand.
         Ability ability = new EntersBattlefieldTriggeredAbility(new LookAtTargetPlayerHandEffect());
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/p/ProteusStaff.java b/Mage.Sets/src/mage/cards/p/ProteusStaff.java
index 73b91cb6a86..eedabc15e84 100644
--- a/Mage.Sets/src/mage/cards/p/ProteusStaff.java
+++ b/Mage.Sets/src/mage/cards/p/ProteusStaff.java
@@ -57,7 +57,7 @@ public class ProteusStaff extends CardImpl {
     public ProteusStaff(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
 
-        // {2}{U}, {T}: Put target creature on the bottom of its owner's library. That creature's controller reveals cards from the top of his or her library until he or she reveals a creature card. The player puts that card onto the battlefield and the rest on the bottom of his or her library in any order. Activate this ability only any time you could cast a sorcery.
+        // {2}{U}, {T}: Put target creature on the bottom of its owner's library. That creature's controller reveals cards from the top of their library until he or she reveals a creature card. The player puts that card onto the battlefield and the rest on the bottom of their library in any order. Activate this ability only any time you could cast a sorcery.
         Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new ProteusStaffEffect(), new ManaCostsImpl<>("{2}{U}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetCreaturePermanent());
@@ -78,7 +78,7 @@ class ProteusStaffEffect extends OneShotEffect {
 
     ProteusStaffEffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "Put target creature on the bottom of its owner's library. That creature's controller reveals cards from the top of his or her library until he or she reveals a creature card. The player puts that card onto the battlefield and the rest on the bottom of his or her library in any order.";
+        this.staticText = "Put target creature on the bottom of its owner's library. That creature's controller reveals cards from the top of their library until he or she reveals a creature card. The player puts that card onto the battlefield and the rest on the bottom of their library in any order.";
     }
 
     ProteusStaffEffect(final ProteusStaffEffect effect) {
@@ -100,7 +100,7 @@ class ProteusStaffEffect extends OneShotEffect {
                 // Put target creature on the bottom of its owner's library.
                 owner.moveCardToLibraryWithInfo(permanent, source.getSourceId(), game, Zone.BATTLEFIELD, false, true);
 
-                // That creature's controller reveals cards from the top of his or her library until he or she reveals a creature card.
+                // That creature's controller reveals cards from the top of their library until he or she reveals a creature card.
                 Cards cards = new CardsImpl();
                 while (controller.getLibrary().hasCards()) {
                     Card card = controller.getLibrary().removeFromTop(game);
@@ -116,7 +116,7 @@ class ProteusStaffEffect extends OneShotEffect {
                 }
                 controller.revealCards("Proteus Staff", cards, game);
 
-                // and the rest on the bottom of his or her library in any order.
+                // and the rest on the bottom of their library in any order.
                 while (!cards.isEmpty() && controller.canRespond()) {
                     if (cards.size() == 1) {
                         Card card = cards.get(cards.iterator().next(), game);
diff --git a/Mage.Sets/src/mage/cards/p/PryingQuestions.java b/Mage.Sets/src/mage/cards/p/PryingQuestions.java
index dd4d76eaa16..7b698c1bea9 100644
--- a/Mage.Sets/src/mage/cards/p/PryingQuestions.java
+++ b/Mage.Sets/src/mage/cards/p/PryingQuestions.java
@@ -51,7 +51,7 @@ public class PryingQuestions extends CardImpl {
     public PryingQuestions(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}");
 
-        // Target opponent loses 3 life and puts a card from his or her hand on top of his or her library.
+        // Target opponent loses 3 life and puts a card from their hand on top of their library.
         this.getSpellAbility().addTarget(new TargetOpponent());
         this.getSpellAbility().addEffect(new LoseLifeTargetEffect(3));
         this.getSpellAbility().addEffect(new PryingQuestionsEffect());
@@ -72,7 +72,7 @@ class PryingQuestionsEffect extends OneShotEffect {
 
     public PryingQuestionsEffect() {
         super(Outcome.Detriment);
-        this.staticText = "and puts a card from his or her hand on top of his or her library";
+        this.staticText = "and puts a card from their hand on top of their library";
     }
 
     public PryingQuestionsEffect(final PryingQuestionsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/PsychicDrain.java b/Mage.Sets/src/mage/cards/p/PsychicDrain.java
index 96b74551041..8f5d65d2dcc 100644
--- a/Mage.Sets/src/mage/cards/p/PsychicDrain.java
+++ b/Mage.Sets/src/mage/cards/p/PsychicDrain.java
@@ -46,7 +46,7 @@ public class PsychicDrain extends CardImpl {
     public PsychicDrain(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{U}{B}");
 
-        // Target player puts the top X cards of his or her library into his or her graveyard and you gain X life.
+        // Target player puts the top X cards of their library into their graveyard and you gain X life.
         this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(new ManacostVariableValue()));
         this.getSpellAbility().addTarget(new TargetPlayer());
         Effect effect = new GainLifeEffect(new ManacostVariableValue());
diff --git a/Mage.Sets/src/mage/cards/p/PsychicIntrusion.java b/Mage.Sets/src/mage/cards/p/PsychicIntrusion.java
index 90a9ecd98c0..b687a95930d 100644
--- a/Mage.Sets/src/mage/cards/p/PsychicIntrusion.java
+++ b/Mage.Sets/src/mage/cards/p/PsychicIntrusion.java
@@ -61,7 +61,7 @@ public class PsychicIntrusion extends CardImpl {
     public PsychicIntrusion(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{U}{B}");
 
-        // Target opponent reveals his or her hand. You choose a nonland card from that player's graveyard or hand and exile it.
+        // Target opponent reveals their hand. You choose a nonland card from that player's graveyard or hand and exile it.
         // You may cast that card for as long as it remains exiled, and you may spend mana as though it were mana of any color
         // to cast that spell.
         this.getSpellAbility().addTarget(new TargetOpponent());
@@ -85,7 +85,7 @@ class PsychicIntrusionExileEffect extends OneShotEffect {
 
     public PsychicIntrusionExileEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Target opponent reveals his or her hand. You choose a nonland card from that player's graveyard or hand and exile it. You may cast that card for as long as it remains exiled, and you may spend mana as though it were mana of any color to cast that spell";
+        this.staticText = "Target opponent reveals their hand. You choose a nonland card from that player's graveyard or hand and exile it. You may cast that card for as long as it remains exiled, and you may spend mana as though it were mana of any color to cast that spell";
     }
 
     public PsychicIntrusionExileEffect(final PsychicIntrusionExileEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/PsychicSpear.java b/Mage.Sets/src/mage/cards/p/PsychicSpear.java
index a5b726d3dc7..4f29179ca5f 100644
--- a/Mage.Sets/src/mage/cards/p/PsychicSpear.java
+++ b/Mage.Sets/src/mage/cards/p/PsychicSpear.java
@@ -55,7 +55,7 @@ public class PsychicSpear extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}");
 
 
-        // Target player reveals his or her hand. You choose a Spirit or Arcane card from it. That player discards that card.
+        // Target player reveals their hand. You choose a Spirit or Arcane card from it. That player discards that card.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(filter, TargetController.ANY));
     }
diff --git a/Mage.Sets/src/mage/cards/p/PsychicSpiral.java b/Mage.Sets/src/mage/cards/p/PsychicSpiral.java
index 635ba60e9e8..802c1372c68 100644
--- a/Mage.Sets/src/mage/cards/p/PsychicSpiral.java
+++ b/Mage.Sets/src/mage/cards/p/PsychicSpiral.java
@@ -50,7 +50,7 @@ public class PsychicSpiral extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{4}{U}");
 
 
-        // Shuffle all cards from your graveyard into your library. Target player puts that many cards from the top of his or her library into his or her graveyard.
+        // Shuffle all cards from your graveyard into your library. Target player puts that many cards from the top of their library into their graveyard.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new PsychicSpiralEffect());
     }
@@ -69,7 +69,7 @@ class PsychicSpiralEffect extends OneShotEffect {
 
     public PsychicSpiralEffect() {
         super(Outcome.GainLife);
-        staticText = "Shuffle all cards from your graveyard into your library. Target player puts that many cards from the top of his or her library into his or her graveyard";
+        staticText = "Shuffle all cards from your graveyard into your library. Target player puts that many cards from the top of their library into their graveyard";
     }
 
     public PsychicSpiralEffect(final PsychicSpiralEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/PsychicStrike.java b/Mage.Sets/src/mage/cards/p/PsychicStrike.java
index 97c0f2bc13b..a165c97f485 100644
--- a/Mage.Sets/src/mage/cards/p/PsychicStrike.java
+++ b/Mage.Sets/src/mage/cards/p/PsychicStrike.java
@@ -51,7 +51,7 @@ public class PsychicStrike extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{U}{B}");
 
 
-        // Counter target spell. Its controller puts the top two cards of his or her library into his or her graveyard.
+        // Counter target spell. Its controller puts the top two cards of their library into their graveyard.
         this.getSpellAbility().addTarget(new TargetSpell(StaticFilters.FILTER_SPELL));
         this.getSpellAbility().addEffect(new PsychicStrikeEffect());
     }
@@ -70,7 +70,7 @@ class PsychicStrikeEffect extends OneShotEffect {
 
     public PsychicStrikeEffect() {
         super(Outcome.Detriment);
-        staticText = "Counter target spell. Its controller puts the top two cards of his or her library into his or her graveyard";
+        staticText = "Counter target spell. Its controller puts the top two cards of their library into their graveyard";
     }
 
     public PsychicStrikeEffect(final PsychicStrikeEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/PsychicSurgery.java b/Mage.Sets/src/mage/cards/p/PsychicSurgery.java
index e0be25e7116..a8045272494 100644
--- a/Mage.Sets/src/mage/cards/p/PsychicSurgery.java
+++ b/Mage.Sets/src/mage/cards/p/PsychicSurgery.java
@@ -100,7 +100,7 @@ class PsychicSurgeryTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "Whenever an opponent shuffles his or her library, you may look at the top two cards of that library. You may exile one of those cards. Then put the rest on top of that library in any order.";
+        return "Whenever an opponent shuffles their library, you may look at the top two cards of that library. You may exile one of those cards. Then put the rest on top of that library in any order.";
     }
 }
 
diff --git a/Mage.Sets/src/mage/cards/p/PsychicTheft.java b/Mage.Sets/src/mage/cards/p/PsychicTheft.java
index 0de93dd34e5..b24e438f448 100644
--- a/Mage.Sets/src/mage/cards/p/PsychicTheft.java
+++ b/Mage.Sets/src/mage/cards/p/PsychicTheft.java
@@ -65,7 +65,7 @@ public class PsychicTheft extends CardImpl {
     public PsychicTheft(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{U}");
 
-        // Target player reveals his or her hand. You choose an instant or sorcery card from it and exile that card. You may cast that card for as long as it remains exiled. At the beginning of the next end step, if you haven't cast the card, return it to its owner's hand.
+        // Target player reveals their hand. You choose an instant or sorcery card from it and exile that card. You may cast that card for as long as it remains exiled. At the beginning of the next end step, if you haven't cast the card, return it to its owner's hand.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new PsychicTheftEffect());
 
@@ -87,7 +87,7 @@ class PsychicTheftEffect extends OneShotEffect {
 
     public PsychicTheftEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Target player reveals his or her hand. You choose an instant or sorcery card from it and exile that card. You may cast that card for as long as it remains exiled. At the beginning of the next end step, if you haven't cast the card, return it to its owner's hand.";
+        this.staticText = "Target player reveals their hand. You choose an instant or sorcery card from it and exile that card. You may cast that card for as long as it remains exiled. At the beginning of the next end step, if you haven't cast the card, return it to its owner's hand.";
     }
 
     public PsychicTheftEffect(final PsychicTheftEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/PsychogenicProbe.java b/Mage.Sets/src/mage/cards/p/PsychogenicProbe.java
index 7a34c269dbe..f61f48836c6 100644
--- a/Mage.Sets/src/mage/cards/p/PsychogenicProbe.java
+++ b/Mage.Sets/src/mage/cards/p/PsychogenicProbe.java
@@ -49,7 +49,7 @@ public class PsychogenicProbe extends CardImpl {
     public PsychogenicProbe(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{2}");
 
-        // Whenever a spell or ability causes a player to shuffle his or her library, Psychogenic Probe deals 2 damage to him or her.
+        // Whenever a spell or ability causes a player to shuffle their library, Psychogenic Probe deals 2 damage to him or her.
         this.addAbility(new PsychogenicProbeTriggeredAbility());
     }
 
@@ -93,6 +93,6 @@ class PsychogenicProbeTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "Whenever a spell or ability causes a player to shuffle his or her library, {this}    deals 2 damage to him or her.";
+        return "Whenever a spell or ability causes a player to shuffle their library, {this}    deals 2 damage to him or her.";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/p/PsychoticEpisode.java b/Mage.Sets/src/mage/cards/p/PsychoticEpisode.java
index 2f33bb0b4e4..8f8c92fbdc8 100644
--- a/Mage.Sets/src/mage/cards/p/PsychoticEpisode.java
+++ b/Mage.Sets/src/mage/cards/p/PsychoticEpisode.java
@@ -56,7 +56,7 @@ public class PsychoticEpisode extends CardImpl {
     public PsychoticEpisode(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{B}{B}");
 
-        // Target player reveals his or her hand and the top card of his or her library. You choose a card revealed this way. That player puts the chosen card on the bottom of his or her library.
+        // Target player reveals their hand and the top card of their library. You choose a card revealed this way. That player puts the chosen card on the bottom of their library.
         this.getSpellAbility().addEffect(new PsychoticEpisodeEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
         // Madness {1}{B}
@@ -78,7 +78,7 @@ class PsychoticEpisodeEffect extends OneShotEffect {
 
     PsychoticEpisodeEffect() {
         super(Outcome.Discard);
-        staticText = "Target player reveals his or her hand and the top card of his or her library. You choose a card revealed this way. That player puts the chosen card on the bottom of his or her library.";
+        staticText = "Target player reveals their hand and the top card of their library. You choose a card revealed this way. That player puts the chosen card on the bottom of their library.";
     }
 
     PsychoticEpisodeEffect(final PsychoticEpisodeEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/PulseOfTheDross.java b/Mage.Sets/src/mage/cards/p/PulseOfTheDross.java
index f0be2b5f5be..9132edc7076 100644
--- a/Mage.Sets/src/mage/cards/p/PulseOfTheDross.java
+++ b/Mage.Sets/src/mage/cards/p/PulseOfTheDross.java
@@ -51,7 +51,7 @@ public class PulseOfTheDross extends CardImpl {
     public PulseOfTheDross(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{B}{B}");
 
-        // Target player reveals three cards from his or her hand and you choose one of them. That player discards that card.
+        // Target player reveals three cards from their hand and you choose one of them. That player discards that card.
         this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(TargetController.ANY, 3));
         this.getSpellAbility().addEffect(new PulseOfTheDrossReturnToHandEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
diff --git a/Mage.Sets/src/mage/cards/p/PulsemageAdvocate.java b/Mage.Sets/src/mage/cards/p/PulsemageAdvocate.java
index 63f97e01710..f600b33f391 100644
--- a/Mage.Sets/src/mage/cards/p/PulsemageAdvocate.java
+++ b/Mage.Sets/src/mage/cards/p/PulsemageAdvocate.java
@@ -70,7 +70,7 @@ public class PulsemageAdvocate extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(3);
 
-        // {tap}: Return three target cards from an opponent's graveyard to his or her hand. Return target creature card from your graveyard to the battlefield.
+        // {tap}: Return three target cards from an opponent's graveyard to their hand. Return target creature card from your graveyard to the battlefield.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PulsemageAdvocateEffect(), new TapSourceCost());
         ability.addTarget(new TargetCardInASingleGraveyard(3, 3, filter));
         ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
@@ -91,7 +91,7 @@ class PulsemageAdvocateEffect extends OneShotEffect {
 
     PulsemageAdvocateEffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "Return three target cards from an opponent's graveyard to his or her hand. Return target creature card from your graveyard to the battlefield";
+        this.staticText = "Return three target cards from an opponent's graveyard to their hand. Return target creature card from your graveyard to the battlefield";
     }
 
     PulsemageAdvocateEffect(final PulsemageAdvocateEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/PyrrhicRevival.java b/Mage.Sets/src/mage/cards/p/PyrrhicRevival.java
index f4b7df182f6..3110ce8a5c8 100644
--- a/Mage.Sets/src/mage/cards/p/PyrrhicRevival.java
+++ b/Mage.Sets/src/mage/cards/p/PyrrhicRevival.java
@@ -53,7 +53,7 @@ public class PyrrhicRevival extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{W/B}{W/B}{W/B}");
 
 
-        // Each player returns each creature card from his or her graveyard to the battlefield with an additional -1/-1 counter on it.
+        // Each player returns each creature card from their graveyard to the battlefield with an additional -1/-1 counter on it.
         this.getSpellAbility().addEffect(new PyrrhicRevivalEffect());
 
     }
@@ -72,7 +72,7 @@ class PyrrhicRevivalEffect extends OneShotEffect {
 
     public PyrrhicRevivalEffect() {
         super(Outcome.PutCreatureInPlay);
-        staticText = "Each player returns each creature card from his or her graveyard to the battlefield with an additional -1/-1 counter on it";
+        staticText = "Each player returns each creature card from their graveyard to the battlefield with an additional -1/-1 counter on it";
     }
 
     public PyrrhicRevivalEffect(final PyrrhicRevivalEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/p/PyxisOfPandemonium.java b/Mage.Sets/src/mage/cards/p/PyxisOfPandemonium.java
index 89533610b18..eff8e051861 100644
--- a/Mage.Sets/src/mage/cards/p/PyxisOfPandemonium.java
+++ b/Mage.Sets/src/mage/cards/p/PyxisOfPandemonium.java
@@ -55,7 +55,7 @@ public class PyxisOfPandemonium extends CardImpl {
     public PyxisOfPandemonium(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}");
 
-        // {T}: Each player exiles the top card of his or her library face down.
+        // {T}: Each player exiles the top card of their library face down.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PyxisOfPandemoniumExileEffect(), new TapSourceCost()));
         // {7}, {T}, Sacrifice Pyxis of Pandemonium: Each player turns face up all cards he or she owns exiled with Pyxis of Pandemonium, then puts all permanent cards among them onto the battlefield.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PyxisOfPandemoniumPutOntoBattlefieldEffect(), new GenericManaCost(7));
@@ -79,7 +79,7 @@ class PyxisOfPandemoniumExileEffect extends OneShotEffect {
 
     public PyxisOfPandemoniumExileEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Each player exiles the top card of his or her library face down";
+        this.staticText = "Each player exiles the top card of their library face down";
     }
 
     public PyxisOfPandemoniumExileEffect(final PyxisOfPandemoniumExileEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/q/Quash.java b/Mage.Sets/src/mage/cards/q/Quash.java
index 737c3e9fd4c..2fdc6b0aa35 100644
--- a/Mage.Sets/src/mage/cards/q/Quash.java
+++ b/Mage.Sets/src/mage/cards/q/Quash.java
@@ -46,7 +46,7 @@ public class Quash extends CardImpl {
 
 
         // Counter target instant or sorcery spell. 
-        // Search its controller's graveyard, hand, and library for all cards with the same name as that spell and exile them. Then that player shuffles his or her library.
+        // Search its controller's graveyard, hand, and library for all cards with the same name as that spell and exile them. Then that player shuffles their library.
         this.getSpellAbility().addTarget(new TargetSpell(StaticFilters.FILTER_INSTANT_OR_SORCERY_SPELL));
         this.getSpellAbility().addEffect(new CounterTargetAndSearchGraveyardHandLibraryEffect());
     }
diff --git a/Mage.Sets/src/mage/cards/q/QuestForAncientSecrets.java b/Mage.Sets/src/mage/cards/q/QuestForAncientSecrets.java
index 8352c587b33..518c2cac8ec 100644
--- a/Mage.Sets/src/mage/cards/q/QuestForAncientSecrets.java
+++ b/Mage.Sets/src/mage/cards/q/QuestForAncientSecrets.java
@@ -61,7 +61,7 @@ public class QuestForAncientSecrets extends CardImpl {
         this.addAbility(new PutCardIntoGraveFromAnywhereAllTriggeredAbility(
                 new AddCountersSourceEffect(CounterType.QUEST.createInstance()), true, TargetController.YOU));
 
-        // Remove five quest counters from Quest for Ancient Secrets and sacrifice it: Target player shuffles his or her graveyard into his or her library.
+        // Remove five quest counters from Quest for Ancient Secrets and sacrifice it: Target player shuffles their graveyard into their library.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new QuestForAncientSecretsEffect(),
                 new RemoveCountersSourceCost(CounterType.QUEST.createInstance(5)));
@@ -84,7 +84,7 @@ class QuestForAncientSecretsEffect extends OneShotEffect {
 
     public QuestForAncientSecretsEffect() {
         super(Outcome.Neutral);
-        this.staticText = "Target player shuffles his or her graveyard into his or her library";
+        this.staticText = "Target player shuffles their graveyard into their library";
     }
 
     public QuestForAncientSecretsEffect(final QuestForAncientSecretsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/q/QuicksilverFountain.java b/Mage.Sets/src/mage/cards/q/QuicksilverFountain.java
index 574f732d50d..c71def090c9 100644
--- a/Mage.Sets/src/mage/cards/q/QuicksilverFountain.java
+++ b/Mage.Sets/src/mage/cards/q/QuicksilverFountain.java
@@ -63,7 +63,7 @@ public class QuicksilverFountain extends CardImpl {
     public QuicksilverFountain(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
 
-        // 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.
+        // At the beginning of each player's upkeep, that player puts a flood counter on target non-Island land he or she controls of their choice. That land is an Island for as long as it has a flood counter on it.
         Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new QuicksilverFountainEffect(), TargetController.ANY, false, true);
         ability.addTarget(new TargetLandPermanent());
         originalId = ability.getOriginalId();
@@ -106,7 +106,7 @@ class QuicksilverFountainEffect extends OneShotEffect {
 
     public QuicksilverFountainEffect() {
         super(Outcome.Neutral);
-        staticText = "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";
+        staticText = "that player puts a flood counter on target non-Island land he or she controls of their choice. That land is an Island for as long as it has a flood counter on it";
     }
 
     public QuicksilverFountainEffect(final QuicksilverFountainEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/q/QuietSpeculation.java b/Mage.Sets/src/mage/cards/q/QuietSpeculation.java
index 1eb466e8aec..8c387c010fb 100644
--- a/Mage.Sets/src/mage/cards/q/QuietSpeculation.java
+++ b/Mage.Sets/src/mage/cards/q/QuietSpeculation.java
@@ -60,7 +60,7 @@ public class QuietSpeculation extends CardImpl {
     public QuietSpeculation(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{U}");
 
-        // Search target player's library for up to three cards with flashback and put them into that player's graveyard. Then the player shuffles his or her library.
+        // Search target player's library for up to three cards with flashback and put them into that player's graveyard. Then the player shuffles their library.
         TargetCardInLibrary target = new TargetCardInLibrary(0, 3, filterCard);
         this.getSpellAbility().addEffect(new SearchLibraryPutInGraveEffect(target));
         this.getSpellAbility().addTarget(new TargetPlayer());
@@ -80,7 +80,7 @@ class SearchLibraryPutInGraveEffect extends SearchEffect {
 
     public SearchLibraryPutInGraveEffect(TargetCardInLibrary target) {
         super(target, Outcome.Neutral);
-        staticText = "Search target player's library for up to three cards with flashback and put them into that player's graveyard. Then the player shuffles his or her library.";
+        staticText = "Search target player's library for up to three cards with flashback and put them into that player's graveyard. Then the player shuffles their library.";
     }
 
     public SearchLibraryPutInGraveEffect(final SearchLibraryPutInGraveEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/q/QuietusSpike.java b/Mage.Sets/src/mage/cards/q/QuietusSpike.java
index 76badb7eef0..b1fdc65c153 100644
--- a/Mage.Sets/src/mage/cards/q/QuietusSpike.java
+++ b/Mage.Sets/src/mage/cards/q/QuietusSpike.java
@@ -56,7 +56,7 @@ public class QuietusSpike extends CardImpl {
         // Equipped creature has deathtouch.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(DeathtouchAbility.getInstance(), AttachmentType.EQUIPMENT)));
 
-        // Whenever equipped creature deals combat damage to a player, that player loses half his or her life, rounded up.
+        // Whenever equipped creature deals combat damage to a player, that player loses half their life, rounded up.
         this.addAbility(new DealsDamageToAPlayerAttachedTriggeredAbility(new LoseHalfLifeTargetEffect(), "equipped", false, true));
 
         // Equip {3}
diff --git a/Mage.Sets/src/mage/cards/r/Rackling.java b/Mage.Sets/src/mage/cards/r/Rackling.java
index b510d345f27..5772a62a648 100644
--- a/Mage.Sets/src/mage/cards/r/Rackling.java
+++ b/Mage.Sets/src/mage/cards/r/Rackling.java
@@ -55,7 +55,7 @@ public class Rackling extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        // At the beginning of each opponent's upkeep, Rackling deals X damage to that player, where X is 3 minus the number of cards in his or her hand.
+        // At the beginning of each opponent's upkeep, Rackling deals X damage to that player, where X is 3 minus the number of cards in their hand.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new RacklingEffect(), TargetController.OPPONENT, false, true));
     }
 
@@ -73,7 +73,7 @@ class RacklingEffect extends OneShotEffect {
 
     public RacklingEffect() {
         super(Outcome.Benefit);
-        this.staticText = "{this} deals X damage to that player, where X is 3 minus the number of cards in his or her hand";
+        this.staticText = "{this} deals X damage to that player, where X is 3 minus the number of cards in their hand";
     }
 
     public RacklingEffect(final RacklingEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/r/RagMan.java b/Mage.Sets/src/mage/cards/r/RagMan.java
index a13274d1a61..cc42e79838e 100644
--- a/Mage.Sets/src/mage/cards/r/RagMan.java
+++ b/Mage.Sets/src/mage/cards/r/RagMan.java
@@ -64,7 +64,7 @@ public class RagMan extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);
 
-        // {B}{B}{B}, {tap}: Target opponent reveals his or her hand and discards a creature card at random. Activate this ability only during your turn.
+        // {B}{B}{B}, {tap}: Target opponent reveals their hand and discards a creature card at random. Activate this ability only during your turn.
         Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new RevealHandTargetEffect(), new ManaCostsImpl("{B}{B}{B}"), MyTurnCondition.instance);
         ability.addCost(new TapSourceCost());
         ability.addEffect(new RagManDiscardEffect());
diff --git a/Mage.Sets/src/mage/cards/r/RavenGuildMaster.java b/Mage.Sets/src/mage/cards/r/RavenGuildMaster.java
index 3d575c3c2df..eff0bdf5a0a 100644
--- a/Mage.Sets/src/mage/cards/r/RavenGuildMaster.java
+++ b/Mage.Sets/src/mage/cards/r/RavenGuildMaster.java
@@ -52,7 +52,7 @@ public class RavenGuildMaster extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        // Whenever Raven Guild Master deals combat damage to a player, that player exiles the top ten cards of his or her library.
+        // Whenever Raven Guild Master deals combat damage to a player, that player exiles the top ten cards of their library.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new ExileCardsFromTopOfLibraryTargetEffect(10, "that player"), false, true));
 
         // Morph {2}{U}{U}
diff --git a/Mage.Sets/src/mage/cards/r/RavenousTrap.java b/Mage.Sets/src/mage/cards/r/RavenousTrap.java
index 1b0d5bb48ae..80dcdd083d0 100644
--- a/Mage.Sets/src/mage/cards/r/RavenousTrap.java
+++ b/Mage.Sets/src/mage/cards/r/RavenousTrap.java
@@ -52,7 +52,7 @@ public class RavenousTrap extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{B}{B}");
         this.subtype.add(SubType.TRAP);
 
-        // If an opponent had three or more cards put into his or her graveyard from anywhere this turn, you may pay {0} rather than pay Ravenous Trap's mana cost.
+        // If an opponent had three or more cards put into their graveyard from anywhere this turn, you may pay {0} rather than pay Ravenous Trap's mana cost.
         this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{0}"), RavenousTrapCondition.instance), new CardsPutIntoGraveyardWatcher());
 
         // Exile all cards from target player's graveyard.
@@ -89,6 +89,6 @@ enum RavenousTrapCondition implements Condition {
 
     @Override
     public String toString() {
-        return "If an opponent had three or more cards put into his or her graveyard from anywhere this turn";
+        return "If an opponent had three or more cards put into their graveyard from anywhere this turn";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/r/RavingDead.java b/Mage.Sets/src/mage/cards/r/RavingDead.java
index 7333e66a6f8..648c9a3a00d 100644
--- a/Mage.Sets/src/mage/cards/r/RavingDead.java
+++ b/Mage.Sets/src/mage/cards/r/RavingDead.java
@@ -61,7 +61,7 @@ public class RavingDead extends CardImpl {
         this.addAbility(DeathtouchAbility.getInstance());
         // At the beginning of combat on your turn, choose an opponent at random. Raving Dead attacks that player this combat if able.
         this.addAbility(new BeginningOfCombatTriggeredAbility(new AttackIfAbleTargetRandomOpponentSourceEffect(), TargetController.YOU, false));
-        // Whenever Raving Dead deals combat damage to a player, that player loses half his or her life, rounded down.
+        // Whenever Raving Dead deals combat damage to a player, that player loses half their life, rounded down.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new RavingDeadDamageEffect(), false, true));
     }
 
@@ -79,7 +79,7 @@ class RavingDeadDamageEffect extends OneShotEffect {
 
     public RavingDeadDamageEffect() {
         super(Outcome.Damage);
-        this.staticText = "that player loses half his or her life, rounded down";
+        this.staticText = "that player loses half their life, rounded down";
     }
 
     public RavingDeadDamageEffect(final RavingDeadDamageEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/r/RayOfErasure.java b/Mage.Sets/src/mage/cards/r/RayOfErasure.java
index 72b1c42d0cf..04d267683b9 100644
--- a/Mage.Sets/src/mage/cards/r/RayOfErasure.java
+++ b/Mage.Sets/src/mage/cards/r/RayOfErasure.java
@@ -47,7 +47,7 @@ public class RayOfErasure extends CardImpl {
     public RayOfErasure(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{U}");
 
-        // Target player puts the top card of his or her library into his or her graveyard.
+        // Target player puts the top card of their library into their graveyard.
         this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(1));
         this.getSpellAbility().addTarget(new TargetPlayer());
 
diff --git a/Mage.Sets/src/mage/cards/r/RealityShift.java b/Mage.Sets/src/mage/cards/r/RealityShift.java
index 7859e280b3a..fa4ebe432b2 100644
--- a/Mage.Sets/src/mage/cards/r/RealityShift.java
+++ b/Mage.Sets/src/mage/cards/r/RealityShift.java
@@ -51,7 +51,7 @@ public class RealityShift extends CardImpl {
     public RealityShift(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{U}");
 
-        // Exile target creature. Its controller manifests the top card of his or her library.
+        // Exile target creature. Its controller manifests the top card of their library.
         this.getSpellAbility().addEffect(new ExileTargetEffect());
         this.getSpellAbility().addEffect(new RealityShiftEffect());
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
@@ -72,7 +72,7 @@ class RealityShiftEffect extends OneShotEffect {
 
     public RealityShiftEffect() {
         super(Outcome.Exile);
-        this.staticText = "Its controller manifests the top card of his or her library. <i>(That player puts the top card of his or her library onto the battlefield face down as a 2/2 creature. If it's a creature card, it can be turned face up any time for its mana cost.)</i>";
+        this.staticText = "Its controller manifests the top card of their library. <i>(That player puts the top card of their library onto the battlefield face down as a 2/2 creature. If it's a creature card, it can be turned face up any time for its mana cost.)</i>";
     }
 
     public RealityShiftEffect(final RealityShiftEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/r/ReapIntellect.java b/Mage.Sets/src/mage/cards/r/ReapIntellect.java
index e495fc89f75..c8016ecfbf5 100644
--- a/Mage.Sets/src/mage/cards/r/ReapIntellect.java
+++ b/Mage.Sets/src/mage/cards/r/ReapIntellect.java
@@ -58,7 +58,7 @@ public class ReapIntellect extends CardImpl {
     public ReapIntellect(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{2}{U}{B}");
 
-        // Target opponent reveals his or her hand. You choose up to X nonland cards from it and exile them. For each card exiled this way, search that player's graveyard, hand, and library for any number of cards with the same name as that card and exile them. Then that player shuffles his or her library.
+        // Target opponent reveals their hand. You choose up to X nonland cards from it and exile them. For each card exiled this way, search that player's graveyard, hand, and library for any number of cards with the same name as that card and exile them. Then that player shuffles their library.
         this.getSpellAbility().addEffect(new ReapIntellectEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
 
@@ -84,7 +84,7 @@ class ReapIntellectEffect extends OneShotEffect {
 
     public ReapIntellectEffect() {
         super(Outcome.Benefit);
-        staticText = "Target opponent reveals his or her hand. You choose up to X nonland cards from it and exile them. For each card exiled this way, search that player's graveyard, hand, and library for any number of cards with the same name as that card and exile them. Then that player shuffles his or her library";
+        staticText = "Target opponent reveals their hand. You choose up to X nonland cards from it and exile them. For each card exiled this way, search that player's graveyard, hand, and library for any number of cards with the same name as that card and exile them. Then that player shuffles their library";
     }
 
     public ReapIntellectEffect(final ReapIntellectEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/r/ReefPirates.java b/Mage.Sets/src/mage/cards/r/ReefPirates.java
index 06dab8ce59e..9b8da8a7606 100644
--- a/Mage.Sets/src/mage/cards/r/ReefPirates.java
+++ b/Mage.Sets/src/mage/cards/r/ReefPirates.java
@@ -50,9 +50,9 @@ public class ReefPirates extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        // Whenever Reef Pirates deals damage to an opponent, that player puts the top card of his or her library into his or her graveyard.
+        // Whenever Reef Pirates deals damage to an opponent, that player puts the top card of their library into their graveyard.
         Effect effect = new PutLibraryIntoGraveTargetEffect(1);
-        effect.setText("that player puts the top card of his or her library into his or her graveyard");
+        effect.setText("that player puts the top card of their library into their graveyard");
         this.addAbility(new DealsDamageToAPlayerTriggeredAbility(effect, false, true));
     }
 
diff --git a/Mage.Sets/src/mage/cards/r/ReforgeTheSoul.java b/Mage.Sets/src/mage/cards/r/ReforgeTheSoul.java
index ed6a7c9f78e..6f07a16de68 100644
--- a/Mage.Sets/src/mage/cards/r/ReforgeTheSoul.java
+++ b/Mage.Sets/src/mage/cards/r/ReforgeTheSoul.java
@@ -46,7 +46,7 @@ public class ReforgeTheSoul extends CardImpl {
     public ReforgeTheSoul(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{R}{R}");
 
-        // Each player discards his or her hand, then draws seven cards.
+        // Each player discards their hand, then draws seven cards.
         this.getSpellAbility().addEffect(new DiscardHandAllEffect());
         Effect effect = new DrawCardAllEffect(7);
         effect.setText(", then draws seven cards");
diff --git a/Mage.Sets/src/mage/cards/r/Regression.java b/Mage.Sets/src/mage/cards/r/Regression.java
index aba63019350..727d45ef7e8 100644
--- a/Mage.Sets/src/mage/cards/r/Regression.java
+++ b/Mage.Sets/src/mage/cards/r/Regression.java
@@ -52,7 +52,7 @@ public class Regression extends CardImpl {
     public Regression(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{G}");
 
-        // Choose target artifact or enchantment. Its owner shuffles it into his or her library.
+        // Choose target artifact or enchantment. Its owner shuffles it into their library.
         this.getSpellAbility().addEffect(new ShuffleIntoLibraryTargetEffect());
         this.getSpellAbility().addTarget(new TargetPermanent(filter));
     }
diff --git a/Mage.Sets/src/mage/cards/r/RelicOfProgenitus.java b/Mage.Sets/src/mage/cards/r/RelicOfProgenitus.java
index d0afc601eed..d71fd5df411 100644
--- a/Mage.Sets/src/mage/cards/r/RelicOfProgenitus.java
+++ b/Mage.Sets/src/mage/cards/r/RelicOfProgenitus.java
@@ -58,7 +58,7 @@ public class RelicOfProgenitus extends CardImpl {
     public RelicOfProgenitus(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}");
 
-        // {tap}: Target player exiles a card from his or her graveyard.
+        // {tap}: Target player exiles a card from their graveyard.
         Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RelicOfProgenitusEffect(), new TapSourceCost());
         firstAbility.addTarget(new TargetPlayer());
         this.addAbility(firstAbility);
@@ -83,7 +83,7 @@ class RelicOfProgenitusEffect extends OneShotEffect {
 
     public RelicOfProgenitusEffect() {
         super(Outcome.Exile);
-        this.staticText = "Target player exiles a card from his or her graveyard";
+        this.staticText = "Target player exiles a card from their graveyard";
     }
 
     public RelicOfProgenitusEffect(final RelicOfProgenitusEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/r/Reminisce.java b/Mage.Sets/src/mage/cards/r/Reminisce.java
index 4145e961692..a6fbc4bdd0d 100644
--- a/Mage.Sets/src/mage/cards/r/Reminisce.java
+++ b/Mage.Sets/src/mage/cards/r/Reminisce.java
@@ -49,7 +49,7 @@ public class Reminisce extends CardImpl {
     public Reminisce(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{U}");
 
-        // Target player shuffles his or her graveyard into his or her library.
+        // Target player shuffles their graveyard into their library.
         this.getSpellAbility().addEffect(new ReminisceEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
@@ -68,7 +68,7 @@ class ReminisceEffect extends OneShotEffect {
     
     ReminisceEffect() {
         super(Outcome.Neutral);
-        this.staticText = "Target player shuffles his or her graveyard into his or her library";
+        this.staticText = "Target player shuffles their graveyard into their library";
     }
     
     ReminisceEffect(final ReminisceEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/r/ResearchDevelopment.java b/Mage.Sets/src/mage/cards/r/ResearchDevelopment.java
index 8582f459ae5..58f60d552ca 100644
--- a/Mage.Sets/src/mage/cards/r/ResearchDevelopment.java
+++ b/Mage.Sets/src/mage/cards/r/ResearchDevelopment.java
@@ -136,7 +136,7 @@ class ResearchEffect extends OneShotEffect {
                 }
             }
 
-            game.informPlayers(player.getLogName() + " has chosen " + count + " card(s) to shuffle into his or her library.");
+            game.informPlayers(player.getLogName() + " has chosen " + count + " card(s) to shuffle into their library.");
 
             if (count > 0) {
                 player.shuffleLibrary(source, game);
diff --git a/Mage.Sets/src/mage/cards/r/Reset.java b/Mage.Sets/src/mage/cards/r/Reset.java
index 9de88c8b49f..e13b6249fb2 100644
--- a/Mage.Sets/src/mage/cards/r/Reset.java
+++ b/Mage.Sets/src/mage/cards/r/Reset.java
@@ -45,10 +45,10 @@ public class Reset extends CardImpl {
     public Reset(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{U}{U}");
 
-        // Cast Reset only during an opponent's turn after his or her upkeep step.
+        // Cast Reset only during an opponent's turn after their upkeep step.
         this.addAbility(new CastOnlyDuringPhaseStepSourceAbility(null, null,
                 new CompoundCondition(OnOpponentsTurnCondition.instance, AfterUpkeepStepCondtion.instance),
-                "Cast {this} only during an opponent's turn after his or her upkeep step"));
+                "Cast {this} only during an opponent's turn after their upkeep step"));
 
         // Untap all lands you control.
         this.getSpellAbility().addEffect(new UntapAllLandsControllerEffect());
diff --git a/Mage.Sets/src/mage/cards/r/ReturnedCentaur.java b/Mage.Sets/src/mage/cards/r/ReturnedCentaur.java
index 24811dd1cbe..c82ebc9ab3d 100644
--- a/Mage.Sets/src/mage/cards/r/ReturnedCentaur.java
+++ b/Mage.Sets/src/mage/cards/r/ReturnedCentaur.java
@@ -52,7 +52,7 @@ public class ReturnedCentaur extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(4);
 
-        // When Returned Centaur enters the battlefield, target player puts the top four cards of his or her library into his or her graveyard.
+        // When Returned Centaur enters the battlefield, target player puts the top four cards of their library into their graveyard.
         Ability ability = new EntersBattlefieldTriggeredAbility(new PutLibraryIntoGraveTargetEffect(4));
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/r/ReturnedReveler.java b/Mage.Sets/src/mage/cards/r/ReturnedReveler.java
index 10730ee0f1c..fb2e3c2b662 100644
--- a/Mage.Sets/src/mage/cards/r/ReturnedReveler.java
+++ b/Mage.Sets/src/mage/cards/r/ReturnedReveler.java
@@ -51,7 +51,7 @@ public class ReturnedReveler extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(3);
 
-        // When Returned Reveler dies, each player puts the top three cards of his or her library into his or her graveyard.
+        // When Returned Reveler dies, each player puts the top three cards of their library into their graveyard.
         this.addAbility(new DiesTriggeredAbility(new PutTopCardOfLibraryIntoGraveEachPlayerEffect(3, TargetController.ANY)));
     }
 
diff --git a/Mage.Sets/src/mage/cards/r/RevenantPatriarch.java b/Mage.Sets/src/mage/cards/r/RevenantPatriarch.java
index 6da1d4c782a..a50bdf6ddf9 100644
--- a/Mage.Sets/src/mage/cards/r/RevenantPatriarch.java
+++ b/Mage.Sets/src/mage/cards/r/RevenantPatriarch.java
@@ -55,11 +55,11 @@ public class RevenantPatriarch extends CardImpl {
         this.power = new MageInt(4);
         this.toughness = new MageInt(3);
 
-        // When Revenant Patriarch enters the battlefield, if {W} was spent to cast it, target player skips his or her next combat phase.
+        // When Revenant Patriarch enters the battlefield, if {W} was spent to cast it, target player skips their next combat phase.
         TriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new SkipNextCombatEffect(), false);
         ability.addTarget(new TargetPlayer());
         this.addAbility(new ConditionalTriggeredAbility(ability, new ManaWasSpentCondition(ColoredManaSymbol.W), 
-                "if {W} was spent to cast it, target player skips his or her next combat phase."), new ManaSpentToCastWatcher());   
+                "if {W} was spent to cast it, target player skips their next combat phase."), new ManaSpentToCastWatcher());
         // Revenant Patriarch can't block.
         this.addAbility(new CantBlockAbility());
     }
diff --git a/Mage.Sets/src/mage/cards/r/ReversalOfFortune.java b/Mage.Sets/src/mage/cards/r/ReversalOfFortune.java
index 75d4c8f7fe2..1af82ceb567 100644
--- a/Mage.Sets/src/mage/cards/r/ReversalOfFortune.java
+++ b/Mage.Sets/src/mage/cards/r/ReversalOfFortune.java
@@ -54,7 +54,7 @@ public class ReversalOfFortune extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{R}{R}");
 
 
-        // Target opponent reveals his or her hand. You may copy an instant or sorcery card in it. If you do, you may cast the copy without paying its mana cost.
+        // Target opponent reveals their hand. You may copy an instant or sorcery card in it. If you do, you may cast the copy without paying its mana cost.
         this.getSpellAbility().addEffect(new ReversalOfFortuneEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
     }
@@ -74,7 +74,7 @@ class ReversalOfFortuneEffect extends OneShotEffect {
 
     public ReversalOfFortuneEffect() {
         super(Outcome.Copy);
-        this.staticText = "Target opponent reveals his or her hand. You may copy an instant or sorcery card in it. If you do, you may cast the copy without paying its mana cost";
+        this.staticText = "Target opponent reveals their hand. You may copy an instant or sorcery card in it. If you do, you may cast the copy without paying its mana cost";
     }
 
     public ReversalOfFortuneEffect(final ReversalOfFortuneEffect effect) {
@@ -92,7 +92,7 @@ class ReversalOfFortuneEffect extends OneShotEffect {
         Player controller = game.getPlayer(source.getControllerId());
         Player opponent = game.getPlayer(source.getFirstTarget());
         if (controller != null && opponent != null) {
-            // Target opponent reveals his or her hand
+            // Target opponent reveals their hand
             Cards revealedCards = new CardsImpl(); 
             revealedCards.addAll(opponent.getHand()); 
             opponent.revealCards("Reveal", revealedCards, game);
diff --git a/Mage.Sets/src/mage/cards/r/Reweave.java b/Mage.Sets/src/mage/cards/r/Reweave.java
index 84c06feda34..4ae43bb19fe 100644
--- a/Mage.Sets/src/mage/cards/r/Reweave.java
+++ b/Mage.Sets/src/mage/cards/r/Reweave.java
@@ -56,7 +56,7 @@ public class Reweave extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{5}{U}");
         this.subtype.add(SubType.ARCANE);
 
-        // Target permanent's controller sacrifices it. If he or she does, that player reveals cards from the top of his or her library until he or she reveals a permanent card that shares a card type with the sacrificed permanent, puts that card onto the battlefield, then shuffles his or her library.
+        // Target permanent's controller sacrifices it. If he or she does, that player reveals cards from the top of their library until he or she reveals a permanent card that shares a card type with the sacrificed permanent, puts that card onto the battlefield, then shuffles their library.
         this.getSpellAbility().addEffect(new ReweaveEffect());
         Target target = new TargetPermanent();
         this.getSpellAbility().addTarget(target);
@@ -81,7 +81,7 @@ class ReweaveEffect extends OneShotEffect {
 
     public ReweaveEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Target permanent's controller sacrifices it. If he or she does, that player reveals cards from the top of his or her library until he or she reveals a permanent card that shares a card type with the sacrificed permanent, puts that card onto the battlefield, then shuffles his or her library";
+        this.staticText = "Target permanent's controller sacrifices it. If he or she does, that player reveals cards from the top of their library until he or she reveals a permanent card that shares a card type with the sacrificed permanent, puts that card onto the battlefield, then shuffles their library";
     }
 
     public ReweaveEffect(final ReweaveEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/r/Riddlekeeper.java b/Mage.Sets/src/mage/cards/r/Riddlekeeper.java
index 47effac0462..1ab97900e95 100644
--- a/Mage.Sets/src/mage/cards/r/Riddlekeeper.java
+++ b/Mage.Sets/src/mage/cards/r/Riddlekeeper.java
@@ -52,9 +52,9 @@ public class Riddlekeeper extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(4);
 
-        // Whenever a creature attacks you or a planeswalker you control, that creature's controller puts the top two cards of his or her library into his or her graveyard.
+        // Whenever a creature attacks you or a planeswalker you control, that creature's controller puts the top two cards of their library into their graveyard.
         Effect effect = new PutTopCardOfLibraryIntoGraveTargetEffect(2);
-        effect.setText("that creature's controller puts the top two cards of his or her library into his or her graveyard");
+        effect.setText("that creature's controller puts the top two cards of their library into their graveyard");
         this.addAbility(new AttacksAllTriggeredAbility(effect, false, StaticFilters.FILTER_PERMANENT_CREATURE, SetTargetPointer.PLAYER, true, true));
     }
 
diff --git a/Mage.Sets/src/mage/cards/r/Riftsweeper.java b/Mage.Sets/src/mage/cards/r/Riftsweeper.java
index 36d8ecc8a56..55c1ae333c4 100644
--- a/Mage.Sets/src/mage/cards/r/Riftsweeper.java
+++ b/Mage.Sets/src/mage/cards/r/Riftsweeper.java
@@ -64,7 +64,7 @@ public class Riftsweeper extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        // When Riftsweeper enters the battlefield, choose target face-up exiled card. Its owner shuffles it into his or her library.
+        // When Riftsweeper enters the battlefield, choose target face-up exiled card. Its owner shuffles it into their library.
         Ability ability = new EntersBattlefieldTriggeredAbility(new RiftsweeperEffect(), false);
         ability.addTarget(new TargetCardInExile(1, 1, filter, null, true));
         this.addAbility(ability);
@@ -84,7 +84,7 @@ class RiftsweeperEffect extends OneShotEffect {
 
     public RiftsweeperEffect() {
         super(Outcome.Benefit);
-        this.staticText = "choose target face-up exiled card. Its owner shuffles it into his or her library";
+        this.staticText = "choose target face-up exiled card. Its owner shuffles it into their library";
     }
 
     public RiftsweeperEffect(final RiftsweeperEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/r/RiseFall.java b/Mage.Sets/src/mage/cards/r/RiseFall.java
index 41107fcfb69..4cf8593e19e 100644
--- a/Mage.Sets/src/mage/cards/r/RiseFall.java
+++ b/Mage.Sets/src/mage/cards/r/RiseFall.java
@@ -64,7 +64,7 @@ public class RiseFall extends SplitCard {
         getLeftHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent());
 
         // Fall
-        // Target player reveals two cards at random from his or her hand, then discards each nonland card revealed this way.
+        // Target player reveals two cards at random from their hand, then discards each nonland card revealed this way.
         getRightHalfCard().getSpellAbility().addEffect(new FallEffect());
         getRightHalfCard().getSpellAbility().addTarget(new TargetPlayer());
     }
@@ -119,7 +119,7 @@ class FallEffect extends OneShotEffect {
 
     public FallEffect() {
         super(Outcome.Discard);
-        this.staticText = "Target player reveals two cards at random from his or her hand, then discards each nonland card revealed this way";
+        this.staticText = "Target player reveals two cards at random from their hand, then discards each nonland card revealed this way";
     }
 
     public FallEffect(final FallEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java b/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java
index f2c995b97d2..ccc4576cb6c 100644
--- a/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java
+++ b/Mage.Sets/src/mage/cards/r/RishadanPawnshop.java
@@ -87,7 +87,7 @@ class RishadanPawnshopShuffleIntoLibraryEffect extends OneShotEffect {
 
     public RishadanPawnshopShuffleIntoLibraryEffect() {
         super(Outcome.Detriment);
-        this.staticText = "The owner of target nontoken permanent you control shuffles it into his or her library";
+        this.staticText = "The owner of target nontoken permanent you control shuffles it into their library";
     }
 
     public RishadanPawnshopShuffleIntoLibraryEffect(final RishadanPawnshopShuffleIntoLibraryEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/r/RitesOfFlourishing.java b/Mage.Sets/src/mage/cards/r/RitesOfFlourishing.java
index 95a0da82320..49a1a094465 100644
--- a/Mage.Sets/src/mage/cards/r/RitesOfFlourishing.java
+++ b/Mage.Sets/src/mage/cards/r/RitesOfFlourishing.java
@@ -53,7 +53,7 @@ public class RitesOfFlourishing extends CardImpl {
         // At the beginning of each player's draw step, that player draws an additional card.
         this.addAbility(new RitesOfFlourishingAbility());
 
-        // Each player may play an additional land on each of his or her turns.
+        // Each player may play an additional land on each of their turns.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayAdditionalLandsAllEffect()));
     }
 
diff --git a/Mage.Sets/src/mage/cards/r/RiversGrasp.java b/Mage.Sets/src/mage/cards/r/RiversGrasp.java
index b6430f94e0b..bc080aa2e92 100644
--- a/Mage.Sets/src/mage/cards/r/RiversGrasp.java
+++ b/Mage.Sets/src/mage/cards/r/RiversGrasp.java
@@ -59,7 +59,7 @@ public class RiversGrasp extends CardImpl {
     public RiversGrasp(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{U/B}");
 
-        // If {U} was spent to cast River's Grasp, return up to one target creature to its owner's hand. If {B} was spent to cast River's Grasp, target player reveals his or her hand, you choose a nonland card from it, then that player discards that card.
+        // If {U} was spent to cast River's Grasp, return up to one target creature to its owner's hand. If {B} was spent to cast River's Grasp, target player reveals their hand, you choose a nonland card from it, then that player discards that card.
         Target targetCreature = new TargetCreaturePermanent(0, 1);
         Target targetPlayer = new TargetPlayer();
         this.getSpellAbility().addEffect(new ConditionalOneShotEffect(
@@ -67,7 +67,7 @@ public class RiversGrasp extends CardImpl {
                 new ManaWasSpentCondition(ColoredManaSymbol.U), "If {U} was spent to cast {this}, return up to one target creature to its owner's hand"));
         this.getSpellAbility().addEffect(new ConditionalOneShotEffect(
                 new RiversGraspEffect(),
-                new ManaWasSpentCondition(ColoredManaSymbol.B), " If {B} was spent to cast {this}, target player reveals his or her hand, you choose a nonland card from it, then that player discards that card"));
+                new ManaWasSpentCondition(ColoredManaSymbol.B), " If {B} was spent to cast {this}, target player reveals their hand, you choose a nonland card from it, then that player discards that card"));
 
         this.getSpellAbility().addTarget(targetCreature);
         this.getSpellAbility().addTarget(targetPlayer);
@@ -90,7 +90,7 @@ class RiversGraspEffect extends OneShotEffect {
 
     public RiversGraspEffect() {
         super(Outcome.Discard);
-        this.staticText = "Target player reveals his or her hand, you choose a card from it, then that player discards that card.";
+        this.staticText = "Target player reveals their hand, you choose a card from it, then that player discards that card.";
     }
 
     public RiversGraspEffect(final RiversGraspEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/r/RoarOfReclamation.java b/Mage.Sets/src/mage/cards/r/RoarOfReclamation.java
index e9f0bf7798a..2e343879e49 100644
--- a/Mage.Sets/src/mage/cards/r/RoarOfReclamation.java
+++ b/Mage.Sets/src/mage/cards/r/RoarOfReclamation.java
@@ -50,7 +50,7 @@ public class RoarOfReclamation extends CardImpl {
     public RoarOfReclamation(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{W}{W}");
 
-        // Each player returns all artifact cards from his or her graveyard to the battlefield.
+        // Each player returns all artifact cards from their graveyard to the battlefield.
         this.getSpellAbility().addEffect(new RoarOfReclamationEffect());
     }
 
@@ -68,7 +68,7 @@ class RoarOfReclamationEffect extends OneShotEffect {
     
     public RoarOfReclamationEffect() {
         super(Outcome.PutCardInPlay);
-        staticText = "Each player returns all artifact cards from his or her graveyard to the battlefield";
+        staticText = "Each player returns all artifact cards from their graveyard to the battlefield";
     }
 
     public RoarOfReclamationEffect(final RoarOfReclamationEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/r/RootwaterThief.java b/Mage.Sets/src/mage/cards/r/RootwaterThief.java
index 8c96bf07fe2..8db1297f42e 100644
--- a/Mage.Sets/src/mage/cards/r/RootwaterThief.java
+++ b/Mage.Sets/src/mage/cards/r/RootwaterThief.java
@@ -65,7 +65,7 @@ public class RootwaterThief extends CardImpl {
 
         // {U}: Rootwater Thief gains flying until end of turn.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{U}")));
-        // Whenever Rootwater Thief deals combat damage to a player, you may pay {2}. If you do, search that player's library for a card and exile it, then the player shuffles his or her library.
+        // Whenever Rootwater Thief deals combat damage to a player, you may pay {2}. If you do, search that player's library for a card and exile it, then the player shuffles their library.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new RootwaterThiefEffect(), false, true));
     }
 
@@ -83,7 +83,7 @@ class RootwaterThiefEffect extends OneShotEffect {
 
     RootwaterThiefEffect() {
         super(Outcome.Exile);
-        staticText = "you may pay {2}. If you do, search that player's library for a card and exile it, then the player shuffles his or her library.";
+        staticText = "you may pay {2}. If you do, search that player's library for a card and exile it, then the player shuffles their library.";
     }
 
     RootwaterThiefEffect(final RootwaterThiefEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/r/RotcrownGhoul.java b/Mage.Sets/src/mage/cards/r/RotcrownGhoul.java
index 00e5d9eb5cd..ec0b78d8e13 100644
--- a/Mage.Sets/src/mage/cards/r/RotcrownGhoul.java
+++ b/Mage.Sets/src/mage/cards/r/RotcrownGhoul.java
@@ -50,7 +50,7 @@ public class RotcrownGhoul extends CardImpl {
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);
 
-        // When Rotcrown Ghoul dies, target player puts the top five cards of his or her library into his or her graveyard.
+        // When Rotcrown Ghoul dies, target player puts the top five cards of their library into their graveyard.
         Ability ability = new DiesTriggeredAbility(new PutLibraryIntoGraveTargetEffect(5));
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/r/RousingOfSouls.java b/Mage.Sets/src/mage/cards/r/RousingOfSouls.java
index 61124fc0e5a..816960f71fa 100644
--- a/Mage.Sets/src/mage/cards/r/RousingOfSouls.java
+++ b/Mage.Sets/src/mage/cards/r/RousingOfSouls.java
@@ -51,7 +51,7 @@ public class RousingOfSouls extends CardImpl {
     public RousingOfSouls(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{W}");
 
-        // Parley - Each player reveals the top card of his or her library. For each nonland card revealed this way, 
+        // Parley - Each player reveals the top card of their library. For each nonland card revealed this way,
         // you create a 1/1 white Spirit creature token with flying. Then each player draws a card.
         this.getSpellAbility().addEffect(new RousingOfSoulsEffect());
         Effect effect = new DrawCardAllEffect(1);
@@ -73,7 +73,7 @@ class RousingOfSoulsEffect extends OneShotEffect {
 
     public RousingOfSoulsEffect() {
         super(Outcome.Benefit);
-        this.staticText = "<i>Parley &mdash; </i> Each player reveals the top card of his or her library. For each nonland card revealed this way, you create a 1/1 white Spirit creature token with flying";
+        this.staticText = "<i>Parley &mdash; </i> Each player reveals the top card of their library. For each nonland card revealed this way, you create a 1/1 white Spirit creature token with flying";
     }
 
     public RousingOfSoulsEffect(final RousingOfSoulsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/r/RunehornHellkite.java b/Mage.Sets/src/mage/cards/r/RunehornHellkite.java
index ef56221d79a..a6278aaa686 100644
--- a/Mage.Sets/src/mage/cards/r/RunehornHellkite.java
+++ b/Mage.Sets/src/mage/cards/r/RunehornHellkite.java
@@ -59,7 +59,7 @@ public class RunehornHellkite extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
 
-        // {5}{R}, Exile Runehorn Hellkite from your graveyard: Each player discards his or her hand, then draws seven cards.
+        // {5}{R}, Exile Runehorn Hellkite from your graveyard: Each player discards their hand, then draws seven cards.
         Effect effect = new DrawCardAllEffect(7);
         effect.setText(", then draws seven cards");
         Ability ability = new SimpleActivatedAbility(Zone.GRAVEYARD, new DiscardHandAllEffect(), new ManaCostsImpl("{5}{R}"));
diff --git a/Mage.Sets/src/mage/cards/s/SabertoothCobra.java b/Mage.Sets/src/mage/cards/s/SabertoothCobra.java
index dcd8f0f4b4a..fb8779d8afb 100644
--- a/Mage.Sets/src/mage/cards/s/SabertoothCobra.java
+++ b/Mage.Sets/src/mage/cards/s/SabertoothCobra.java
@@ -53,14 +53,14 @@ public class SabertoothCobra extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        // Whenever Sabertooth Cobra deals damage to a player, he or she gets a poison counter. That player gets another poison counter at the beginning of his or her next upkeep unless he or she pays {2} before that turn.
+        // Whenever Sabertooth Cobra deals damage to a player, he or she gets a poison counter. That player gets another poison counter at the beginning of their next upkeep unless he or she pays {2} before that turn.
         Effect effect = new AddPoisonCounterTargetEffect(1);
         effect.setText("that player gets a poison counter");
         Ability ability = new DealsDamageToAPlayerTriggeredAbility(effect, false, true);
         effect = new AddPoisonCounterTargetEffect(1);
         effect.setText("That player gets another poison counter.");
         ability.addEffect(new UnlessPaysDelayedEffect(new ManaCostsImpl("{2}"), effect, PhaseStep.UPKEEP, true,
-            "That player gets another poison counter at the beginning of his or her next upkeep unless he or she pays {2} before that turn."));
+            "That player gets another poison counter at the beginning of their next upkeep unless he or she pays {2} before that turn."));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/cards/s/SadisticAugermage.java b/Mage.Sets/src/mage/cards/s/SadisticAugermage.java
index 421b3f927c9..c31a48b5d6b 100644
--- a/Mage.Sets/src/mage/cards/s/SadisticAugermage.java
+++ b/Mage.Sets/src/mage/cards/s/SadisticAugermage.java
@@ -56,7 +56,7 @@ public class SadisticAugermage extends CardImpl {
         this.power = new MageInt(3);
         this.toughness = new MageInt(1);
 
-        // When Sadistic Augermage dies, each player puts a card from his or her hand on top of his or her library.
+        // When Sadistic Augermage dies, each player puts a card from their hand on top of their library.
         this.getSpellAbility().addEffect(null);
     }
 
@@ -74,7 +74,7 @@ class WidespreadPanicEffect extends OneShotEffect {
 
     public WidespreadPanicEffect() {
         super(Outcome.Detriment);
-        this.staticText = "each player puts a card from his or her hand on top of his or her library";
+        this.staticText = "each player puts a card from their hand on top of their library";
     }
 
     public WidespreadPanicEffect(final WidespreadPanicEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SadisticSacrament.java b/Mage.Sets/src/mage/cards/s/SadisticSacrament.java
index 50449dfba93..2f49d29d840 100644
--- a/Mage.Sets/src/mage/cards/s/SadisticSacrament.java
+++ b/Mage.Sets/src/mage/cards/s/SadisticSacrament.java
@@ -51,7 +51,7 @@ import mage.target.common.TargetCardInLibrary;
  */
 public class SadisticSacrament extends CardImpl {
 
-    private static final String ruleText = "Search target player's library for up to three cards, exile them, then that player shuffles his or her library. If {this} was kicked, instead search that player's library for up to fifteen cards, exile them, then that player shuffles his or her library";
+    private static final String ruleText = "Search target player's library for up to three cards, exile them, then that player shuffles their library. If {this} was kicked, instead search that player's library for up to fifteen cards, exile them, then that player shuffles their library";
 
     public SadisticSacrament(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}{B}{B}");
@@ -61,8 +61,8 @@ public class SadisticSacrament extends CardImpl {
         // Kicker {7}
         this.addAbility(new KickerAbility("{7}"));
 
-        // Search target player's library for up to three cards, exile them, then that player shuffles his or her library.
-        // If Sadistic Sacrament was kicked, instead search that player's library for up to fifteen cards, exile them, then that player shuffles his or her library.
+        // Search target player's library for up to three cards, exile them, then that player shuffles their library.
+        // If Sadistic Sacrament was kicked, instead search that player's library for up to fifteen cards, exile them, then that player shuffles their library.
         this.getSpellAbility().addEffect(new ConditionalOneShotEffect(
                 new SadisticSacramentEffect(15),
                 new SadisticSacramentEffect(3),
diff --git a/Mage.Sets/src/mage/cards/s/SagesRowDenizen.java b/Mage.Sets/src/mage/cards/s/SagesRowDenizen.java
index abf3e87ca92..e67b8b9f1f6 100644
--- a/Mage.Sets/src/mage/cards/s/SagesRowDenizen.java
+++ b/Mage.Sets/src/mage/cards/s/SagesRowDenizen.java
@@ -67,7 +67,7 @@ public class SagesRowDenizen extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(3);
 
-        // Whenever another blue creature enters the battlefield under your control, target player puts the top two cards of his or her library into his or her graveyard.
+        // Whenever another blue creature enters the battlefield under your control, target player puts the top two cards of their library into their graveyard.
         Ability ability = new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), filter, false, null, true);
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/s/SalvageDrone.java b/Mage.Sets/src/mage/cards/s/SalvageDrone.java
index a289ddd144d..e0d89df101d 100644
--- a/Mage.Sets/src/mage/cards/s/SalvageDrone.java
+++ b/Mage.Sets/src/mage/cards/s/SalvageDrone.java
@@ -53,7 +53,7 @@ public class SalvageDrone extends CardImpl {
 
         // Devoid
         this.addAbility(new DevoidAbility(this.color));
-        // Ingest (Whenever this creature deals combat damage to a player, that player exiles the top card of his or her library.)
+        // Ingest (Whenever this creature deals combat damage to a player, that player exiles the top card of their library.)
         this.addAbility(new IngestAbility());
         // When Salvage Drone dies, you may draw a card. If you do, discard a card.
         this.addAbility(new DiesTriggeredAbility(new DrawDiscardControllerEffect(1, 1, true), false));
diff --git a/Mage.Sets/src/mage/cards/s/SandsOfDelirium.java b/Mage.Sets/src/mage/cards/s/SandsOfDelirium.java
index 0510dc4b7e1..b6369377237 100644
--- a/Mage.Sets/src/mage/cards/s/SandsOfDelirium.java
+++ b/Mage.Sets/src/mage/cards/s/SandsOfDelirium.java
@@ -50,7 +50,7 @@ public class SandsOfDelirium extends CardImpl {
     public SandsOfDelirium(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}");
 
-        // {X}, {tap}: Target player puts the top X cards of his or her library into his or her graveyard.
+        // {X}, {tap}: Target player puts the top X cards of their library into their graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(new ManacostVariableValue()), new VariableManaCost());
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetPlayer());
diff --git a/Mage.Sets/src/mage/cards/s/SandsOfTime.java b/Mage.Sets/src/mage/cards/s/SandsOfTime.java
index 14699d169d9..d7ff9ad1dd5 100644
--- a/Mage.Sets/src/mage/cards/s/SandsOfTime.java
+++ b/Mage.Sets/src/mage/cards/s/SandsOfTime.java
@@ -57,7 +57,7 @@ public class SandsOfTime extends CardImpl {
     public SandsOfTime(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}");
 
-        // Each player skips his or her untap step.
+        // Each player skips their untap step.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SkipUntapStepEffect()));
 
         // 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.
diff --git a/Mage.Sets/src/mage/cards/s/SanityGrinding.java b/Mage.Sets/src/mage/cards/s/SanityGrinding.java
index a35499357ae..4d63c274487 100644
--- a/Mage.Sets/src/mage/cards/s/SanityGrinding.java
+++ b/Mage.Sets/src/mage/cards/s/SanityGrinding.java
@@ -55,7 +55,7 @@ public class SanityGrinding extends CardImpl {
     public SanityGrinding(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{U}{U}{U}");
 
-        // Chroma - Reveal the top ten cards of your library. For each blue mana symbol in the mana costs of the revealed cards, target opponent puts the top card of his or her library into his or her graveyard. Then put the cards you revealed this way on the bottom of your library in any order.
+        // Chroma - Reveal the top ten cards of your library. For each blue mana symbol in the mana costs of the revealed cards, target opponent puts the top card of their library into their graveyard. Then put the cards you revealed this way on the bottom of your library in any order.
         this.getSpellAbility().addEffect(new SanityGrindingEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
 
@@ -75,7 +75,7 @@ class SanityGrindingEffect extends OneShotEffect {
 
     public SanityGrindingEffect() {
         super(Outcome.Neutral);
-        staticText = "<i>Chroma</i> &mdash; Reveal the top ten cards of your library. For each blue mana symbol in the mana costs of the revealed cards, target opponent puts the top card of his or her library into his or her graveyard. Then put the cards you revealed this way on the bottom of your library in any order";
+        staticText = "<i>Chroma</i> &mdash; Reveal the top ten cards of your library. For each blue mana symbol in the mana costs of the revealed cards, target opponent puts the top card of their library into their graveyard. Then put the cards you revealed this way on the bottom of your library in any order";
     }
 
     public SanityGrindingEffect(final SanityGrindingEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SavageVentmaw.java b/Mage.Sets/src/mage/cards/s/SavageVentmaw.java
index ac1ba483572..cf339526171 100644
--- a/Mage.Sets/src/mage/cards/s/SavageVentmaw.java
+++ b/Mage.Sets/src/mage/cards/s/SavageVentmaw.java
@@ -83,7 +83,7 @@ class SavageVentmawManaEffect extends ManaEffect {
         super();
         this.mana = mana;
         this.emptyOnlyOnTurnsEnd = emptyOnTurnsEnd;
-        this.staticText = (textManaPoolOwner.equals("his or her")?"that player adds ":"add ") + mana.toString() + " to " + textManaPoolOwner + " mana pool";
+        this.staticText = (textManaPoolOwner.equals("their")?"that player adds ":"add ") + mana.toString() + " to " + textManaPoolOwner + " mana pool";
     }
 
     public SavageVentmawManaEffect(final SavageVentmawManaEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/Scalpelexis.java b/Mage.Sets/src/mage/cards/s/Scalpelexis.java
index 27c6be5f20a..111e7964a82 100644
--- a/Mage.Sets/src/mage/cards/s/Scalpelexis.java
+++ b/Mage.Sets/src/mage/cards/s/Scalpelexis.java
@@ -60,7 +60,7 @@ public class Scalpelexis extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
 
-        // Whenever Scalpelexis deals combat damage to a player, that player exiles the top four cards of his or her library. If two or more of those cards have the same name, repeat this process.
+        // Whenever Scalpelexis deals combat damage to a player, that player exiles the top four cards of their library. If two or more of those cards have the same name, repeat this process.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new ScalpelexisEffect(), false, true));
     }
 
@@ -78,7 +78,7 @@ class ScalpelexisEffect extends OneShotEffect {
 
     public ScalpelexisEffect() {
         super(Outcome.Exile);
-        this.staticText = "that player exiles the top four cards of his or her library. If two or more of those cards have the same name, repeat this process";
+        this.staticText = "that player exiles the top four cards of their library. If two or more of those cards have the same name, repeat this process";
     }
 
     public ScalpelexisEffect(final ScalpelexisEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/Scour.java b/Mage.Sets/src/mage/cards/s/Scour.java
index b38615343ea..99d1acc4021 100644
--- a/Mage.Sets/src/mage/cards/s/Scour.java
+++ b/Mage.Sets/src/mage/cards/s/Scour.java
@@ -45,7 +45,7 @@ public class Scour extends CardImpl {
 
 
         // Exile target enchantment.
-        // Search its controller's graveyard, hand, and library for all cards with the same name as that enchantment and exile them. Then that player shuffles his or her library.
+        // Search its controller's graveyard, hand, and library for all cards with the same name as that enchantment and exile them. Then that player shuffles their library.
         this.getSpellAbility().addTarget(new TargetEnchantmentPermanent());
         this.getSpellAbility().addEffect(new ExileTargetAndSearchGraveyardHandLibraryEffect(false, "its controller's","all cards with the same name as that enchantment"));
     }
diff --git a/Mage.Sets/src/mage/cards/s/ScrabblingClaws.java b/Mage.Sets/src/mage/cards/s/ScrabblingClaws.java
index efbc9d4f53e..7a7daa4a03e 100644
--- a/Mage.Sets/src/mage/cards/s/ScrabblingClaws.java
+++ b/Mage.Sets/src/mage/cards/s/ScrabblingClaws.java
@@ -58,7 +58,7 @@ public class ScrabblingClaws extends CardImpl {
     public ScrabblingClaws(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{1}");
 
-        // {tap}: Target player exiles a card from his or her graveyard.
+        // {tap}: Target player exiles a card from their graveyard.
         Ability firstAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ScrabblingClawsEffect(), new TapSourceCost());
         firstAbility.addTarget(new TargetPlayer());
         this.addAbility(firstAbility);
@@ -84,7 +84,7 @@ class ScrabblingClawsEffect extends OneShotEffect {
 
     public ScrabblingClawsEffect() {
         super(Outcome.Exile);
-        this.staticText = "Target player exiles a card from his or her graveyard";
+        this.staticText = "Target player exiles a card from their graveyard";
     }
 
     public ScrabblingClawsEffect(final ScrabblingClawsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/ScrapMastery.java b/Mage.Sets/src/mage/cards/s/ScrapMastery.java
index de82daca147..d1faffabbd1 100644
--- a/Mage.Sets/src/mage/cards/s/ScrapMastery.java
+++ b/Mage.Sets/src/mage/cards/s/ScrapMastery.java
@@ -54,7 +54,7 @@ public class ScrapMastery extends CardImpl {
     public ScrapMastery(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{R}{R}");
 
-        // Each player exiles all artifact cards from his or her graveyard, then sacrifices all artifacts he or she controls, then puts all cards he or she exiled this way onto the battlefield.
+        // 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.
         this.getSpellAbility().addEffect(new ScrapMasteryEffect());
     }
 
@@ -72,7 +72,7 @@ class ScrapMasteryEffect extends OneShotEffect {
 
     public ScrapMasteryEffect() {
         super(Outcome.PutCardInPlay);
-        this.staticText = "Each player exiles all artifact cards from his or her graveyard, then sacrifices all artifacts he or she controls, then puts all cards he or she exiled this way onto the battlefield";
+        this.staticText = "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";
     }
 
     public ScrapMasteryEffect(final ScrapMasteryEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/ScreechingSilcaw.java b/Mage.Sets/src/mage/cards/s/ScreechingSilcaw.java
index f87d1eddea6..6a521dd656b 100644
--- a/Mage.Sets/src/mage/cards/s/ScreechingSilcaw.java
+++ b/Mage.Sets/src/mage/cards/s/ScreechingSilcaw.java
@@ -46,7 +46,7 @@ import mage.constants.SubType;
  */
 public class ScreechingSilcaw extends CardImpl {
 
-    private static final String text = "Metalcraft - Whenever Screeching Silcaw deals combat damage to a player, if you control three or more artifacts, that player puts the top four cards of his or her library into his or her graveyard.";
+    private static final String text = "Metalcraft - Whenever Screeching Silcaw deals combat damage to a player, if you control three or more artifacts, that player puts the top four cards of their library into their graveyard.";
 
     public ScreechingSilcaw(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}");
diff --git a/Mage.Sets/src/mage/cards/s/ScreechingSliver.java b/Mage.Sets/src/mage/cards/s/ScreechingSliver.java
index 60629282727..6094aa5ec22 100644
--- a/Mage.Sets/src/mage/cards/s/ScreechingSliver.java
+++ b/Mage.Sets/src/mage/cards/s/ScreechingSliver.java
@@ -57,13 +57,13 @@ public class ScreechingSliver extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        // All Slivers have "{T}: Target player puts the top card of his or her library into his or her graveyard."
+        // All Slivers have "{T}: Target player puts the top card of their library into their graveyard."
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(1), new TapSourceCost());
         ability.addTarget(new TargetPlayer());
 
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
                 new GainAbilityAllEffect(ability, Duration.WhileOnBattlefield,
-                        filter, "All Slivers have \"{T}: Target player puts the top card of his or her library into his or her graveyard.\"")));
+                        filter, "All Slivers have \"{T}: Target player puts the top card of their library into their graveyard.\"")));
     }
 
     public ScreechingSliver(final ScreechingSliver card) {
diff --git a/Mage.Sets/src/mage/cards/s/Scrounge.java b/Mage.Sets/src/mage/cards/s/Scrounge.java
index b4fa332d95d..9ce6efeaa67 100644
--- a/Mage.Sets/src/mage/cards/s/Scrounge.java
+++ b/Mage.Sets/src/mage/cards/s/Scrounge.java
@@ -50,7 +50,7 @@ public class Scrounge extends CardImpl {
     public Scrounge(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}");
 
-        // Target opponent chooses an artifact card in his or her graveyard. Put that card onto the battlefield under your control.
+        // Target opponent chooses an artifact card in their graveyard. Put that card onto the battlefield under your control.
         this.getSpellAbility().addEffect(new ScroungeEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
     }
@@ -69,7 +69,7 @@ class ScroungeEffect extends OneShotEffect {
 
     public ScroungeEffect() {
         super(Outcome.Benefit);
-        staticText = "Target opponent chooses an artifact card in his or her graveyard. Put that card onto the battlefield under your control";
+        staticText = "Target opponent chooses an artifact card in their graveyard. Put that card onto the battlefield under your control";
     }
 
     public ScroungeEffect(final ScroungeEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/Scytheclaw.java b/Mage.Sets/src/mage/cards/s/Scytheclaw.java
index e1dd1f8ff86..f3f7f2562ab 100644
--- a/Mage.Sets/src/mage/cards/s/Scytheclaw.java
+++ b/Mage.Sets/src/mage/cards/s/Scytheclaw.java
@@ -58,7 +58,7 @@ public class Scytheclaw extends CardImpl {
         // Equipped creature gets +1/+1.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEquippedEffect(1, 1)));
 
-        // Whenever equipped creature deals combat damage to a player, that player loses half of his or her life, round up.
+        // Whenever equipped creature deals combat damage to a player, that player loses half of their life, round up.
         this.addAbility(new DealsDamageToAPlayerAttachedTriggeredAbility(new LoseHalfLifeTargetEffect(), "equipped", false, true));
 
         // Equip {3}
diff --git a/Mage.Sets/src/mage/cards/s/SearchWarrant.java b/Mage.Sets/src/mage/cards/s/SearchWarrant.java
index e512eb63400..f705f99daca 100644
--- a/Mage.Sets/src/mage/cards/s/SearchWarrant.java
+++ b/Mage.Sets/src/mage/cards/s/SearchWarrant.java
@@ -48,7 +48,7 @@ public class SearchWarrant extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{W}{U}");
 
 
-        // Target player reveals his or her hand. You gain life equal to the number of cards in that player's hand.
+        // Target player reveals their hand. You gain life equal to the number of cards in that player's hand.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new SearchWarrantEffect());
 
@@ -68,7 +68,7 @@ class SearchWarrantEffect extends OneShotEffect {
 
     public SearchWarrantEffect() {
         super(Outcome.Exile);
-        this.staticText = "Target player reveals his or her hand. You gain life equal to the number of cards in that player's hand";
+        this.staticText = "Target player reveals their hand. You gain life equal to the number of cards in that player's hand";
     }
 
     public SearchWarrantEffect(final SearchWarrantEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SecondSunrise.java b/Mage.Sets/src/mage/cards/s/SecondSunrise.java
index 8940e37f197..4d52a91839e 100644
--- a/Mage.Sets/src/mage/cards/s/SecondSunrise.java
+++ b/Mage.Sets/src/mage/cards/s/SecondSunrise.java
@@ -55,7 +55,7 @@ public class SecondSunrise extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{W}{W}");
 
 
-        // Each player returns to the battlefield all artifact, creature, enchantment, and land cards in his or her graveyard that were put there from the battlefield this turn.
+        // Each player returns to the battlefield all artifact, creature, enchantment, and land cards in their graveyard that were put there from the battlefield this turn.
         this.getSpellAbility().addEffect(new SecondSunriseEffect());
         this.getSpellAbility().addWatcher(new SecondSunriseWatcher());
     }
@@ -74,7 +74,7 @@ class SecondSunriseEffect extends OneShotEffect {
 
     SecondSunriseEffect() {
         super(Outcome.PutCardInPlay);
-        staticText = "Each player returns to the battlefield all artifact, creature, enchantment, and land cards in his or her graveyard that were put there from the battlefield this turn";
+        staticText = "Each player returns to the battlefield all artifact, creature, enchantment, and land cards in their graveyard that were put there from the battlefield this turn";
     }
 
     SecondSunriseEffect(final SecondSunriseEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SeerOfTheLastTomorrow.java b/Mage.Sets/src/mage/cards/s/SeerOfTheLastTomorrow.java
index 6b62dfca546..e88f44e6bd1 100644
--- a/Mage.Sets/src/mage/cards/s/SeerOfTheLastTomorrow.java
+++ b/Mage.Sets/src/mage/cards/s/SeerOfTheLastTomorrow.java
@@ -56,7 +56,7 @@ public class SeerOfTheLastTomorrow extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(4);
 
-        // {U}, {T}, Discard a card: Target player puts the top three cards of his or her library into his or her graveyard.
+        // {U}, {T}, Discard a card: Target player puts the top three cards of their library into their graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(3), new ManaCostsImpl("{U}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new DiscardCardCost());
diff --git a/Mage.Sets/src/mage/cards/s/SelhoffOccultist.java b/Mage.Sets/src/mage/cards/s/SelhoffOccultist.java
index 024337de4e8..bfcfe8c78aa 100644
--- a/Mage.Sets/src/mage/cards/s/SelhoffOccultist.java
+++ b/Mage.Sets/src/mage/cards/s/SelhoffOccultist.java
@@ -52,7 +52,7 @@ public class SelhoffOccultist extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(3);
 
-        // Whenever Selhoff Occultist or another creature dies, target player puts the top card of his or her library into his or her graveyard.
+        // Whenever Selhoff Occultist or another creature dies, target player puts the top card of their library into their graveyard.
         Ability ability = new DiesThisOrAnotherCreatureTriggeredAbility(new PutLibraryIntoGraveTargetEffect(1), false);
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/s/SelvalaExplorerReturned.java b/Mage.Sets/src/mage/cards/s/SelvalaExplorerReturned.java
index be6ae2e4914..8dee5649453 100644
--- a/Mage.Sets/src/mage/cards/s/SelvalaExplorerReturned.java
+++ b/Mage.Sets/src/mage/cards/s/SelvalaExplorerReturned.java
@@ -62,7 +62,7 @@ public class SelvalaExplorerReturned extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(4);
 
-        // Parley - {T}: Each player reveals the top card of his or her library. For each nonland card revealed this way, add {G} to your mana pool and you gain 1 life. Then each player draws a card.
+        // Parley - {T}: Each player reveals the top card of their library. For each nonland card revealed this way, add {G} to your mana pool and you gain 1 life. Then each player draws a card.
         ActivatedManaAbilityImpl manaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, new SelvalaExplorerReturnedEffect(), new TapSourceCost(), false);
         manaAbility.setUndoPossible(false);
         manaAbility.setAbilityWord(AbilityWord.PARLEY);
@@ -85,7 +85,7 @@ public class SelvalaExplorerReturned extends CardImpl {
 class SelvalaExplorerReturnedEffect extends ManaEffect {
 
     public SelvalaExplorerReturnedEffect() {
-        this.staticText = "Each player reveals the top card of his or her library. For each nonland card revealed this way, add {G} to your mana pool and you gain 1 life";
+        this.staticText = "Each player reveals the top card of their library. For each nonland card revealed this way, add {G} to your mana pool and you gain 1 life";
     }
 
     public SelvalaExplorerReturnedEffect(final SelvalaExplorerReturnedEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SelvalasCharge.java b/Mage.Sets/src/mage/cards/s/SelvalasCharge.java
index 24380534add..616e2f69c5d 100644
--- a/Mage.Sets/src/mage/cards/s/SelvalasCharge.java
+++ b/Mage.Sets/src/mage/cards/s/SelvalasCharge.java
@@ -51,7 +51,7 @@ public class SelvalasCharge extends CardImpl {
     public SelvalasCharge(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{G}");
 
-        // Parley - Each player reveals the top card of his or her library. For each nonland card revealed this way, you create a 3/3 green Elephant creature token. Then each player draws a card.
+        // Parley - Each player reveals the top card of their library. For each nonland card revealed this way, you create a 3/3 green Elephant creature token. Then each player draws a card.
         this.getSpellAbility().addEffect(new SelvalasChargeEffect());
         Effect effect = new DrawCardAllEffect(1);
         effect.setText("Then each player draws a card");
@@ -72,7 +72,7 @@ class SelvalasChargeEffect extends OneShotEffect {
 
     public SelvalasChargeEffect() {
         super(Outcome.Benefit);
-        this.staticText = "<i>Parley &mdash; </i> Each player reveals the top card of his or her library. For each nonland card revealed this way, you create a 3/3 green Elephant creature token";
+        this.staticText = "<i>Parley &mdash; </i> Each player reveals the top card of their library. For each nonland card revealed this way, you create a 3/3 green Elephant creature token";
     }
 
     public SelvalasChargeEffect(final SelvalasChargeEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SelvalasEnforcer.java b/Mage.Sets/src/mage/cards/s/SelvalasEnforcer.java
index 901258afa15..0f0a15ee8b6 100644
--- a/Mage.Sets/src/mage/cards/s/SelvalasEnforcer.java
+++ b/Mage.Sets/src/mage/cards/s/SelvalasEnforcer.java
@@ -58,7 +58,7 @@ public class SelvalasEnforcer extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        // Parley - When Selvala's Enforcer enters the battlefield, each player reveals the top card of his or her library. 
+        // Parley - When Selvala's Enforcer enters the battlefield, each player reveals the top card of their library.
         // For each nonland card revealed this way, put a +1/+1 counter on Selvala's Enforcer. Then each player draws a card.
         Ability ability = new EntersBattlefieldTriggeredAbility(new SelvalasEnforcerEffect(), false, "<i>Parley &mdash; </i>");
         Effect effect = new DrawCardAllEffect(1);
@@ -81,7 +81,7 @@ class SelvalasEnforcerEffect extends OneShotEffect {
 
     public SelvalasEnforcerEffect() {
         super(Outcome.Benefit);
-        this.staticText = "each player reveals the top card of his or her library. For each nonland card revealed this way, put a +1/+1 counter on {this}";
+        this.staticText = "each player reveals the top card of their library. For each nonland card revealed this way, put a +1/+1 counter on {this}";
     }
 
     public SelvalasEnforcerEffect(final SelvalasEnforcerEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SenTriplets.java b/Mage.Sets/src/mage/cards/s/SenTriplets.java
index 73d66b5ef0a..4646a0bbb2c 100644
--- a/Mage.Sets/src/mage/cards/s/SenTriplets.java
+++ b/Mage.Sets/src/mage/cards/s/SenTriplets.java
@@ -59,7 +59,7 @@ public class SenTriplets extends CardImpl {
         this.toughness = new MageInt(3);
 
         // At the beginning of your upkeep, choose target opponent. 
-        // This turn, that player can't cast spells or activate abilities and plays with his or her hand revealed. 
+        // This turn, that player can't cast spells or activate abilities and plays with their hand revealed.
         // You may play cards from that player's hand this turn.
         Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SenTripletsRuleModifyingEffect(), TargetController.YOU, false, false);
         ability.addEffect(new SenTripletsOpponentRevealsHandEffect());
@@ -125,7 +125,7 @@ class SenTripletsOpponentRevealsHandEffect extends ContinuousEffectImpl {
 
     public SenTripletsOpponentRevealsHandEffect() {
         super(Duration.EndOfTurn, Layer.PlayerEffects, SubLayer.NA, Outcome.Detriment);
-        staticText = "and plays with his or her hand revealed";
+        staticText = "and plays with their hand revealed";
     }
 
     public SenTripletsOpponentRevealsHandEffect(final SenTripletsOpponentRevealsHandEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SensationGorger.java b/Mage.Sets/src/mage/cards/s/SensationGorger.java
index 78e4c0ff77a..27badf94edc 100644
--- a/Mage.Sets/src/mage/cards/s/SensationGorger.java
+++ b/Mage.Sets/src/mage/cards/s/SensationGorger.java
@@ -53,7 +53,7 @@ public class SensationGorger extends CardImpl {
         this.toughness = new MageInt(2);
 
         // Kinship - At the beginning of your upkeep, you may look at the top card of your library. If it shares a creature type with Sensation Gorger, you may reveal it. 
-        // If you do, each player discards his or her hand, then draws four cards.
+        // If you do, each player discards their hand, then draws four cards.
         KinshipAbility ability = new KinshipAbility(new DiscardHandAllEffect());
         Effect effect = new DrawCardAllEffect(4);
         effect.setText(", then draws four cards");
diff --git a/Mage.Sets/src/mage/cards/s/SettleTheWreckage.java b/Mage.Sets/src/mage/cards/s/SettleTheWreckage.java
index 7cc8bd744ad..11392ad722a 100644
--- a/Mage.Sets/src/mage/cards/s/SettleTheWreckage.java
+++ b/Mage.Sets/src/mage/cards/s/SettleTheWreckage.java
@@ -53,7 +53,7 @@ public class SettleTheWreckage extends CardImpl {
     public SettleTheWreckage(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{2}{W}{W}");
 
-        // Exile all attacking creatures target player controls. That player may search his or her library for that many basic land cards, put those cards onto the battlefield tapped, then shuffle his or her library.
+        // Exile all attacking creatures target player controls. That player may search their library for that many basic land cards, put those cards onto the battlefield tapped, then shuffle their library.
         this.getSpellAbility().addEffect(new SettleTheWreckageEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
@@ -72,7 +72,7 @@ class SettleTheWreckageEffect extends OneShotEffect {
 
     SettleTheWreckageEffect() {
         super(Outcome.Neutral);
-        this.staticText = "Exile all attacking creatures target player controls. That player may search his or her library for that many basic land cards, put those cards onto the battlefield tapped, then shuffle his or her library";
+        this.staticText = "Exile all attacking creatures target player controls. That player may search their library for that many basic land cards, put those cards onto the battlefield tapped, then shuffle their library";
     }
 
     SettleTheWreckageEffect(final SettleTheWreckageEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SewerNemesis.java b/Mage.Sets/src/mage/cards/s/SewerNemesis.java
index 3fa77b73a91..32419f7e97e 100644
--- a/Mage.Sets/src/mage/cards/s/SewerNemesis.java
+++ b/Mage.Sets/src/mage/cards/s/SewerNemesis.java
@@ -68,7 +68,7 @@ public class SewerNemesis extends CardImpl {
         this.addAbility(new AsEntersBattlefieldAbility(new ChoosePlayerEffect(Outcome.Detriment)));
         // Sewer Nemesis's power and toughness are each equal to the number of cards in the chosen player's graveyard.
         this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInTargetOpponentsGraveyardCount(), Duration.WhileOnBattlefield)));
-        // Whenever the chosen player casts a spell, that player puts the top card of his or her library into his or her graveyard.
+        // Whenever the chosen player casts a spell, that player puts the top card of their library into their graveyard.
         this.addAbility(new SewerNemesisTriggeredAbility());
 
     }
@@ -140,7 +140,7 @@ class SewerNemesisTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "Whenever the chosen player casts a spell, that player puts the top card of his or her library into his or her graveyard.";
+        return "Whenever the chosen player casts a spell, that player puts the top card of their library into their graveyard.";
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/cards/s/ShapeAnew.java b/Mage.Sets/src/mage/cards/s/ShapeAnew.java
index 1f8ec868dad..8db084704af 100644
--- a/Mage.Sets/src/mage/cards/s/ShapeAnew.java
+++ b/Mage.Sets/src/mage/cards/s/ShapeAnew.java
@@ -58,8 +58,8 @@ public class ShapeAnew extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{U}");
 
         // The controller of target artifact sacrifices it, then reveals cards from the top
-        // of his or her library until he or she reveals an artifact card. That player puts
-        // that card onto the battlefield, then shuffles all other cards revealed this way into his or her library.
+        // of their library until he or she reveals an artifact card. That player puts
+        // that card onto the battlefield, then shuffles all other cards revealed this way into their library.
         this.getSpellAbility().addEffect(new SacrificeTargetEffect("The controller of target artifact sacrifices it"));
         this.getSpellAbility().addTarget(new TargetPermanent(filter));
         this.getSpellAbility().addEffect(new ShapeAnewEffect());
@@ -78,7 +78,7 @@ public class ShapeAnew extends CardImpl {
 
         public ShapeAnewEffect() {
             super(Outcome.PutCardInPlay);
-            staticText = ", then reveals cards from the top of his or her library until he or she reveals an artifact card. That player puts that card onto the battlefield, then shuffles all other cards revealed this way into his or her library";
+            staticText = ", then reveals cards from the top of their library until he or she reveals an artifact card. That player puts that card onto the battlefield, then shuffles all other cards revealed this way into their library";
         }
 
         public ShapeAnewEffect(ShapeAnewEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/ShapeshiftersMarrow.java b/Mage.Sets/src/mage/cards/s/ShapeshiftersMarrow.java
index 6e92d04b678..3db3dd5dee3 100644
--- a/Mage.Sets/src/mage/cards/s/ShapeshiftersMarrow.java
+++ b/Mage.Sets/src/mage/cards/s/ShapeshiftersMarrow.java
@@ -50,7 +50,7 @@ public class ShapeshiftersMarrow extends CardImpl {
     public ShapeshiftersMarrow(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}{U}");
 
-        // At the beginning of each opponent's upkeep, that player reveals the top card of his or her library. If it's a creature card, the player puts the card into his or her graveyard and Shapeshifter's Marrow becomes a copy of that card. (If it does, it loses this ability.)
+        // At the beginning of each opponent's upkeep, that player reveals the top card of their library. If it's a creature card, the player puts the card into their graveyard and Shapeshifter's Marrow becomes a copy of that card. (If it does, it loses this ability.)
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new ShapeshiftersMarrowEffect(), TargetController.OPPONENT, false));
     }
 
@@ -67,7 +67,7 @@ public class ShapeshiftersMarrow extends CardImpl {
 
         public ShapeshiftersMarrowEffect() {
             super(Outcome.BecomeCreature);
-            this.staticText = "that player reveals the top card of his or her library. If it's a creature card, the player puts the card into his or her graveyard and {this} becomes a copy of that card. (If it does, it loses this ability.)";
+            this.staticText = "that player reveals the top card of their library. If it's a creature card, the player puts the card into their graveyard and {this} becomes a copy of that card. (If it does, it loses this ability.)";
         }
 
         public ShapeshiftersMarrowEffect(final ShapeshiftersMarrowEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SharedFate.java b/Mage.Sets/src/mage/cards/s/SharedFate.java
index 046eb494759..2cd3bd6603f 100644
--- a/Mage.Sets/src/mage/cards/s/SharedFate.java
+++ b/Mage.Sets/src/mage/cards/s/SharedFate.java
@@ -58,7 +58,7 @@ public class SharedFate extends CardImpl {
     public SharedFate(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{4}{U}");
 
-        // If a player would draw a card, that player exiles the top card of one of his or her opponents' libraries face down instead.
+        // If a player would draw a card, that player exiles the top card of one of their opponents' libraries face down instead.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SharedFateReplacementEffect()));
 
         // Each player may look at and play cards he or she exiled with Shared Fate.
@@ -80,7 +80,7 @@ class SharedFateReplacementEffect extends ReplacementEffectImpl {
 
     SharedFateReplacementEffect() {
         super(Duration.WhileOnBattlefield, Outcome.Neutral);
-        this.staticText = "If a player would draw a card, that player exiles the top card of one of his or her opponents' libraries face down instead";
+        this.staticText = "If a player would draw a card, that player exiles the top card of one of their opponents' libraries face down instead";
     }
 
     SharedFateReplacementEffect(final SharedFateReplacementEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SharedTrauma.java b/Mage.Sets/src/mage/cards/s/SharedTrauma.java
index 753a1693a66..80df7d5a6ff 100644
--- a/Mage.Sets/src/mage/cards/s/SharedTrauma.java
+++ b/Mage.Sets/src/mage/cards/s/SharedTrauma.java
@@ -53,7 +53,7 @@ public class SharedTrauma extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}");
 
 
-        // Join forces - Starting with you, each player may pay any amount of mana. Each player puts the top X cards of his or her library into his or her graveyard, where X is the total amount of mana paid this way.
+        // Join forces - Starting with you, each player may pay any amount of mana. Each player puts the top X cards of their library into their graveyard, where X is the total amount of mana paid this way.
         this.getSpellAbility().addEffect(new SharedTraumaEffect());
     }
 
@@ -71,7 +71,7 @@ class SharedTraumaEffect extends OneShotEffect {
 
     public SharedTraumaEffect() {
         super(Outcome.Detriment);
-        this.staticText = "<i>Join forces</i> - Starting with you, each player may pay any amount of mana. Each player puts the top X cards of his or her library into his or her graveyard, where X is the total amount of mana paid this way";
+        this.staticText = "<i>Join forces</i> - Starting with you, each player may pay any amount of mana. Each player puts the top X cards of their library into their graveyard, where X is the total amount of mana paid this way";
     }
 
     public SharedTraumaEffect(final SharedTraumaEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/ShatteredDreams.java b/Mage.Sets/src/mage/cards/s/ShatteredDreams.java
index d05243e7d7c..d20e3c6c43f 100644
--- a/Mage.Sets/src/mage/cards/s/ShatteredDreams.java
+++ b/Mage.Sets/src/mage/cards/s/ShatteredDreams.java
@@ -51,7 +51,7 @@ public class ShatteredDreams extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}");
 
 
-        // Target opponent reveals his or her hand. You choose an artifact card from it. That player discards that card.
+        // Target opponent reveals their hand. You choose an artifact card from it. That player discards that card.
         this.getSpellAbility().addTarget(new TargetOpponent());
         this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(filter));
     }
diff --git a/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java b/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java
index 15022713e93..875e88cfff7 100644
--- a/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java
+++ b/Mage.Sets/src/mage/cards/s/ShieldmageAdvocate.java
@@ -65,9 +65,9 @@ public class ShieldmageAdvocate extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(3);
 
-        // {tap}: Return target card from an opponent's graveyard to his or her hand. Prevent all damage that would be dealt to target creature or player this turn by a source of your choice.
+        // {tap}: Return target card from an opponent's graveyard to their hand. Prevent all damage that would be dealt to target creature or player this turn by a source of your choice.
         Effect effect = new ReturnFromGraveyardToHandTargetEffect();
-        effect.setText("Return target card from an opponent's graveyard to his or her hand");
+        effect.setText("Return target card from an opponent's graveyard to their hand");
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapSourceCost());
 
         effect = new ShieldmageAdvocateEffect();
diff --git a/Mage.Sets/src/mage/cards/s/ShimianSpecter.java b/Mage.Sets/src/mage/cards/s/ShimianSpecter.java
index edb5141e933..7de1ea8bc91 100644
--- a/Mage.Sets/src/mage/cards/s/ShimianSpecter.java
+++ b/Mage.Sets/src/mage/cards/s/ShimianSpecter.java
@@ -68,7 +68,7 @@ public class ShimianSpecter extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
 
-        // Whenever Shimian Specter deals combat damage to a player, that player reveals his or her hand. You choose a nonland card from it. Search that player's graveyard, hand, and library for all cards with the same name as that card and exile them. Then that player shuffles his or her library.
+        // Whenever Shimian Specter deals combat damage to a player, that player reveals their hand. You choose a nonland card from it. Search that player's graveyard, hand, and library for all cards with the same name as that card and exile them. Then that player shuffles their library.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new ShimianSpecterEffect(), false, true));
     }
 
@@ -92,7 +92,7 @@ class ShimianSpecterEffect extends OneShotEffect {
 
     public ShimianSpecterEffect() {
         super(Outcome.Benefit);
-        staticText = "that player reveals his or her hand. You choose a nonland card from it. Search that player's graveyard, hand, and library for all cards with the same name as that card and exile them. Then that player shuffles his or her library";
+        staticText = "that player reveals their hand. You choose a nonland card from it. Search that player's graveyard, hand, and library for all cards with the same name as that card and exile them. Then that player shuffles their library";
     }
 
     public ShimianSpecterEffect(final ShimianSpecterEffect effect) {
@@ -148,7 +148,7 @@ class ShimianSpecterEffect extends OneShotEffect {
             }
 
             // search cards in Library
-            // If the player has no nonland cards in his or her hand, you can still search that player's library and have him or her shuffle it.
+            // If the player has no nonland cards in their hand, you can still search that player's library and have him or her shuffle it.
             if (chosenCard != null || controller.chooseUse(outcome, "Search library anyway?", source, game)) {
                 TargetCardInLibrary targetCardsLibrary = new TargetCardInLibrary(0, Integer.MAX_VALUE, filterNamedCards);
                 controller.searchLibrary(targetCardsLibrary, game, targetPlayer.getId());
diff --git a/Mage.Sets/src/mage/cards/s/ShisatoWhisperingHunter.java b/Mage.Sets/src/mage/cards/s/ShisatoWhisperingHunter.java
index 674c8f6bf12..025af26c308 100644
--- a/Mage.Sets/src/mage/cards/s/ShisatoWhisperingHunter.java
+++ b/Mage.Sets/src/mage/cards/s/ShisatoWhisperingHunter.java
@@ -66,7 +66,7 @@ public class ShisatoWhisperingHunter extends CardImpl {
 
         // At the beginning of your upkeep, sacrifice a Snake.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeControllerEffect(filter, 1,""), TargetController.YOU, false));
-        // Whenever Shisato, Whispering Hunter deals combat damage to a player, that player skips his or her next untap step.
+        // Whenever Shisato, Whispering Hunter deals combat damage to a player, that player skips their next untap step.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new SkipNextPlayerUntapStepEffect("that "),false, true));
     }
 
diff --git a/Mage.Sets/src/mage/cards/s/ShizukoCallerOfAutumn.java b/Mage.Sets/src/mage/cards/s/ShizukoCallerOfAutumn.java
index 6198803658e..1ef8495c694 100644
--- a/Mage.Sets/src/mage/cards/s/ShizukoCallerOfAutumn.java
+++ b/Mage.Sets/src/mage/cards/s/ShizukoCallerOfAutumn.java
@@ -56,9 +56,9 @@ public class ShizukoCallerOfAutumn extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(3);
 
-        // At the beginning of each player's upkeep, that player adds {G}{G}{G} to his or her mana pool. Until end of turn, this mana doesn't empty from that player's mana pool as steps and phases end.
+        // At the beginning of each player's upkeep, that player adds {G}{G}{G} to their mana pool. Until end of turn, this mana doesn't empty from that player's mana pool as steps and phases end.
         Effect effect = new AddManaToManaPoolTargetControllerEffect(Mana.GreenMana(3), "that player", true);
-        effect.setText("that player adds {G}{G}{G} to his or her mana pool. Until end of turn, this mana doesn't empty from that player's mana pool as steps and phases end");        
+        effect.setText("that player adds {G}{G}{G} to their mana pool. Until end of turn, this mana doesn't empty from that player's mana pool as steps and phases end");
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, effect, TargetController.ANY, false));
         
     }
diff --git a/Mage.Sets/src/mage/cards/s/Shocker.java b/Mage.Sets/src/mage/cards/s/Shocker.java
index a2246280df2..a9546567ebb 100644
--- a/Mage.Sets/src/mage/cards/s/Shocker.java
+++ b/Mage.Sets/src/mage/cards/s/Shocker.java
@@ -53,7 +53,7 @@ public class Shocker extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        // Whenever Shocker deals damage to a player, that player discards all the cards in his or her hand, then draws that many cards.
+        // Whenever Shocker deals damage to a player, that player discards all the cards in their hand, then draws that many cards.
         this.addAbility(new DealsDamageToAPlayerTriggeredAbility(new ShockerEffect(), false, true));
     }
 
@@ -70,7 +70,7 @@ class ShockerEffect extends OneShotEffect {
 
     public ShockerEffect() {
         super(Outcome.Discard);
-        this.staticText = " that player discards all the cards in his or her hand, then draws that many cards";
+        this.staticText = " that player discards all the cards in their hand, then draws that many cards";
     }
 
     public ShockerEffect(final ShockerEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/ShowAndTell.java b/Mage.Sets/src/mage/cards/s/ShowAndTell.java
index a0e285c5ad0..b1ff6bb5714 100644
--- a/Mage.Sets/src/mage/cards/s/ShowAndTell.java
+++ b/Mage.Sets/src/mage/cards/s/ShowAndTell.java
@@ -56,7 +56,7 @@ public class ShowAndTell extends CardImpl {
     public ShowAndTell(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{U}");
 
-        // Each player may put an artifact, creature, enchantment, or land card from his or her hand onto the battlefield.
+        // Each player may put an artifact, creature, enchantment, or land card from their hand onto the battlefield.
         this.getSpellAbility().addEffect(new ShowAndTellEffect());
     }
 
@@ -85,7 +85,7 @@ class ShowAndTellEffect extends OneShotEffect {
 
     public ShowAndTellEffect() {
         super(Outcome.PutCardInPlay);
-        this.staticText = "Each player may put an artifact, creature, enchantment, or land card from his or her hand onto the battlefield";
+        this.staticText = "Each player may put an artifact, creature, enchantment, or land card from their hand onto the battlefield";
     }
 
     public ShowAndTellEffect(final ShowAndTellEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/Shriekgeist.java b/Mage.Sets/src/mage/cards/s/Shriekgeist.java
index 7b73933c0ec..3007b1fabc1 100644
--- a/Mage.Sets/src/mage/cards/s/Shriekgeist.java
+++ b/Mage.Sets/src/mage/cards/s/Shriekgeist.java
@@ -58,7 +58,7 @@ public class Shriekgeist extends CardImpl {
         this.toughness = new MageInt(1);
 
         this.addAbility(FlyingAbility.getInstance());
-        // Whenever Shriekgeist deals combat damage to a player, that player puts the top two cards of his or her library into his or her graveyard.
+        // Whenever Shriekgeist deals combat damage to a player, that player puts the top two cards of their library into their graveyard.
         this.addAbility(new ShriekgeistTriggeredAbility());
     }
 
@@ -106,6 +106,6 @@ class ShriekgeistTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "Whenever {this} deals combat damage to a player, that player puts the top two cards of his or her library into his or her graveyard.";
+        return "Whenever {this} deals combat damage to a player, that player puts the top two cards of their library into their graveyard.";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/s/SibsigHost.java b/Mage.Sets/src/mage/cards/s/SibsigHost.java
index 5d9166ea2be..66de94cb319 100644
--- a/Mage.Sets/src/mage/cards/s/SibsigHost.java
+++ b/Mage.Sets/src/mage/cards/s/SibsigHost.java
@@ -49,7 +49,7 @@ public class SibsigHost extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(6);
 
-        // When Sibsig Host enters the battlefield, each player puts the top three cards of his or her library into his or her graveyard.
+        // When Sibsig Host enters the battlefield, each player puts the top three cards of their library into their graveyard.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new PutTopCardOfLibraryIntoGraveEachPlayerEffect(3, TargetController.ANY)));
     }
 
diff --git a/Mage.Sets/src/mage/cards/s/SinCollector.java b/Mage.Sets/src/mage/cards/s/SinCollector.java
index 3d82099e15b..68ab478c2ec 100644
--- a/Mage.Sets/src/mage/cards/s/SinCollector.java
+++ b/Mage.Sets/src/mage/cards/s/SinCollector.java
@@ -56,7 +56,7 @@ public class SinCollector extends CardImpl {
         this.toughness = new MageInt(1);
 
 
-        // When Sin Collector enters the battlefield, target opponent reveals his or her hand. You choose an instant or sorcery card from it and exile that card.
+        // When Sin Collector enters the battlefield, target opponent reveals their hand. You choose an instant or sorcery card from it and exile that card.
         Ability ability = new EntersBattlefieldTriggeredAbility(new ExileCardYouChooseTargetOpponentEffect(new FilterInstantOrSorceryCard("an instant or sorcery card")));
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/s/SingeMindOgre.java b/Mage.Sets/src/mage/cards/s/SingeMindOgre.java
index 16dee3e818b..27b22e8df76 100644
--- a/Mage.Sets/src/mage/cards/s/SingeMindOgre.java
+++ b/Mage.Sets/src/mage/cards/s/SingeMindOgre.java
@@ -58,7 +58,7 @@ public class SingeMindOgre extends CardImpl {
         this.power = new MageInt(3);
         this.toughness = new MageInt(2);
 
-        // When Singe-Mind Ogre enters the battlefield, target player reveals a card at random from his or her hand, then loses life equal to that card's converted mana cost.
+        // When Singe-Mind Ogre enters the battlefield, target player reveals a card at random from their hand, then loses life equal to that card's converted mana cost.
         Ability ability = new EntersBattlefieldTriggeredAbility(new SingeMindOgreEffect(), false);
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
@@ -79,7 +79,7 @@ class SingeMindOgreEffect extends OneShotEffect {
 
     public SingeMindOgreEffect() {
         super(Outcome.LoseLife);
-        this.staticText = "target player reveals a card at random from his or her hand, then loses life equal to that card's converted mana cost";
+        this.staticText = "target player reveals a card at random from their hand, then loses life equal to that card's converted mana cost";
     }
 
     public SingeMindOgreEffect(final SingeMindOgreEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SireOfInsanity.java b/Mage.Sets/src/mage/cards/s/SireOfInsanity.java
index 8e9ae1892eb..5791045b729 100644
--- a/Mage.Sets/src/mage/cards/s/SireOfInsanity.java
+++ b/Mage.Sets/src/mage/cards/s/SireOfInsanity.java
@@ -58,7 +58,7 @@ public class SireOfInsanity extends CardImpl {
         this.power = new MageInt(6);
         this.toughness = new MageInt(4);
 
-        // At the beginning of each end step, each player discards his or her hand.
+        // At the beginning of each end step, each player discards their hand.
         this.addAbility(new OnEventTriggeredAbility(GameEvent.EventType.END_TURN_STEP_PRE, "beginning of each end step", true, new SireOfInsanityEffect()));
 
     }
@@ -77,7 +77,7 @@ public class SireOfInsanity extends CardImpl {
 class SireOfInsanityEffect extends OneShotEffect {
     SireOfInsanityEffect() {
         super(Outcome.Discard);
-        staticText = "each player discards his or her hand";
+        staticText = "each player discards their hand";
     }
 
     SireOfInsanityEffect(final SireOfInsanityEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SireOfStagnation.java b/Mage.Sets/src/mage/cards/s/SireOfStagnation.java
index e223aeecbfe..655ce6cdbce 100644
--- a/Mage.Sets/src/mage/cards/s/SireOfStagnation.java
+++ b/Mage.Sets/src/mage/cards/s/SireOfStagnation.java
@@ -51,7 +51,7 @@ import mage.filter.predicate.permanent.ControllerPredicate;
 public class SireOfStagnation extends CardImpl {
 
     private static final FilterLandPermanent filter = new FilterLandPermanent();
-    private static final String rule = "Whenever a land enters the battlefield under an opponent's control, that player exiles the top two cards of his or her library and you draw two cards.";
+    private static final String rule = "Whenever a land enters the battlefield under an opponent's control, that player exiles the top two cards of their library and you draw two cards.";
 
     static {
         filter.add(new ControllerPredicate(TargetController.OPPONENT));
@@ -66,7 +66,7 @@ public class SireOfStagnation extends CardImpl {
         // Devoid <i>(This card has no color.)</i>
         this.addAbility(new DevoidAbility(this.color));
 
-        // Whenever a land enters the battlefield under an opponent's control, that player exiles the top two cards of his or her library and you draw two cards.
+        // Whenever a land enters the battlefield under an opponent's control, that player exiles the top two cards of their library and you draw two cards.
         Ability ability = new EntersBattlefieldAllTriggeredAbility(Zone.BATTLEFIELD,
                 new ExileCardsFromTopOfLibraryTargetEffect(2, "that player"), filter, false, SetTargetPointer.PLAYER, rule, false);
         ability.addEffect(new DrawCardSourceControllerEffect(2));
diff --git a/Mage.Sets/src/mage/cards/s/SirenOfTheSilentSong.java b/Mage.Sets/src/mage/cards/s/SirenOfTheSilentSong.java
index e87d712941e..dcc45468175 100644
--- a/Mage.Sets/src/mage/cards/s/SirenOfTheSilentSong.java
+++ b/Mage.Sets/src/mage/cards/s/SirenOfTheSilentSong.java
@@ -57,10 +57,10 @@ public class SirenOfTheSilentSong extends CardImpl {
 
         // Flying
         this.addAbility(FlyingAbility.getInstance());
-        // <i>Inspired</i> - Whenever Siren of the Silent Song becomes untapped, each opponent discards a card, then puts the top card of his or her library into his or her graveyard.
+        // <i>Inspired</i> - Whenever Siren of the Silent Song becomes untapped, each opponent discards a card, then puts the top card of their library into their graveyard.
         Ability ability = new InspiredAbility(new DiscardEachPlayerEffect(TargetController.OPPONENT));
         Effect effect = new PutTopCardOfLibraryIntoGraveEachPlayerEffect(1, TargetController.OPPONENT);
-        effect.setText(", then puts the top card of his or her library into his or her graveyard");
+        effect.setText(", then puts the top card of their library into their graveyard");
         ability.addEffect(effect);
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/s/Skullwinder.java b/Mage.Sets/src/mage/cards/s/Skullwinder.java
index 1f4a643efb1..21dcbe76fd5 100644
--- a/Mage.Sets/src/mage/cards/s/Skullwinder.java
+++ b/Mage.Sets/src/mage/cards/s/Skullwinder.java
@@ -63,7 +63,7 @@ public class Skullwinder extends CardImpl {
         // Deathtouch
         this.addAbility(DeathtouchAbility.getInstance());
 
-        // When Skullwinder enters the battlefield, return target card from your graveyard to your hand, then choose an opponent. That player returns a card from his or her graveyard to his or her hand.
+        // When Skullwinder enters the battlefield, return target card from your graveyard to your hand, then choose an opponent. That player returns a card from their graveyard to their hand.
         Ability ability = new EntersBattlefieldTriggeredAbility(new ReturnFromGraveyardToHandTargetEffect());
         ability.addTarget(new TargetCardInYourGraveyard());
         ability.addEffect(new SkullwinderEffect());
@@ -84,7 +84,7 @@ class SkullwinderEffect extends OneShotEffect {
 
     public SkullwinderEffect() {
         super(Outcome.Benefit);
-        this.staticText = ", then choose an opponent. That player returns a card from his or her graveyard to his or her hand";
+        this.staticText = ", then choose an opponent. That player returns a card from their graveyard to their hand";
     }
 
     public SkullwinderEffect(final SkullwinderEffect effect) {
@@ -106,7 +106,7 @@ class SkullwinderEffect extends OneShotEffect {
                 Player opponent = game.getPlayer(targetOpponent.getFirstTarget());
                 if (opponent != null) {
                     game.informPlayers(sourceObject.getLogName() + ": " + controller.getLogName() + " has chosen " + opponent.getLogName());
-                    // That player returns a card from his or her graveyard to his or her hand
+                    // That player returns a card from their graveyard to their hand
                     TargetCardInYourGraveyard targetCard = new TargetCardInYourGraveyard(new FilterCard("a card from your graveyard to return to your hand"));
                     targetCard.setNotTarget(true);
                     if (opponent.choose(outcome, targetCard, source.getSourceId(), game)) {
diff --git a/Mage.Sets/src/mage/cards/s/SlaughterGames.java b/Mage.Sets/src/mage/cards/s/SlaughterGames.java
index d8bf5788720..c9f3f01325f 100644
--- a/Mage.Sets/src/mage/cards/s/SlaughterGames.java
+++ b/Mage.Sets/src/mage/cards/s/SlaughterGames.java
@@ -57,7 +57,7 @@ public class SlaughterGames extends CardImpl {
         ability.setRuleAtTheTop(true);
         this.addAbility(ability);
 
-        // Name a nonland card. Search target opponent's graveyard, hand, and library for any number of cards with that name and exile them. Then that player shuffles his or her library.
+        // Name a nonland card. Search target opponent's graveyard, hand, and library for any number of cards with that name and exile them. Then that player shuffles their library.
         this.getSpellAbility().addEffect(new NameACardEffect(NameACardEffect.TypeOfName.NON_LAND_NAME));
         this.getSpellAbility().addEffect(new SlaughterGamesEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
diff --git a/Mage.Sets/src/mage/cards/s/SoldierOfFortune.java b/Mage.Sets/src/mage/cards/s/SoldierOfFortune.java
index 6b90c70df78..1f7b3d56a75 100644
--- a/Mage.Sets/src/mage/cards/s/SoldierOfFortune.java
+++ b/Mage.Sets/src/mage/cards/s/SoldierOfFortune.java
@@ -55,7 +55,7 @@ public class SoldierOfFortune extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 		
-		// {R}, {T}: Target player shuffles his or her library.
+		// {R}, {T}: Target player shuffles their library.
 		Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ShuffleLibraryTargetEffect(), new TapSourceCost());
 		ability.addManaCost(new ManaCostsImpl("{R}"));
 		ability.addTarget(new TargetPlayer());
diff --git a/Mage.Sets/src/mage/cards/s/SoratamiMindsweeper.java b/Mage.Sets/src/mage/cards/s/SoratamiMindsweeper.java
index ddbe3c11e25..9b8d31b58cb 100644
--- a/Mage.Sets/src/mage/cards/s/SoratamiMindsweeper.java
+++ b/Mage.Sets/src/mage/cards/s/SoratamiMindsweeper.java
@@ -63,7 +63,7 @@ public class SoratamiMindsweeper extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
 
-        // {2}, Return a land you control to its owner's hand: Target player puts the top two cards of his or her library into his or her graveyard.
+        // {2}, Return a land you control to its owner's hand: Target player puts the top two cards of their library into their graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,new PutLibraryIntoGraveTargetEffect(2), new ManaCostsImpl("{2}"));
         ability.addTarget(new TargetPlayer());
         ability.addCost(new ReturnToHandChosenControlledPermanentCost(new TargetControlledPermanent(filter)));
diff --git a/Mage.Sets/src/mage/cards/s/SowingSalt.java b/Mage.Sets/src/mage/cards/s/SowingSalt.java
index cc90497b6a1..a7852ff38db 100644
--- a/Mage.Sets/src/mage/cards/s/SowingSalt.java
+++ b/Mage.Sets/src/mage/cards/s/SowingSalt.java
@@ -45,7 +45,7 @@ public class SowingSalt extends CardImpl {
 
 
         // Exile target nonbasic land. Search its controller's graveyard, hand, and library for all cards with 
-        // the same name as that land and exile them. Then that player shuffles his or her library.
+        // the same name as that land and exile them. Then that player shuffles their library.
         this.getSpellAbility().addTarget(new TargetNonBasicLandPermanent());
         this.getSpellAbility().addEffect(new ExileTargetAndSearchGraveyardHandLibraryEffect(false, "its controller's","all cards with the same name as that land"));
     }
diff --git a/Mage.Sets/src/mage/cards/s/SpectralSearchlight.java b/Mage.Sets/src/mage/cards/s/SpectralSearchlight.java
index 8acd4b732ed..9878aa09327 100644
--- a/Mage.Sets/src/mage/cards/s/SpectralSearchlight.java
+++ b/Mage.Sets/src/mage/cards/s/SpectralSearchlight.java
@@ -49,9 +49,9 @@ public class SpectralSearchlight extends CardImpl {
     public SpectralSearchlight(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
 
-        // {T}: Choose a player. That player adds one mana of any color he or she chooses to his or her mana pool.
+        // {T}: Choose a player. That player adds one mana of any color he or she chooses to their mana pool.
         ManaEffect effect = new AddManaOfAnyColorToManaPoolTargetPlayerEffect("chosen player");
-        effect.setText("That player adds one mana of any color he or she chooses to his or her mana pool");
+        effect.setText("That player adds one mana of any color he or she chooses to their mana pool");
         Ability ability = new SimpleManaAbility(Zone.BATTLEFIELD, effect, new TapSourceCost());
         // choosing player as first effect, before adding mana effect
         ability.getEffects().add(0, new ChoosePlayerEffect(Outcome.PutManaInPool));
diff --git a/Mage.Sets/src/mage/cards/s/Spellshift.java b/Mage.Sets/src/mage/cards/s/Spellshift.java
index 242e80b10a0..a84d1eae980 100644
--- a/Mage.Sets/src/mage/cards/s/Spellshift.java
+++ b/Mage.Sets/src/mage/cards/s/Spellshift.java
@@ -59,7 +59,7 @@ public class Spellshift extends CardImpl {
         this.getSpellAbility().addTarget(new TargetSpell(new FilterInstantOrSorcerySpell()));
         this.getSpellAbility().addEffect(new CounterTargetEffect());
 
-        // Its controller reveals cards from the top of his or her library until he or she reveals an instant or sorcery card. That player may cast that card without paying its mana cost. Then he or she shuffles his or her library.
+        // Its controller reveals cards from the top of their library until he or she reveals an instant or sorcery card. That player may cast that card without paying its mana cost. Then he or she shuffles their library.
         this.getSpellAbility().addEffect(new SpellshiftEffect());
     }
 
@@ -77,7 +77,7 @@ class SpellshiftEffect extends OneShotEffect {
 
     public SpellshiftEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Its controller reveals cards from the top of his or her library until he or she reveals an instant or sorcery card. That player may cast that card without paying its mana cost. Then he or she shuffles his or her library";
+        this.staticText = "Its controller reveals cards from the top of their library until he or she reveals an instant or sorcery card. That player may cast that card without paying its mana cost. Then he or she shuffles their library";
     }
 
     public SpellshiftEffect(final SpellshiftEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SphinxAmbassador.java b/Mage.Sets/src/mage/cards/s/SphinxAmbassador.java
index b9305dbc479..5b4abdc0dd5 100644
--- a/Mage.Sets/src/mage/cards/s/SphinxAmbassador.java
+++ b/Mage.Sets/src/mage/cards/s/SphinxAmbassador.java
@@ -63,7 +63,7 @@ public class SphinxAmbassador extends CardImpl {
         this.toughness = new MageInt(5);
 
         this.addAbility(FlyingAbility.getInstance());
-        // Whenever Sphinx Ambassador deals combat damage to a player, search that player's library for a card, then that player names a card. If you searched for a creature card that isn't the named card, you may put it onto the battlefield under your control. Then that player shuffles his or her library.
+        // Whenever Sphinx Ambassador deals combat damage to a player, search that player's library for a card, then that player names a card. If you searched for a creature card that isn't the named card, you may put it onto the battlefield under your control. Then that player shuffles their library.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new SphinxAmbassadorEffect(), false, true));
     }
 
@@ -81,7 +81,7 @@ class SphinxAmbassadorEffect extends OneShotEffect {
 
     public SphinxAmbassadorEffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "search that player's library for a card, then that player names a card. If you searched for a creature card that isn't the named card, you may put it onto the battlefield under your control. Then that player shuffles his or her library";
+        this.staticText = "search that player's library for a card, then that player names a card. If you searched for a creature card that isn't the named card, you may put it onto the battlefield under your control. Then that player shuffles their library";
     }
 
     public SphinxAmbassadorEffect(final SphinxAmbassadorEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SphinxsTutelage.java b/Mage.Sets/src/mage/cards/s/SphinxsTutelage.java
index eebbc51ab9a..7a764567fca 100644
--- a/Mage.Sets/src/mage/cards/s/SphinxsTutelage.java
+++ b/Mage.Sets/src/mage/cards/s/SphinxsTutelage.java
@@ -55,7 +55,7 @@ public class SphinxsTutelage extends CardImpl {
     public SphinxsTutelage(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}");
 
-        // Whenever you draw a card, target opponent puts the top two cards of his or her library into his or her graveyard. If they're both nonland cards that share a color, repeat this process.
+        // Whenever you draw a card, target opponent puts the top two cards of their library into their graveyard. If they're both nonland cards that share a color, repeat this process.
         Ability ability = new DrawCardControllerTriggeredAbility(new SphinxsTutelageEffect(), false);
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
@@ -78,7 +78,7 @@ class SphinxsTutelageEffect extends OneShotEffect {
 
     public SphinxsTutelageEffect() {
         super(Outcome.Benefit);
-        this.staticText = "target opponent puts the top two cards of his or her library into his or her graveyard. If they're both nonland cards that share a color, repeat this process";
+        this.staticText = "target opponent puts the top two cards of their library into their graveyard. If they're both nonland cards that share a color, repeat this process";
     }
 
     public SphinxsTutelageEffect(final SphinxsTutelageEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/Splinter.java b/Mage.Sets/src/mage/cards/s/Splinter.java
index fdc0522def2..7db5aeff186 100644
--- a/Mage.Sets/src/mage/cards/s/Splinter.java
+++ b/Mage.Sets/src/mage/cards/s/Splinter.java
@@ -48,7 +48,7 @@ public class Splinter extends CardImpl {
 
 
         // Exile target artifact. Search its controller's graveyard, hand, and library for all cards
-        // with the same name as that artifact and exile them. Then that player shuffles his or her library.
+        // with the same name as that artifact and exile them. Then that player shuffles their library.
         this.getSpellAbility().addTarget(new TargetPermanent(filter));
         this.getSpellAbility().addEffect(new ExileTargetAndSearchGraveyardHandLibraryEffect(false, "its controller's","all cards with the same name as that artifact"));
     }
diff --git a/Mage.Sets/src/mage/cards/s/SplittingHeadache.java b/Mage.Sets/src/mage/cards/s/SplittingHeadache.java
index 154e674173e..0791a0ab0c4 100644
--- a/Mage.Sets/src/mage/cards/s/SplittingHeadache.java
+++ b/Mage.Sets/src/mage/cards/s/SplittingHeadache.java
@@ -54,7 +54,7 @@ public class SplittingHeadache extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{B}");
 
 
-        // Choose one - Target player discards two cards; or target player reveals his or her hand, you choose a card from it, then that player discards that card.
+        // Choose one - Target player discards two cards; or target player reveals their hand, you choose a card from it, then that player discards that card.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new DiscardTargetEffect(2));
         Mode mode = new Mode();
@@ -78,7 +78,7 @@ class SplittingHeadacheEffect extends OneShotEffect {
 
     public SplittingHeadacheEffect() {
         super(Outcome.Discard);
-        this.staticText = "Target player reveals his or her hand, you choose a card from it, then that player discards that card.";
+        this.staticText = "Target player reveals their hand, you choose a card from it, then that player discards that card.";
     }
 
     public SplittingHeadacheEffect(final SplittingHeadacheEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SpurnmageAdvocate.java b/Mage.Sets/src/mage/cards/s/SpurnmageAdvocate.java
index 45cac43ef55..86a2f575d65 100644
--- a/Mage.Sets/src/mage/cards/s/SpurnmageAdvocate.java
+++ b/Mage.Sets/src/mage/cards/s/SpurnmageAdvocate.java
@@ -66,7 +66,7 @@ public class SpurnmageAdvocate extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        // {T}: Return two target cards from an opponent's graveyard to his or her hand. Destroy target attacking creature.
+        // {T}: Return two target cards from an opponent's graveyard to their hand. Destroy target attacking creature.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new TapSourceCost());
         ability.addTarget(new TargetCardInASingleGraveyard(2, 2, filter));
         Effect effect = new DestroyTargetEffect();
diff --git a/Mage.Sets/src/mage/cards/s/StainTheMind.java b/Mage.Sets/src/mage/cards/s/StainTheMind.java
index d2d0f3dc6b0..7e2e36f2dff 100644
--- a/Mage.Sets/src/mage/cards/s/StainTheMind.java
+++ b/Mage.Sets/src/mage/cards/s/StainTheMind.java
@@ -49,7 +49,7 @@ public class StainTheMind extends CardImpl {
 
         // Convoke
         this.addAbility(new ConvokeAbility());
-        // Name a nonland card. Search target player's graveyard, hand, and library for any number of card's with that name and exile them. Then that player shuffles his or her library.
+        // Name a nonland card. Search target player's graveyard, hand, and library for any number of card's with that name and exile them. Then that player shuffles their library.
         this.getSpellAbility().addEffect((new NameACardEffect(NameACardEffect.TypeOfName.NON_LAND_NAME)));
         this.getSpellAbility().addEffect(new StainTheMindEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
diff --git a/Mage.Sets/src/mage/cards/s/StartledAwake.java b/Mage.Sets/src/mage/cards/s/StartledAwake.java
index 1328f9b6d28..0745e99fc2c 100644
--- a/Mage.Sets/src/mage/cards/s/StartledAwake.java
+++ b/Mage.Sets/src/mage/cards/s/StartledAwake.java
@@ -57,7 +57,7 @@ public class StartledAwake extends CardImpl {
         this.transformable = true;
         this.secondSideCardClazz = PersistentNightmare.class;
 
-        // Target opponent puts the top thirteen cards of his or her library into his or her graveyard.
+        // Target opponent puts the top thirteen cards of their library into their graveyard.
         this.getSpellAbility().addTarget(new TargetOpponent());
         this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(13));
 
diff --git a/Mage.Sets/src/mage/cards/s/SteamVines.java b/Mage.Sets/src/mage/cards/s/SteamVines.java
index 514159305a5..1efba201adb 100644
--- a/Mage.Sets/src/mage/cards/s/SteamVines.java
+++ b/Mage.Sets/src/mage/cards/s/SteamVines.java
@@ -65,7 +65,7 @@ public class SteamVines extends CardImpl {
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
 
-        // When enchanted land becomes tapped, destroy it and Steam Vines deals 1 damage to that land's controller. That player attaches Steam Vines to a land of his or her choice.
+        // When enchanted land becomes tapped, destroy it and Steam Vines deals 1 damage to that land's controller. That player attaches Steam Vines to a land of their choice.
         this.addAbility(new BecomesTappedAttachedTriggeredAbility(new SteamVinesEffect(), "enchanted land"));
 
     }
@@ -84,7 +84,7 @@ class SteamVinesEffect extends OneShotEffect {
 
     public SteamVinesEffect() {
         super(Outcome.Detriment);
-        staticText = "destroy it and {this} deals 1 damage to that land's controller. That player attaches {this} to a land of his or her choice";
+        staticText = "destroy it and {this} deals 1 damage to that land's controller. That player attaches {this} to a land of their choice";
     }
 
     public SteamVinesEffect(final SteamVinesEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SternMentor.java b/Mage.Sets/src/mage/cards/s/SternMentor.java
index 2088d0d96a4..d036bede018 100644
--- a/Mage.Sets/src/mage/cards/s/SternMentor.java
+++ b/Mage.Sets/src/mage/cards/s/SternMentor.java
@@ -48,7 +48,7 @@ import mage.target.TargetPlayer;
  */
 public class SternMentor extends CardImpl {
 
-    private static final String ruleText = "As long as {this} is paired with another creature, each of those creatures has \"{T}: Target player puts the top two cards of his or her library into his or her graveyard.\"";
+    private static final String ruleText = "As long as {this} is paired with another creature, each of those creatures has \"{T}: Target player puts the top two cards of their library into their graveyard.\"";
 
     public SternMentor(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{U}");
@@ -61,7 +61,7 @@ public class SternMentor extends CardImpl {
         // Soulbond
         this.addAbility(new SoulbondAbility());
 
-        // As long as Stern Mentor is paired with another creature, each of those creatures has "{T}: Target player puts the top two cards of his or her library into his or her graveyard."
+        // As long as Stern Mentor is paired with another creature, each of those creatures has "{T}: Target player puts the top two cards of their library into their graveyard."
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), new TapSourceCost());
         ability.addTarget(new TargetPlayer());
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityPairedEffect(ability, ruleText)));
diff --git a/Mage.Sets/src/mage/cards/s/StitcherGeralf.java b/Mage.Sets/src/mage/cards/s/StitcherGeralf.java
index b8dba15a736..c54597415b4 100644
--- a/Mage.Sets/src/mage/cards/s/StitcherGeralf.java
+++ b/Mage.Sets/src/mage/cards/s/StitcherGeralf.java
@@ -62,7 +62,7 @@ public class StitcherGeralf extends CardImpl {
         this.power = new MageInt(3);
         this.toughness = new MageInt(4);
 
-        // {2}{U}, {tap}: Each player puts the top three cards of his or her library into his or her graveyard. Exile up to two creature cards put into graveyards this way. Create an X/X blue Zombie creature token, where X is the total power of the cards exiled this way.
+        // {2}{U}, {tap}: Each player puts the top three cards of their library into their graveyard. Exile up to two creature cards put into graveyards this way. Create an X/X blue Zombie creature token, where X is the total power of the cards exiled this way.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new StitcherGeralfEffect(), new ManaCostsImpl("{2}{U}"));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
@@ -82,7 +82,7 @@ class StitcherGeralfEffect extends OneShotEffect {
 
     public StitcherGeralfEffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "Each player puts the top three cards of his or her library into his or her graveyard. Exile up to two creature cards put into graveyards this way. Create an X/X blue Zombie creature token, where X is the total power of the cards exiled this way";
+        this.staticText = "Each player puts the top three cards of their library into their graveyard. Exile up to two creature cards put into graveyards this way. Create an X/X blue Zombie creature token, where X is the total power of the cards exiled this way";
     }
 
     public StitcherGeralfEffect(final StitcherGeralfEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/StolenGoods.java b/Mage.Sets/src/mage/cards/s/StolenGoods.java
index 92e9ccf6e3c..4f059d40388 100644
--- a/Mage.Sets/src/mage/cards/s/StolenGoods.java
+++ b/Mage.Sets/src/mage/cards/s/StolenGoods.java
@@ -56,7 +56,7 @@ public class StolenGoods extends CardImpl {
     public StolenGoods(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{U}");
 
-        // Target opponent exiles cards from the top of his or her library until he or she exiles a nonland card. Until end of turn, you may cast that card without paying its mana cost.
+        // Target opponent exiles cards from the top of their library until he or she exiles a nonland card. Until end of turn, you may cast that card without paying its mana cost.
         this.getSpellAbility().addEffect(new StolenGoodsEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
     }
@@ -75,7 +75,7 @@ class StolenGoodsEffect extends OneShotEffect {
 
     public StolenGoodsEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Target opponent exiles cards from the top of his or her library until he or she exiles a nonland card. Until end of turn, you may cast that card without paying its mana cost";
+        this.staticText = "Target opponent exiles cards from the top of their library until he or she exiles a nonland card. Until end of turn, you may cast that card without paying its mana cost";
     }
 
     public StolenGoodsEffect(final StolenGoodsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/StonehornDignitary.java b/Mage.Sets/src/mage/cards/s/StonehornDignitary.java
index c67f5026b6f..f5bba5eeab9 100644
--- a/Mage.Sets/src/mage/cards/s/StonehornDignitary.java
+++ b/Mage.Sets/src/mage/cards/s/StonehornDignitary.java
@@ -52,7 +52,7 @@ public class StonehornDignitary extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(4);
 
-        // When Stonehorn Dignitary enters the battlefield, target opponent skips his or her next combat phase.
+        // When Stonehorn Dignitary enters the battlefield, target opponent skips their next combat phase.
         Ability ability = new EntersBattlefieldTriggeredAbility(new SkipNextCombatEffect());
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/s/StorageMatrix.java b/Mage.Sets/src/mage/cards/s/StorageMatrix.java
index ed64b3ed349..34149ac401b 100644
--- a/Mage.Sets/src/mage/cards/s/StorageMatrix.java
+++ b/Mage.Sets/src/mage/cards/s/StorageMatrix.java
@@ -54,7 +54,7 @@ public class StorageMatrix extends CardImpl {
     public StorageMatrix(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
 
-        // As long as Storage Matrix is untapped, each player chooses artifact, creature, or land during his or her untap step. That player can untap only permanents of the chosen type this step.
+        // As long as Storage Matrix is untapped, each player chooses artifact, creature, or land during their untap step. That player can untap only permanents of the chosen type this step.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new StorageMatrixRestrictionEffect()));
     }
 
@@ -83,7 +83,7 @@ class StorageMatrixRestrictionEffect extends RestrictionEffect {
 
     public StorageMatrixRestrictionEffect() {
         super(Duration.WhileOnBattlefield);
-        staticText = "As long as Storage Matrix is untapped, each player chooses artifact, creature, or land during his or her untap step. That player can untap only permanents of the chosen type this step";
+        staticText = "As long as Storage Matrix is untapped, each player chooses artifact, creature, or land during their untap step. That player can untap only permanents of the chosen type this step";
     }
 
     public StorageMatrixRestrictionEffect(final StorageMatrixRestrictionEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/StormCauldron.java b/Mage.Sets/src/mage/cards/s/StormCauldron.java
index 8f063990d87..3f3faedd423 100644
--- a/Mage.Sets/src/mage/cards/s/StormCauldron.java
+++ b/Mage.Sets/src/mage/cards/s/StormCauldron.java
@@ -47,7 +47,7 @@ public class StormCauldron extends CardImpl {
     public StormCauldron(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}");
 
-        // Each player may play an additional land during each of his or her turns.
+        // Each player may play an additional land during each of their turns.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PlayAdditionalLandsAllEffect()));
 
         // Whenever a land is tapped for mana, return it to its owner's hand.
diff --git a/Mage.Sets/src/mage/cards/s/StormWorld.java b/Mage.Sets/src/mage/cards/s/StormWorld.java
index 7e1229c859b..ed45c7246c7 100644
--- a/Mage.Sets/src/mage/cards/s/StormWorld.java
+++ b/Mage.Sets/src/mage/cards/s/StormWorld.java
@@ -52,7 +52,7 @@ public class StormWorld extends CardImpl {
 
         addSuperType(SuperType.WORLD);
 
-        // At the beginning of each player's upkeep, Storm World deals X damage to that player, where X is 4 minus the number of cards in his or her hand.
+        // At the beginning of each player's upkeep, Storm World deals X damage to that player, where X is 4 minus the number of cards in their hand.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new StormWorldEffect(), TargetController.ANY, false, true));
 
     }
@@ -71,7 +71,7 @@ class StormWorldEffect extends OneShotEffect {
 
     public StormWorldEffect() {
         super(Outcome.Benefit);
-        this.staticText = "{this} deals X damage to that player, where X is 4 minus the number of cards in his or her hand";
+        this.staticText = "{this} deals X damage to that player, where X is 4 minus the number of cards in their hand";
     }
 
     public StormWorldEffect(final StormWorldEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/StrategySchmategy.java b/Mage.Sets/src/mage/cards/s/StrategySchmategy.java
index 924e98e984c..afabb5532be 100644
--- a/Mage.Sets/src/mage/cards/s/StrategySchmategy.java
+++ b/Mage.Sets/src/mage/cards/s/StrategySchmategy.java
@@ -54,7 +54,7 @@ public class StrategySchmategy extends CardImpl {
     public StrategySchmategy(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{R}");
 
-        // Roll a six-sided die. Strategy, Schmategy has the indicated effect. 1 - Do nothing. 2 - Destroy all artifacts. 3 - Destroy all lands. 4 - Strategy, Schmategy deals 3 damage to each creature and each player. 5 - Each player discards his or her hand and draws seven cards. 6 - Repeat this process two more times.
+        // Roll a six-sided die. Strategy, Schmategy has the indicated effect. 1 - Do nothing. 2 - Destroy all artifacts. 3 - Destroy all lands. 4 - Strategy, Schmategy deals 3 damage to each creature and each player. 5 - Each player discards their hand and draws seven cards. 6 - Repeat this process two more times.
         this.getSpellAbility().addEffect(new StrategySchmategyffect());
     }
 
@@ -72,7 +72,7 @@ class StrategySchmategyffect extends OneShotEffect {
 
     public StrategySchmategyffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "Roll a six-sided die. {this} has the indicated effect. 1 - Do nothing. 2 - Destroy all artifacts. 3 - Destroy all lands. 4 - {this} deals 3 damage to each creature and each player. 5 - Each player discards his or her hand and draws seven cards. 6 - Repeat this process two more times";
+        this.staticText = "Roll a six-sided die. {this} has the indicated effect. 1 - Do nothing. 2 - Destroy all artifacts. 3 - Destroy all lands. 4 - {this} deals 3 damage to each creature and each player. 5 - Each player discards their hand and draws seven cards. 6 - Repeat this process two more times";
     }
 
     public StrategySchmategyffect(final StrategySchmategyffect effect) {
@@ -93,7 +93,7 @@ class StrategySchmategyffect extends OneShotEffect {
             // 2 - Destroy all artifacts.
             // 3 - Destroy all lands.
             // 4 - {this} deals 3 damage to each creature and each player.
-            // 5 - Each player discards his or her hand and draws seven cards.
+            // 5 - Each player discards their hand and draws seven cards.
             // 6 - Repeat this process two more times
             while (numTimesToDo > 0) {
                 int amount = controller.rollDice(game, 6);
diff --git a/Mage.Sets/src/mage/cards/s/StreamOfConsciousness.java b/Mage.Sets/src/mage/cards/s/StreamOfConsciousness.java
index a229c01737a..1f7d2701959 100644
--- a/Mage.Sets/src/mage/cards/s/StreamOfConsciousness.java
+++ b/Mage.Sets/src/mage/cards/s/StreamOfConsciousness.java
@@ -55,7 +55,7 @@ public class StreamOfConsciousness extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{U}");
         this.subtype.add(SubType.ARCANE);
 
-        // Target player shuffles up to four target cards from his or her graveyard into his or her library.
+        // Target player shuffles up to four target cards from their graveyard into their library.
         this.getSpellAbility().addEffect(new StreamOfConsciousnessEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addTarget(new StreamOfConsciousnessTarget());
@@ -76,7 +76,7 @@ class StreamOfConsciousnessEffect extends OneShotEffect {
 
     public StreamOfConsciousnessEffect() {
         super(Outcome.Neutral);
-        this.staticText = "Target player shuffles up to four target cards from his or her graveyard into his or her library";
+        this.staticText = "Target player shuffles up to four target cards from their graveyard into their library";
     }
 
     public StreamOfConsciousnessEffect(final StreamOfConsciousnessEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/StromgaldSpy.java b/Mage.Sets/src/mage/cards/s/StromgaldSpy.java
index 082fe025195..d909ef4eb2a 100644
--- a/Mage.Sets/src/mage/cards/s/StromgaldSpy.java
+++ b/Mage.Sets/src/mage/cards/s/StromgaldSpy.java
@@ -58,7 +58,7 @@ public class StromgaldSpy extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(4);
 
-        // Whenever Stromgald Spy attacks and isn't blocked, you may have defending player play with his or her hand revealed for as long as Stromgald Spy remains on the battlefield. If you do, Stromgald Spy assigns no combat damage this turn.
+        // Whenever Stromgald Spy attacks and isn't blocked, you may have defending player play with their hand revealed for as long as Stromgald Spy remains on the battlefield. If you do, Stromgald Spy assigns no combat damage this turn.
         Ability ability = new AttacksAndIsNotBlockedTriggeredAbility(new StromgaldSpyEffect(), true, true);
         ability.addEffect(new AssignNoCombatDamageSourceEffect(Duration.EndOfTurn, true));
         this.addAbility(ability);
@@ -78,7 +78,7 @@ class StromgaldSpyEffect extends ContinuousEffectImpl {
 
     public StromgaldSpyEffect() {
         super(Duration.WhileOnBattlefield, Layer.PlayerEffects, SubLayer.NA, Outcome.Detriment);
-        this.staticText = "you may have defending player play with his or her hand revealed for as long as Stromgald Spy remains on the battlefield";
+        this.staticText = "you may have defending player play with their hand revealed for as long as Stromgald Spy remains on the battlefield";
     }
 
     public StromgaldSpyEffect(final StromgaldSpyEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/StrongholdGambit.java b/Mage.Sets/src/mage/cards/s/StrongholdGambit.java
index ac01b580083..dfec10bc3dc 100644
--- a/Mage.Sets/src/mage/cards/s/StrongholdGambit.java
+++ b/Mage.Sets/src/mage/cards/s/StrongholdGambit.java
@@ -54,7 +54,7 @@ public class StrongholdGambit extends CardImpl {
     public StrongholdGambit(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{R}");
 
-        // Each player chooses a card in his or her hand. Then each player reveals his or her chosen card. The owner of each creature card revealed this way with the lowest converted mana cost puts it onto the battlefield.
+        // Each player chooses a card in their hand. Then each player reveals their chosen card. The owner of each creature card revealed this way with the lowest converted mana cost puts it onto the battlefield.
         getSpellAbility().addEffect(new StrongholdGambitEffect());
     }
 
@@ -72,7 +72,7 @@ class StrongholdGambitEffect extends OneShotEffect {
 
     public StrongholdGambitEffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "Each player chooses a card in his or her hand. Then each player reveals his or her chosen card. The owner of each creature card revealed this way with the lowest converted mana cost puts it onto the battlefield";
+        this.staticText = "Each player chooses a card in their hand. Then each player reveals their chosen card. The owner of each creature card revealed this way with the lowest converted mana cost puts it onto the battlefield";
     }
 
     public StrongholdGambitEffect(final StrongholdGambitEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/StruggleForSanity.java b/Mage.Sets/src/mage/cards/s/StruggleForSanity.java
index 5bb125788fa..2e8a9a4528e 100644
--- a/Mage.Sets/src/mage/cards/s/StruggleForSanity.java
+++ b/Mage.Sets/src/mage/cards/s/StruggleForSanity.java
@@ -54,7 +54,7 @@ public class StruggleForSanity extends CardImpl {
     public StruggleForSanity(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}{B}");
 
-        // Target opponent reveals his or her hand. That player exiles a card from it, then you exile a card from it. Repeat this process until all cards in that hand have been exiled. That player returns the cards he or she exiled this way to his or her hand and puts the rest into his or her graveyard.
+        // Target opponent reveals their hand. That player exiles a card from it, then you exile a card from it. Repeat this process until all cards in that hand have been exiled. That player returns the cards he or she exiled this way to their hand and puts the rest into their graveyard.
         this.getSpellAbility().addEffect(new StruggleForSanityEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
     }
@@ -73,7 +73,7 @@ class StruggleForSanityEffect extends OneShotEffect {
 
     public StruggleForSanityEffect() {
         super(Outcome.Discard); // kind of
-        this.staticText = "Target opponent reveals his or her hand. That player exiles a card from it, then you exile a card from it. Repeat this process until all cards in that hand have been exiled. That player returns the cards he or she exiled this way to his or her hand and puts the rest into his or her graveyard";
+        this.staticText = "Target opponent reveals their hand. That player exiles a card from it, then you exile a card from it. Repeat this process until all cards in that hand have been exiled. That player returns the cards he or she exiled this way to their hand and puts the rest into their graveyard";
     }
 
     public StruggleForSanityEffect(final StruggleForSanityEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/StruggleSurvive.java b/Mage.Sets/src/mage/cards/s/StruggleSurvive.java
index 636a48ecceb..bb6fe384926 100644
--- a/Mage.Sets/src/mage/cards/s/StruggleSurvive.java
+++ b/Mage.Sets/src/mage/cards/s/StruggleSurvive.java
@@ -66,7 +66,7 @@ public class StruggleSurvive extends SplitCard {
         // Survive
         // Aftermath
         ((CardImpl) (getRightHalfCard())).addAbility(new AftermathAbility().setRuleAtTheTop(true));
-        // Each player shuffles his or graveyard into his or her library.
+        // Each player shuffles his or graveyard into their library.
         getRightHalfCard().getSpellAbility().addEffect(new SurviveEffect());
 
     }
@@ -85,7 +85,7 @@ class SurviveEffect extends OneShotEffect {
 
     public SurviveEffect() {
         super(Outcome.Neutral);
-        staticText = "Each player shuffles his or her graveyard into his or her library";
+        staticText = "Each player shuffles their graveyard into their library";
     }
 
     public SurviveEffect(final SurviveEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/StuntedGrowth.java b/Mage.Sets/src/mage/cards/s/StuntedGrowth.java
index af4f2187fd0..0ae551e33fc 100644
--- a/Mage.Sets/src/mage/cards/s/StuntedGrowth.java
+++ b/Mage.Sets/src/mage/cards/s/StuntedGrowth.java
@@ -54,7 +54,7 @@ public class StuntedGrowth extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{G}{G}");
 
 
-        // Target player chooses three cards from his or her hand and puts them on top of his or her library in any order.
+        // Target player chooses three cards from their hand and puts them on top of their library in any order.
         this.getSpellAbility().addEffect(new StuntedGrowthEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
@@ -73,7 +73,7 @@ class StuntedGrowthEffect extends OneShotEffect {
 
     public StuntedGrowthEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Target player chooses three cards from his or her hand and puts them on top of his or her library in any order";
+        this.staticText = "Target player chooses three cards from their hand and puts them on top of their library in any order";
     }
 
     public StuntedGrowthEffect(final StuntedGrowthEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SupremeInquisitor.java b/Mage.Sets/src/mage/cards/s/SupremeInquisitor.java
index 9f586f4f529..df6afc2838b 100644
--- a/Mage.Sets/src/mage/cards/s/SupremeInquisitor.java
+++ b/Mage.Sets/src/mage/cards/s/SupremeInquisitor.java
@@ -73,7 +73,7 @@ public class SupremeInquisitor extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(3);
 
-        // Tap five untapped Wizards you control: Search target player's library for up to five cards and exile them. Then that player shuffles his or her library.
+        // Tap five untapped Wizards you control: Search target player's library for up to five cards and exile them. Then that player shuffles their library.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SupremeInquisitorEffect(), new TapTargetCost(new TargetControlledPermanent(5, 5, filter, true)));
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
@@ -95,7 +95,7 @@ class SupremeInquisitorEffect extends OneShotEffect {
 
     public SupremeInquisitorEffect() {
         super(Outcome.Exile);
-        staticText = "Search target player's library for up to five cards and exile them. Then that player shuffles his or her library";
+        staticText = "Search target player's library for up to five cards and exile them. Then that player shuffles their library";
     }
 
     public SupremeInquisitorEffect(final SupremeInquisitorEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SurgicalExtraction.java b/Mage.Sets/src/mage/cards/s/SurgicalExtraction.java
index 2f8db17ec62..dfa213409fb 100644
--- a/Mage.Sets/src/mage/cards/s/SurgicalExtraction.java
+++ b/Mage.Sets/src/mage/cards/s/SurgicalExtraction.java
@@ -64,7 +64,7 @@ public class SurgicalExtraction extends CardImpl {
 
         // Choose target card in a graveyard other than a basic land card. Search its owner's graveyard,
         // hand, and library for any number of cards with the same name as that card and exile them.
-        // Then that player shuffles his or her library.
+        // Then that player shuffles their library.
         this.getSpellAbility().addEffect(new SurgicalExtractionEffect());
         this.getSpellAbility().addTarget(new TargetCardInGraveyard(filter));
     }
@@ -83,7 +83,7 @@ class SurgicalExtractionEffect extends OneShotEffect {
 
     public SurgicalExtractionEffect() {
         super(Outcome.Exile);
-        this.staticText = "Choose target card in a graveyard other than a basic land card. Search its owner's graveyard, hand, and library for any number of cards with the same name as that card and exile them. Then that player shuffles his or her library";
+        this.staticText = "Choose target card in a graveyard other than a basic land card. Search its owner's graveyard, hand, and library for any number of cards with the same name as that card and exile them. Then that player shuffles their library";
     }
 
     public SurgicalExtractionEffect(final SurgicalExtractionEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SwayOfTheStars.java b/Mage.Sets/src/mage/cards/s/SwayOfTheStars.java
index c807a78abc5..18abf85583f 100644
--- a/Mage.Sets/src/mage/cards/s/SwayOfTheStars.java
+++ b/Mage.Sets/src/mage/cards/s/SwayOfTheStars.java
@@ -53,7 +53,7 @@ public class SwayOfTheStars extends CardImpl {
     public SwayOfTheStars(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{8}{U}{U}");
 
-        // Each player shuffles his or her hand, graveyard, and permanents he or she owns into his or her library, then draws seven cards. Each player's life total becomes 7.
+        // Each player shuffles their hand, graveyard, and permanents he or she owns into their library, then draws seven cards. Each player's life total becomes 7.
         this.getSpellAbility().addEffect(new SwayOfTheStarsEffect());
         Effect effect = new DrawCardAllEffect(7);
         effect.setText(", then draws seven cards");
@@ -76,7 +76,7 @@ class SwayOfTheStarsEffect extends OneShotEffect {
 
     public SwayOfTheStarsEffect() {
         super(Outcome.Neutral);
-        staticText = "Each player shuffles his or her hand, graveyard, and permanents he or she owns into his or her library, then draws seven cards. Each player's life total becomes 7";
+        staticText = "Each player shuffles their hand, graveyard, and permanents he or she owns into their library, then draws seven cards. Each player's life total becomes 7";
     }
 
     public SwayOfTheStarsEffect(final SwayOfTheStarsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SwordOfBodyAndMind.java b/Mage.Sets/src/mage/cards/s/SwordOfBodyAndMind.java
index d89ebccdaeb..8f9890dc49a 100644
--- a/Mage.Sets/src/mage/cards/s/SwordOfBodyAndMind.java
+++ b/Mage.Sets/src/mage/cards/s/SwordOfBodyAndMind.java
@@ -73,7 +73,7 @@ public class SwordOfBodyAndMind extends CardImpl {
         ability.addEffect(effect);
         this.addAbility(ability);
 
-        // Whenever equipped creature deals combat damage to a player, you create a 2/2 green Wolf creature token and that player puts the top ten cards of his or her library into his or her graveyard.
+        // Whenever equipped creature deals combat damage to a player, you create a 2/2 green Wolf creature token and that player puts the top ten cards of their library into their graveyard.
         this.addAbility(new SwordOfBodyAndMindAbility());
 
         // Equip {2}
@@ -126,6 +126,6 @@ class SwordOfBodyAndMindAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "Whenever equipped creature deals combat damage to a player, you create a 2/2 green Wolf creature token and that player puts the top ten cards of his or her library into his or her graveyard.";
+        return "Whenever equipped creature deals combat damage to a player, you create a 2/2 green Wolf creature token and that player puts the top ten cards of their library into their graveyard.";
     }
 }
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/cards/s/SwordOfWarAndPeace.java b/Mage.Sets/src/mage/cards/s/SwordOfWarAndPeace.java
index 27f568cd34b..8d4ae2259e8 100644
--- a/Mage.Sets/src/mage/cards/s/SwordOfWarAndPeace.java
+++ b/Mage.Sets/src/mage/cards/s/SwordOfWarAndPeace.java
@@ -73,7 +73,7 @@ public class SwordOfWarAndPeace extends CardImpl {
         ability.addEffect(effect);
         this.addAbility(ability);
 
-        // Whenever equipped creature deals combat damage to a player, Sword of War and Peace deals damage to that player equal to the number of cards in his or her hand and you gain 1 life for each card in your hand.
+        // Whenever equipped creature deals combat damage to a player, Sword of War and Peace deals damage to that player equal to the number of cards in their hand and you gain 1 life for each card in your hand.
         this.addAbility(new SwordOfWarAndPeaceAbility());
 
         // Equip {2}
@@ -125,7 +125,7 @@ class SwordOfWarAndPeaceAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "Whenever equipped creature deals combat damage to a player, {this} deals damage to that player equal to the number of cards in his or her hand and you gain 1 life for each card in your hand.";
+        return "Whenever equipped creature deals combat damage to a player, {this} deals damage to that player equal to the number of cards in their hand and you gain 1 life for each card in your hand.";
     }
 }
 
@@ -133,7 +133,7 @@ class SwordOfWarAndPeaceDamageEffect extends OneShotEffect {
 
     SwordOfWarAndPeaceDamageEffect() {
         super(Outcome.Damage);
-        staticText = "{this} deals damage to that player equal to the number of cards in his or her hand";
+        staticText = "{this} deals damage to that player equal to the number of cards in their hand";
     }
 
     SwordOfWarAndPeaceDamageEffect(final SwordOfWarAndPeaceDamageEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/s/SzadekLordOfSecrets.java b/Mage.Sets/src/mage/cards/s/SzadekLordOfSecrets.java
index 87393d7bc14..00675ad9998 100644
--- a/Mage.Sets/src/mage/cards/s/SzadekLordOfSecrets.java
+++ b/Mage.Sets/src/mage/cards/s/SzadekLordOfSecrets.java
@@ -61,7 +61,7 @@ public class SzadekLordOfSecrets extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
 
-        // If Szadek, Lord of Secrets would deal combat damage to a player, instead put that many +1/+1 counters on Szadek and that player puts that many cards from the top of his or her library into his or her graveyard.
+        // If Szadek, Lord of Secrets would deal combat damage to a player, instead put that many +1/+1 counters on Szadek and that player puts that many cards from the top of their library into their graveyard.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new SzadekLordOfSecretsEffect()));
 
     }
@@ -80,7 +80,7 @@ class SzadekLordOfSecretsEffect extends ReplacementEffectImpl {
 
     SzadekLordOfSecretsEffect() {
         super(Duration.WhileOnBattlefield, Outcome.Benefit);
-        staticText = "If {this} would deal combat damage to a player, instead put that many +1/+1 counters on {this} and that player puts that many cards from the top of his or her library into his or her graveyard";
+        staticText = "If {this} would deal combat damage to a player, instead put that many +1/+1 counters on {this} and that player puts that many cards from the top of their library into their graveyard";
     }
 
     SzadekLordOfSecretsEffect(final SzadekLordOfSecretsEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/TalarasBane.java b/Mage.Sets/src/mage/cards/t/TalarasBane.java
index 9715eeb33f0..c9b75860a7d 100644
--- a/Mage.Sets/src/mage/cards/t/TalarasBane.java
+++ b/Mage.Sets/src/mage/cards/t/TalarasBane.java
@@ -55,7 +55,7 @@ public class TalarasBane extends CardImpl {
     public TalarasBane(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{B}");
 
-        // Target opponent reveals his or her hand. You choose a green or white creature card from it. You gain life equal that creature card's toughness, then that player discards that card.
+        // Target opponent reveals their hand. You choose a green or white creature card from it. You gain life equal that creature card's toughness, then that player discards that card.
         this.getSpellAbility().addEffect(new TalarasBaneEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
 
@@ -84,7 +84,7 @@ class TalarasBaneEffect extends OneShotEffect {
 
     public TalarasBaneEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Target opponent reveals his or her hand. You choose a green or white creature card from it. You gain life equal to that creature card's toughness, then that player discards that card";
+        this.staticText = "Target opponent reveals their hand. You choose a green or white creature card from it. You gain life equal to that creature card's toughness, then that player discards that card";
     }
 
     public TalarasBaneEffect(final TalarasBaneEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/TalentOfTheTelepath.java b/Mage.Sets/src/mage/cards/t/TalentOfTheTelepath.java
index 2d8d8d8ebca..f2ccd7970f1 100644
--- a/Mage.Sets/src/mage/cards/t/TalentOfTheTelepath.java
+++ b/Mage.Sets/src/mage/cards/t/TalentOfTheTelepath.java
@@ -57,7 +57,7 @@ public class TalentOfTheTelepath extends CardImpl {
     public TalentOfTheTelepath(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{U}{U}");
 
-        // Target opponent reveals the top seven cards of his or her library. You may cast an instant or sorcery card from among them without paying its mana cost. Then that player puts the rest into his or her graveyard.
+        // Target opponent reveals the top seven cards of their library. You may cast an instant or sorcery card from among them without paying its mana cost. Then that player puts the rest into their graveyard.
         // <i>Spell mastery</i> - If there are two or more instant and/or sorcery cards in your graveyard, you may cast up to two revealed instant and/or sorcery cards instead of one.
         getSpellAbility().addEffect(new TalentOfTheTelepathEffect());
         getSpellAbility().addTarget(new TargetOpponent());
@@ -80,7 +80,7 @@ class TalentOfTheTelepathEffect extends OneShotEffect {
 
     public TalentOfTheTelepathEffect() {
         super(Outcome.PlayForFree);
-        this.staticText = "Target opponent reveals the top seven cards of his or her library. You may cast an instant or sorcery card from among them without paying its mana cost. Then that player puts the rest into his or her graveyard. "
+        this.staticText = "Target opponent reveals the top seven cards of their library. You may cast an instant or sorcery card from among them without paying its mana cost. Then that player puts the rest into their graveyard. "
                 + "<BR><i>Spell mastery</i> - If there are two or more instant and/or sorcery cards in your graveyard, you may cast up to two revealed instant and/or sorcery cards instead of one.";
     }
 
diff --git a/Mage.Sets/src/mage/cards/t/Tangleroot.java b/Mage.Sets/src/mage/cards/t/Tangleroot.java
index 659f13ab519..bb2d2c1c9fb 100644
--- a/Mage.Sets/src/mage/cards/t/Tangleroot.java
+++ b/Mage.Sets/src/mage/cards/t/Tangleroot.java
@@ -46,9 +46,9 @@ public class Tangleroot extends CardImpl {
     public Tangleroot(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
 
-        // Whenever a player casts a creature spell, that player adds {G} to his or her mana pool.
+        // Whenever a player casts a creature spell, that player adds {G} to their mana pool.
         this.addAbility(new SpellCastAllTriggeredAbility(
-                new AddManaToManaPoolTargetControllerEffect(Mana.GreenMana(1), "his or her"), StaticFilters.FILTER_SPELL_A_CREATURE, false, SetTargetPointer.PLAYER));
+                new AddManaToManaPoolTargetControllerEffect(Mana.GreenMana(1), "their"), StaticFilters.FILTER_SPELL_A_CREATURE, false, SetTargetPointer.PLAYER));
     }
 
     public Tangleroot(final Tangleroot card) {
diff --git a/Mage.Sets/src/mage/cards/t/TeferisPuzzleBox.java b/Mage.Sets/src/mage/cards/t/TeferisPuzzleBox.java
index b034cb77359..1973463669a 100644
--- a/Mage.Sets/src/mage/cards/t/TeferisPuzzleBox.java
+++ b/Mage.Sets/src/mage/cards/t/TeferisPuzzleBox.java
@@ -49,7 +49,7 @@ public class TeferisPuzzleBox extends CardImpl {
     public TeferisPuzzleBox(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}");
 
-        // At the beginning of each player's draw step, that player puts the cards in his or her hand on the bottom of his or her library in any order, then draws that many cards.
+        // At the beginning of each player's draw step, that player puts the cards in their hand on the bottom of their library in any order, then draws that many cards.
         Ability ability = new BeginningOfDrawTriggeredAbility(new TeferisPuzzleBoxEffect(), TargetController.ANY, false);
         this.addAbility(ability);
     }
@@ -68,7 +68,7 @@ class TeferisPuzzleBoxEffect extends OneShotEffect {
 
     public TeferisPuzzleBoxEffect() {
         super(Outcome.Neutral);
-        staticText = "At the beginning of each player's draw step, that player puts the cards in his or her hand on the bottom of his or her library in any order, then draws that many cards";
+        staticText = "At the beginning of each player's draw step, that player puts the cards in their hand on the bottom of their library in any order, then draws that many cards";
     }
 
     public TeferisPuzzleBoxEffect(final TeferisPuzzleBoxEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/TeleminPerformance.java b/Mage.Sets/src/mage/cards/t/TeleminPerformance.java
index 005b1da2880..b8e9c0347ff 100644
--- a/Mage.Sets/src/mage/cards/t/TeleminPerformance.java
+++ b/Mage.Sets/src/mage/cards/t/TeleminPerformance.java
@@ -51,7 +51,7 @@ public class TeleminPerformance extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{U}{U}");
 
 
-        // Target opponent reveals cards from the top of his or her library until he or she reveals a creature card. That player puts all noncreature cards revealed this way into his or her graveyard, then you put the creature card onto the battlefield under your control.
+        // Target opponent reveals cards from the top of their library until he or she reveals a creature card. That player puts all noncreature cards revealed this way into their graveyard, then you put the creature card onto the battlefield under your control.
         this.getSpellAbility().addEffect(new TeleminPerformanceEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
 
@@ -71,7 +71,7 @@ class TeleminPerformanceEffect extends OneShotEffect {
 
     public TeleminPerformanceEffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "Target opponent reveals cards from the top of his or her library until he or she reveals a creature card. That player puts all noncreature cards revealed this way into his or her graveyard, then you put the creature card onto the battlefield under your control";
+        this.staticText = "Target opponent reveals cards from the top of their library until he or she reveals a creature card. That player puts all noncreature cards revealed this way into their graveyard, then you put the creature card onto the battlefield under your control";
     }
 
     public TeleminPerformanceEffect(final TeleminPerformanceEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/TemporalCascade.java b/Mage.Sets/src/mage/cards/t/TemporalCascade.java
index c7a9b3e0067..e85e24176c5 100644
--- a/Mage.Sets/src/mage/cards/t/TemporalCascade.java
+++ b/Mage.Sets/src/mage/cards/t/TemporalCascade.java
@@ -50,7 +50,7 @@ public class TemporalCascade extends CardImpl {
     public TemporalCascade(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{U}{U}");
 
-        // Choose one - Each player shuffles his or her hand and graveyard into his or her library;
+        // Choose one - Each player shuffles their hand and graveyard into their library;
         this.getSpellAbility().addEffect(new TemporalCascadeShuffleEffect());
         
         // or each player draws seven cards.
@@ -76,7 +76,7 @@ class TemporalCascadeShuffleEffect extends OneShotEffect {
 
     public TemporalCascadeShuffleEffect() {
         super(Outcome.Neutral);
-        staticText = "Each player shuffles his or her hand and graveyard into his or her library";
+        staticText = "Each player shuffles their hand and graveyard into their library";
     }
 
     public TemporalCascadeShuffleEffect(final TemporalCascadeShuffleEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/TemporalExtortion.java b/Mage.Sets/src/mage/cards/t/TemporalExtortion.java
index 832f9a188df..5ccb9c510be 100644
--- a/Mage.Sets/src/mage/cards/t/TemporalExtortion.java
+++ b/Mage.Sets/src/mage/cards/t/TemporalExtortion.java
@@ -50,7 +50,7 @@ public class TemporalExtortion extends CardImpl {
     public TemporalExtortion(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}{B}{B}{B}");
 
-        // When you cast Temporal Extortion, any player may pay half his or her life, rounded up. If a player does, counter Temporal Extortion.
+        // When you cast Temporal Extortion, any player may pay half their life, rounded up. If a player does, counter Temporal Extortion.
         this.addAbility(new CastSourceTriggeredAbility(new TemporalExtortionCounterSourceEffect()));
 
         // Take an extra turn after this one.
@@ -71,7 +71,7 @@ class TemporalExtortionCounterSourceEffect extends OneShotEffect {
 
     public TemporalExtortionCounterSourceEffect() {
         super(Outcome.AIDontUseIt);
-        staticText = "any player may pay half his or her life, rounded up. If a player does, counter {source}";
+        staticText = "any player may pay half their life, rounded up. If a player does, counter {source}";
     }
 
     public TemporalExtortionCounterSourceEffect(final TemporalExtortionCounterSourceEffect effect) {
@@ -92,7 +92,7 @@ class TemporalExtortionCounterSourceEffect extends OneShotEffect {
                 if (player.chooseUse(outcome, "Pay half your life, rounded up to counter " + sourceObject.getIdName() + '?', source, game)) {
                     Integer amount = (int) Math.ceil(player.getLife() / 2f);
                     player.loseLife(amount, game, false);
-                    game.informPlayers(player.getLogName() + " pays half his or her life, rounded up to counter " + sourceObject.getIdName() + '.');
+                    game.informPlayers(player.getLogName() + " pays half their life, rounded up to counter " + sourceObject.getIdName() + '.');
                     Spell spell = game.getStack().getSpell(source.getSourceId());
                     if (spell != null) {
                         game.getStack().counter(spell.getId(), source.getSourceId(), game);
diff --git a/Mage.Sets/src/mage/cards/t/TemptWithDiscovery.java b/Mage.Sets/src/mage/cards/t/TemptWithDiscovery.java
index 5bd8462935c..b60644bf8bd 100644
--- a/Mage.Sets/src/mage/cards/t/TemptWithDiscovery.java
+++ b/Mage.Sets/src/mage/cards/t/TemptWithDiscovery.java
@@ -53,7 +53,7 @@ public class TemptWithDiscovery extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{G}");
 
         // Tempting offer - Search your library for a land card and put it onto the battlefield.
-        // Each opponent may search his or her library for a land card and put it onto the battlefield.
+        // Each opponent may search their library for a land card and put it onto the battlefield.
         // For each opponent who searches a library this way, search your library for a land card and put it onto the battlefield.
         // Then each player who searched a library this way shuffles it.
         this.getSpellAbility().addEffect(new TemptWithDiscoveryEffect());
@@ -73,7 +73,7 @@ class TemptWithDiscoveryEffect extends OneShotEffect {
 
     public TemptWithDiscoveryEffect() {
         super(Outcome.PutLandInPlay);
-        this.staticText = "<i>Tempting offer</i> - Search your library for a land card and put it onto the battlefield. Each opponent may search his or her library for a land card and put it onto the battlefield. For each opponent who searches a library this way, search your library for a land card and put it onto the battlefield. Then each player who searched a library this way shuffles it";
+        this.staticText = "<i>Tempting offer</i> - Search your library for a land card and put it onto the battlefield. Each opponent may search their library for a land card and put it onto the battlefield. For each opponent who searches a library this way, search your library for a land card and put it onto the battlefield. Then each player who searched a library this way shuffles it";
     }
 
     public TemptWithDiscoveryEffect(final TemptWithDiscoveryEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/TemptWithImmortality.java b/Mage.Sets/src/mage/cards/t/TemptWithImmortality.java
index e878f33da93..054e87f7501 100644
--- a/Mage.Sets/src/mage/cards/t/TemptWithImmortality.java
+++ b/Mage.Sets/src/mage/cards/t/TemptWithImmortality.java
@@ -54,7 +54,7 @@ public class TemptWithImmortality extends CardImpl {
     public TemptWithImmortality(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{B}");
 
-        // Tempting offer - Return a creature card from your graveyard to the battlefield. Each opponent may return a creature card from his or her graveyard to the battlefield. For each player who does, return a creature card from your graveyard to the battlefield.
+        // Tempting offer - Return a creature card from your graveyard to the battlefield. Each opponent may return a creature card from their graveyard to the battlefield. For each player who does, return a creature card from your graveyard to the battlefield.
         this.getSpellAbility().addEffect(new TemptWithImmortalityEffect());
     }
 
@@ -72,7 +72,7 @@ class TemptWithImmortalityEffect extends OneShotEffect {
 
     public TemptWithImmortalityEffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "<i>Tempting offer</i> - Return a creature card from your graveyard to the battlefield. Each opponent may return a creature card from his or her graveyard to the battlefield. For each player who does, return a creature card from your graveyard to the battlefield";
+        this.staticText = "<i>Tempting offer</i> - Return a creature card from your graveyard to the battlefield. Each opponent may return a creature card from their graveyard to the battlefield. For each player who does, return a creature card from your graveyard to the battlefield";
 
     }
 
diff --git a/Mage.Sets/src/mage/cards/t/TemptingWurm.java b/Mage.Sets/src/mage/cards/t/TemptingWurm.java
index 73f608db7b6..13ece8370f2 100644
--- a/Mage.Sets/src/mage/cards/t/TemptingWurm.java
+++ b/Mage.Sets/src/mage/cards/t/TemptingWurm.java
@@ -62,7 +62,7 @@ public class TemptingWurm extends CardImpl {
         this.power = new MageInt(5);
         this.toughness = new MageInt(5);
 
-        // When Tempting Wurm enters the battlefield, each opponent may put any number of artifact, creature, enchantment, and/or land cards from his or her hand onto the battlefield.
+        // When Tempting Wurm enters the battlefield, each opponent may put any number of artifact, creature, enchantment, and/or land cards from their hand onto the battlefield.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new TemptingWurmEffect()));
     }
 
@@ -91,7 +91,7 @@ class TemptingWurmEffect extends OneShotEffect {
     
     public TemptingWurmEffect() {
         super(Outcome.Detriment);
-        this.staticText = "each opponent may put any number of artifact, creature, enchantment, and/or land cards from his or her hand onto the battlefield.";
+        this.staticText = "each opponent may put any number of artifact, creature, enchantment, and/or land cards from their hand onto the battlefield.";
     }
     
     @Override
diff --git a/Mage.Sets/src/mage/cards/t/ThadaAdelAcquisitor.java b/Mage.Sets/src/mage/cards/t/ThadaAdelAcquisitor.java
index a81fdae044a..2d8ce52d980 100644
--- a/Mage.Sets/src/mage/cards/t/ThadaAdelAcquisitor.java
+++ b/Mage.Sets/src/mage/cards/t/ThadaAdelAcquisitor.java
@@ -64,7 +64,7 @@ public class ThadaAdelAcquisitor extends CardImpl {
         // Islandwalk
         this.addAbility(new IslandwalkAbility());
 
-        // Whenever Thada Adel, Acquisitor deals combat damage to a player, search that player's library for an artifact card and exile it. Then that player shuffles his or her library. Until end of turn, you may play that card.
+        // Whenever Thada Adel, Acquisitor deals combat damage to a player, search that player's library for an artifact card and exile it. Then that player shuffles their library. Until end of turn, you may play that card.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new ThadaAdelAcquisitorEffect(), false, true));
     }
 
@@ -82,7 +82,7 @@ class ThadaAdelAcquisitorEffect extends OneShotEffect {
 
     ThadaAdelAcquisitorEffect() {
         super(Outcome.Exile);
-        staticText = "search that player's library for an artifact card and exile it. Then that player shuffles his or her library. Until end of turn, you may play that card";
+        staticText = "search that player's library for an artifact card and exile it. Then that player shuffles their library. Until end of turn, you may play that card";
     }
 
     ThadaAdelAcquisitorEffect(final ThadaAdelAcquisitorEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/ThassasBounty.java b/Mage.Sets/src/mage/cards/t/ThassasBounty.java
index 9e19ce77736..270c80ee997 100644
--- a/Mage.Sets/src/mage/cards/t/ThassasBounty.java
+++ b/Mage.Sets/src/mage/cards/t/ThassasBounty.java
@@ -45,7 +45,7 @@ public class ThassasBounty extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{U}");
 
 
-        // Draw three cards. Target player puts the top three cards of his or her library into his or her graveyard.
+        // Draw three cards. Target player puts the top three cards of their library into their graveyard.
         this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(3));
         this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(3));
         this.getSpellAbility().addTarget(new TargetPlayer());
diff --git a/Mage.Sets/src/mage/cards/t/ThassasDevourer.java b/Mage.Sets/src/mage/cards/t/ThassasDevourer.java
index b90980b1446..6f8ea30067d 100644
--- a/Mage.Sets/src/mage/cards/t/ThassasDevourer.java
+++ b/Mage.Sets/src/mage/cards/t/ThassasDevourer.java
@@ -51,7 +51,7 @@ public class ThassasDevourer extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(6);
 
-        // Constellation — Whenever Thassa's Devourer or another enchantment enters the battlefield under your control, target player puts the top two cards of his or her library into his or her graveyard.
+        // Constellation — Whenever Thassa's Devourer or another enchantment enters the battlefield under your control, target player puts the top two cards of their library into their graveyard.
         Ability ability = new ConstellationAbility(new PutTopCardOfLibraryIntoGraveTargetEffect(2), false);
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/t/TheAbyss.java b/Mage.Sets/src/mage/cards/t/TheAbyss.java
index 741e5054b82..6195c42ba0d 100644
--- a/Mage.Sets/src/mage/cards/t/TheAbyss.java
+++ b/Mage.Sets/src/mage/cards/t/TheAbyss.java
@@ -55,7 +55,7 @@ public class TheAbyss extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{B}");
         addSuperType(SuperType.WORLD);
 
-        // At the beginning of each player's upkeep, destroy target nonartifact creature that player controls of his or her choice. It can't be regenerated.
+        // At the beginning of each player's upkeep, destroy target nonartifact creature that player controls of their choice. It can't be regenerated.
         this.addAbility(new TheAbyssTriggeredAbility());
     }
 
@@ -108,6 +108,6 @@ class TheAbyssTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "At the beginning of each player's upkeep, destroy target nonartifact creature that player controls of his or her choice. It can't be regenerated.";
+        return "At the beginning of each player's upkeep, destroy target nonartifact creature that player controls of their choice. It can't be regenerated.";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/t/TheGreatAurora.java b/Mage.Sets/src/mage/cards/t/TheGreatAurora.java
index af4912cfd8c..532cbad601a 100644
--- a/Mage.Sets/src/mage/cards/t/TheGreatAurora.java
+++ b/Mage.Sets/src/mage/cards/t/TheGreatAurora.java
@@ -54,7 +54,7 @@ public class TheGreatAurora extends CardImpl {
     public TheGreatAurora(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{6}{G}{G}{G}");
 
-        // Each player shuffles all cards from his or her hand and all permanents he or she owns into his or her library, then draws that many cards. Each player may put any number of land cards from his or her hand onto the battlefield. Exile The Great Aurora.
+        // Each player shuffles all cards from their hand and all permanents he or she owns into their library, then draws that many cards. Each player may put any number of land cards from their hand onto the battlefield. Exile The Great Aurora.
         this.getSpellAbility().addEffect(new TheGreatAuroraEffect());
         this.getSpellAbility().addEffect(ExileSpellEffect.getInstance());
     }
@@ -73,7 +73,7 @@ class TheGreatAuroraEffect extends OneShotEffect {
 
     public TheGreatAuroraEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Each player shuffles all cards from his or her hand and all permanents he or she owns into his or her library, then draws that many cards. Each player may put any number of land cards from his or her hand onto the battlefield";
+        this.staticText = "Each player shuffles all cards from their hand and all permanents he or she owns into their library, then draws that many cards. Each player may put any number of land cards from their hand onto the battlefield";
     }
 
     public TheGreatAuroraEffect(final TheGreatAuroraEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/TheRack.java b/Mage.Sets/src/mage/cards/t/TheRack.java
index c25a92d5667..a41d5962d15 100644
--- a/Mage.Sets/src/mage/cards/t/TheRack.java
+++ b/Mage.Sets/src/mage/cards/t/TheRack.java
@@ -54,7 +54,7 @@ public class TheRack extends CardImpl {
 
         // As The Rack enters the battlefield, choose an opponent.
         this.addAbility(new AsEntersBattlefieldAbility(new ChooseOpponentEffect(Outcome.Detriment)));
-        // At the beginning of the chosen player's upkeep, The Rack deals X damage to that player, where X is 3 minus the number of cards in his or her hand.
+        // At the beginning of the chosen player's upkeep, The Rack deals X damage to that player, where X is 3 minus the number of cards in their hand.
         this.addAbility(new TheRackTriggeredAbility());
     }
 
@@ -104,7 +104,7 @@ class TheRackEffect extends OneShotEffect {
 
     public TheRackEffect() {
         super(Outcome.Benefit);
-        this.staticText = "{this} deals X damage to that player, where X is 3 minus the number of cards in his or her hand";
+        this.staticText = "{this} deals X damage to that player, where X is 3 minus the number of cards in their hand";
     }
 
     public TheRackEffect(final TheRackEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/ThievesAuction.java b/Mage.Sets/src/mage/cards/t/ThievesAuction.java
index a39726dfa65..cb1088c1ce8 100644
--- a/Mage.Sets/src/mage/cards/t/ThievesAuction.java
+++ b/Mage.Sets/src/mage/cards/t/ThievesAuction.java
@@ -59,7 +59,7 @@ public class ThievesAuction extends CardImpl {
     public ThievesAuction(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{R}{R}{R}");
 
-        // Exile all nontoken permanents. Starting with you, each player chooses one of the exiled cards and puts it onto the battlefield tapped under his or her control. Repeat this process until all cards exiled this way have been chosen.
+        // Exile all nontoken permanents. Starting with you, each player chooses one of the exiled cards and puts it onto the battlefield tapped under their control. Repeat this process until all cards exiled this way have been chosen.
         this.getSpellAbility().addEffect(new ThievesAuctionEffect());
     }
 
@@ -83,7 +83,7 @@ class ThievesAuctionEffect extends OneShotEffect {
 
     ThievesAuctionEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Exile all nontoken permanents. Starting with you, each player chooses one of the exiled cards and puts it onto the battlefield tapped under his or her control. Repeat this process until all cards exiled this way have been chosen";
+        this.staticText = "Exile all nontoken permanents. Starting with you, each player chooses one of the exiled cards and puts it onto the battlefield tapped under their control. Repeat this process until all cards exiled this way have been chosen";
     }
 
     ThievesAuctionEffect(final ThievesAuctionEffect effect) {
@@ -113,7 +113,7 @@ class ThievesAuctionEffect extends OneShotEffect {
                     // chooses one of the exiled cards
                     TargetCard target = new TargetCardInExile(new FilterCard());
                     if (player.choose(Outcome.PutCardInPlay, exiledCards, target, game)) {
-                        // and puts it onto the battlefield tapped under his or her control.
+                        // and puts it onto the battlefield tapped under their control.
                         Card chosenCard = exiledCards.get(target.getFirstTarget(), game);
                         player.moveCards(chosenCard, Zone.BATTLEFIELD, source, game, true, false, false, null);
                         exiledCards.remove(chosenCard);
diff --git a/Mage.Sets/src/mage/cards/t/ThievingSprite.java b/Mage.Sets/src/mage/cards/t/ThievingSprite.java
index 61ca6f17b1f..47c82eb2dbe 100644
--- a/Mage.Sets/src/mage/cards/t/ThievingSprite.java
+++ b/Mage.Sets/src/mage/cards/t/ThievingSprite.java
@@ -68,7 +68,7 @@ public class ThievingSprite extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
         
-        // When Thieving Sprite enters the battlefield, target player reveals X cards from his or her hand, where X is the number of Faeries you control.
+        // When Thieving Sprite enters the battlefield, target player reveals X cards from their hand, where X is the number of Faeries you control.
         // You choose one of those cards. That player discards that card.
         Ability ability = new EntersBattlefieldTriggeredAbility(new ThievingSpriteEffect(), false);
         TargetPlayer target = new TargetPlayer();
@@ -91,7 +91,7 @@ class ThievingSpriteEffect extends OneShotEffect {
 
     public ThievingSpriteEffect() {
         super(Outcome.Discard);
-        this.staticText = "target player reveals X cards from his or her hand, where X is the number of Faeries you control. You choose one of those cards. "
+        this.staticText = "target player reveals X cards from their hand, where X is the number of Faeries you control. You choose one of those cards. "
                 + "That player discards that card";
     }
 
diff --git a/Mage.Sets/src/mage/cards/t/ThoughtHarvester.java b/Mage.Sets/src/mage/cards/t/ThoughtHarvester.java
index 0f642ff5006..f197cbfdc21 100644
--- a/Mage.Sets/src/mage/cards/t/ThoughtHarvester.java
+++ b/Mage.Sets/src/mage/cards/t/ThoughtHarvester.java
@@ -67,7 +67,7 @@ public class ThoughtHarvester extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
 
-        // Whenever you cast a colorless spell, target opponent exiles the top card of his or her library.
+        // Whenever you cast a colorless spell, target opponent exiles the top card of their library.
         Ability ability = new SpellCastControllerTriggeredAbility(new ExileCardsFromTopOfLibraryTargetEffect(1, "target opponent"), filter, false);
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/t/ThoughtHemorrhage.java b/Mage.Sets/src/mage/cards/t/ThoughtHemorrhage.java
index fda4f611e9e..e32182fd0d5 100644
--- a/Mage.Sets/src/mage/cards/t/ThoughtHemorrhage.java
+++ b/Mage.Sets/src/mage/cards/t/ThoughtHemorrhage.java
@@ -58,7 +58,7 @@ public class ThoughtHemorrhage extends CardImpl {
     public ThoughtHemorrhage(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{B}{R}");
 
-        // Name a nonland card. Target player reveals his or her hand. Thought Hemorrhage deals 3 damage to that player for each card with that name revealed this way. Search that player's graveyard, hand, and library for all cards with that name and exile them. Then that player shuffles his or her library.
+        // Name a nonland card. Target player reveals their hand. Thought Hemorrhage deals 3 damage to that player for each card with that name revealed this way. Search that player's graveyard, hand, and library for all cards with that name and exile them. Then that player shuffles their library.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new NameACardEffect(NameACardEffect.TypeOfName.NON_LAND_NAME));
         this.getSpellAbility().addEffect(new ThoughtHemorrhageEffect());
@@ -76,7 +76,7 @@ public class ThoughtHemorrhage extends CardImpl {
 
 class ThoughtHemorrhageEffect extends OneShotEffect {
 
-    static final String rule = "Target player reveals his or her hand. {this} deals 3 damage to that player for each card with that name revealed this way. Search that player's graveyard, hand, and library for all cards with that name and exile them. Then that player shuffles his or her library";
+    static final String rule = "Target player reveals their hand. {this} deals 3 damage to that player for each card with that name revealed this way. Search that player's graveyard, hand, and library for all cards with that name and exile them. Then that player shuffles their library";
 
     public ThoughtHemorrhageEffect() {
         super(Outcome.Exile);
@@ -133,7 +133,7 @@ class ThoughtHemorrhageEffect extends OneShotEffect {
                 }
 
                 // search cards in Library
-                // If the player has no nonland cards in his or her hand, you can still search that player's library and have him or her shuffle it.
+                // If the player has no nonland cards in their hand, you can still search that player's library and have him or her shuffle it.
                 TargetCardInLibrary targetCardsLibrary = new TargetCardInLibrary(0, Integer.MAX_VALUE, filterNamedCards);
                 controller.searchLibrary(targetCardsLibrary, game, targetPlayer.getId());
                 for (UUID cardId : targetCardsLibrary.getTargets()) {
diff --git a/Mage.Sets/src/mage/cards/t/ThoughtKnotSeer.java b/Mage.Sets/src/mage/cards/t/ThoughtKnotSeer.java
index 9e05e34d138..e9b254dc51e 100644
--- a/Mage.Sets/src/mage/cards/t/ThoughtKnotSeer.java
+++ b/Mage.Sets/src/mage/cards/t/ThoughtKnotSeer.java
@@ -53,7 +53,7 @@ public class ThoughtKnotSeer extends CardImpl {
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);
 
-        // When Thought-Knot Seer enters the battlefield, target opponent reveals his or her hand. You choose a nonland card from it and exile that card.
+        // When Thought-Knot Seer enters the battlefield, target opponent reveals their hand. You choose a nonland card from it and exile that card.
         Ability ability = new EntersBattlefieldTriggeredAbility(new ExileCardYouChooseTargetOpponentEffect(StaticFilters.FILTER_CARD_A_NON_LAND), false);
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/t/ThoughtLash.java b/Mage.Sets/src/mage/cards/t/ThoughtLash.java
index 07056ee4d8f..3b9ae817865 100644
--- a/Mage.Sets/src/mage/cards/t/ThoughtLash.java
+++ b/Mage.Sets/src/mage/cards/t/ThoughtLash.java
@@ -60,7 +60,7 @@ public class ThoughtLash extends CardImpl {
         // Cumulative upkeep - Exile the top card of your library.
         this.addAbility(new CumulativeUpkeepAbility(new ExileFromTopOfLibraryCost(1)));
 
-        // When a player doesn't pay Thought Lash's cumulative upkeep, that player exiles all cards from his or her library.
+        // When a player doesn't pay Thought Lash's cumulative upkeep, that player exiles all cards from their library.
         this.addAbility(new ThoughtLashTriggeredAbility());
 
         // Exile the top card of your library: Prevent the next 1 damage that would be dealt to you this turn.
@@ -104,7 +104,7 @@ class ThoughtLashTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "When a player doesn't pay {this}'s cumulative upkeep, that player exiles all cards from his or her library.";
+        return "When a player doesn't pay {this}'s cumulative upkeep, that player exiles all cards from their library.";
     }
 }
 
@@ -112,7 +112,7 @@ class ThoughtLashExileLibraryEffect extends OneShotEffect {
 
     ThoughtLashExileLibraryEffect() {
         super(Outcome.Detriment);
-        this.staticText = "that player exiles all cards from his or her library";
+        this.staticText = "that player exiles all cards from their library";
     }
 
     ThoughtLashExileLibraryEffect(final ThoughtLashExileLibraryEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/ThoughtPrison.java b/Mage.Sets/src/mage/cards/t/ThoughtPrison.java
index 991dbc5607a..845df319631 100644
--- a/Mage.Sets/src/mage/cards/t/ThoughtPrison.java
+++ b/Mage.Sets/src/mage/cards/t/ThoughtPrison.java
@@ -66,7 +66,7 @@ public class ThoughtPrison extends CardImpl {
     public ThoughtPrison(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}");
 
-        // Imprint - When Thought Prison enters the battlefield, you may have target player reveal his or her hand. If you do, choose a nonland card from it and exile that card.
+        // Imprint - When Thought Prison enters the battlefield, you may have target player reveal their hand. If you do, choose a nonland card from it and exile that card.
         EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new ThoughtPrisonImprintEffect(), true, "<i>Imprint - </i>");
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/t/ThoughtScour.java b/Mage.Sets/src/mage/cards/t/ThoughtScour.java
index 5149d3e139e..e70c816ab12 100644
--- a/Mage.Sets/src/mage/cards/t/ThoughtScour.java
+++ b/Mage.Sets/src/mage/cards/t/ThoughtScour.java
@@ -45,7 +45,7 @@ public class ThoughtScour extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{U}");
 
 
-        // Target player puts the top two cards of his or her library into his or her graveyard.
+        // Target player puts the top two cards of their library into their graveyard.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(2));
         // Draw a card.
diff --git a/Mage.Sets/src/mage/cards/t/ThoughtcutterAgent.java b/Mage.Sets/src/mage/cards/t/ThoughtcutterAgent.java
index 15814283e2d..32034519614 100644
--- a/Mage.Sets/src/mage/cards/t/ThoughtcutterAgent.java
+++ b/Mage.Sets/src/mage/cards/t/ThoughtcutterAgent.java
@@ -58,12 +58,12 @@ public class ThoughtcutterAgent extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        // {U}{B}, {tap}: Target player loses 1 life and reveals his or her hand.
+        // {U}{B}, {tap}: Target player loses 1 life and reveals their hand.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl("{U}{B}"));
         ability.addCost(new TapSourceCost());
         
         Effect revealEffect = new RevealHandTargetEffect(TargetController.ANY);
-        revealEffect.setText("and reveals his or her hand");
+        revealEffect.setText("and reveals their hand");
         ability.addEffect(revealEffect);
         
         ability.addTarget(new TargetPlayer());
diff --git a/Mage.Sets/src/mage/cards/t/Thoughtseize.java b/Mage.Sets/src/mage/cards/t/Thoughtseize.java
index a6d1f4f00cb..00ec5bf8263 100644
--- a/Mage.Sets/src/mage/cards/t/Thoughtseize.java
+++ b/Mage.Sets/src/mage/cards/t/Thoughtseize.java
@@ -55,7 +55,7 @@ public class Thoughtseize extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}");
 
 
-        // Target player reveals his or her hand. You choose a nonland card from it. That player discards that card. You lose 2 life.
+        // Target player reveals their hand. You choose a nonland card from it. That player discards that card. You lose 2 life.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(filter, TargetController.ANY));
         this.getSpellAbility().addEffect(new LoseLifeSourceControllerEffect(2));
diff --git a/Mage.Sets/src/mage/cards/t/ThranFoundry.java b/Mage.Sets/src/mage/cards/t/ThranFoundry.java
index 58310aa2633..8d91a71903e 100644
--- a/Mage.Sets/src/mage/cards/t/ThranFoundry.java
+++ b/Mage.Sets/src/mage/cards/t/ThranFoundry.java
@@ -53,7 +53,7 @@ public class ThranFoundry extends CardImpl {
     public ThranFoundry(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}");
 
-        // {1}, {tap}, Exile Thran Foundry: Target player shuffles his or her graveyard into his or her library.
+        // {1}, {tap}, Exile Thran Foundry: Target player shuffles their graveyard into their library.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ThranFoundryEffect(), new GenericManaCost(1));
         ability.addCost(new TapSourceCost());
         ability.addCost(new ExileSourceCost());
@@ -75,7 +75,7 @@ class ThranFoundryEffect extends OneShotEffect {
     
     ThranFoundryEffect() {
         super(Outcome.Neutral);
-        this.staticText = "Target player shuffles his or her graveyard into his or her library";
+        this.staticText = "Target player shuffles their graveyard into their library";
     }
     
     ThranFoundryEffect(final ThranFoundryEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/TidehollowSculler.java b/Mage.Sets/src/mage/cards/t/TidehollowSculler.java
index d4c306bddf6..2548fe14fbf 100644
--- a/Mage.Sets/src/mage/cards/t/TidehollowSculler.java
+++ b/Mage.Sets/src/mage/cards/t/TidehollowSculler.java
@@ -64,7 +64,7 @@ public class TidehollowSculler extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        // When Tidehollow Sculler enters the battlefield, target opponent reveals his or her hand and you choose a nonland card from it. Exile that card.
+        // When Tidehollow Sculler enters the battlefield, target opponent reveals their hand and you choose a nonland card from it. Exile that card.
         Ability ability = new EntersBattlefieldTriggeredAbility(new TidehollowScullerExileEffect(), false);
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
@@ -87,7 +87,7 @@ class TidehollowScullerExileEffect extends OneShotEffect {
 
     public TidehollowScullerExileEffect() {
         super(Outcome.Exile);
-        this.staticText = "target opponent reveals his or her hand and you choose a nonland card from it. Exile that card";
+        this.staticText = "target opponent reveals their hand and you choose a nonland card from it. Exile that card";
     }
 
     public TidehollowScullerExileEffect(final TidehollowScullerExileEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/TimeReversal.java b/Mage.Sets/src/mage/cards/t/TimeReversal.java
index 7f003dd7694..50c7b8dda62 100644
--- a/Mage.Sets/src/mage/cards/t/TimeReversal.java
+++ b/Mage.Sets/src/mage/cards/t/TimeReversal.java
@@ -50,7 +50,7 @@ public class TimeReversal extends CardImpl {
     public TimeReversal(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{U}{U}");
 
-        // Each player shuffles his or her hand and graveyard into his or her library, then draws seven cards
+        // Each player shuffles their hand and graveyard into their library, then draws seven cards
         this.getSpellAbility().addEffect(new TimeReversalEffect());
         Effect effect = new DrawCardAllEffect(7);
         effect.setText(", then draws seven cards");
@@ -72,7 +72,7 @@ class TimeReversalEffect extends OneShotEffect {
 
     public TimeReversalEffect() {
         super(Outcome.Neutral);
-        staticText = "Each player shuffles his or her hand and graveyard into his or her library, then draws seven cards";
+        staticText = "Each player shuffles their hand and graveyard into their library, then draws seven cards";
     }
 
     public TimeReversalEffect(final TimeReversalEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/TimeSpiral.java b/Mage.Sets/src/mage/cards/t/TimeSpiral.java
index a0fb22f7a4f..5eacc6ce3cd 100644
--- a/Mage.Sets/src/mage/cards/t/TimeSpiral.java
+++ b/Mage.Sets/src/mage/cards/t/TimeSpiral.java
@@ -52,7 +52,7 @@ public class TimeSpiral extends CardImpl {
     public TimeSpiral(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{U}{U}");
 
-        // Exile Time Spiral. Each player shuffles his or her graveyard and hand into his or her library, then draws seven cards. You untap up to six lands.
+        // Exile Time Spiral. Each player shuffles their graveyard and hand into their library, then draws seven cards. You untap up to six lands.
         this.getSpellAbility().addEffect(ExileSpellEffect.getInstance());
         this.getSpellAbility().addEffect(new TimeSpiralEffect());
         Effect effect = new DrawCardAllEffect(7);
@@ -75,7 +75,7 @@ class TimeSpiralEffect extends OneShotEffect {
 
     public TimeSpiralEffect() {
         super(Outcome.Neutral);
-        staticText = "Each player shuffles his or her hand and graveyard into his or her library";
+        staticText = "Each player shuffles their hand and graveyard into their library";
     }
 
     public TimeSpiralEffect(final TimeSpiralEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/TimeVault.java b/Mage.Sets/src/mage/cards/t/TimeVault.java
index 29b20b48930..de29aea7cdd 100644
--- a/Mage.Sets/src/mage/cards/t/TimeVault.java
+++ b/Mage.Sets/src/mage/cards/t/TimeVault.java
@@ -120,7 +120,7 @@ class TimeVaultReplacementEffect extends ReplacementEffectImpl {
         if (player != null && permanent != null) {
             if (player.chooseUse(Outcome.Untap, "Skip your turn to untap " + permanent.getName() + '?', source, game)) {
                 permanent.untap(game);
-                game.informPlayers(player.getLogName() + " skips his or her turn to untap " + permanent.getLogName());
+                game.informPlayers(player.getLogName() + " skips their turn to untap " + permanent.getLogName());
                 return true;
             }
         }
diff --git a/Mage.Sets/src/mage/cards/t/Timesifter.java b/Mage.Sets/src/mage/cards/t/Timesifter.java
index 845ba6f5ea6..a9c7c846094 100644
--- a/Mage.Sets/src/mage/cards/t/Timesifter.java
+++ b/Mage.Sets/src/mage/cards/t/Timesifter.java
@@ -54,7 +54,7 @@ public class Timesifter extends CardImpl {
     public Timesifter(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{5}");
 
-        // At the beginning of each upkeep, each player exiles the top card of his or her library. The player who exiled the card with the highest converted mana cost takes an extra turn after this one. If two or more players' cards are tied for highest cost, the tied players repeat this process until the tie is broken.
+        // At the beginning of each upkeep, each player exiles the top card of their library. The player who exiled the card with the highest converted mana cost takes an extra turn after this one. If two or more players' cards are tied for highest cost, the tied players repeat this process until the tie is broken.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new TimesifterEffect(), TargetController.ANY, false));
     }
 
@@ -72,7 +72,7 @@ class TimesifterEffect extends OneShotEffect {
 
     TimesifterEffect() {
         super(Outcome.ExtraTurn);
-        this.staticText = "each player exiles the top card of his or her library. The player who exiled the card with the highest converted mana cost takes an extra turn after this one. If two or more players' cards are tied for highest cost, the tied players repeat this process until the tie is broken";
+        this.staticText = "each player exiles the top card of their library. The player who exiled the card with the highest converted mana cost takes an extra turn after this one. If two or more players' cards are tied for highest cost, the tied players repeat this process until the tie is broken";
     }
 
     TimesifterEffect(final TimesifterEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/Timetwister.java b/Mage.Sets/src/mage/cards/t/Timetwister.java
index 03c05adc5e9..7f5243640ad 100644
--- a/Mage.Sets/src/mage/cards/t/Timetwister.java
+++ b/Mage.Sets/src/mage/cards/t/Timetwister.java
@@ -49,7 +49,7 @@ public class Timetwister extends CardImpl {
     public Timetwister(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{U}");
 
-        // Each player shuffles his or her hand and graveyard into his or her library, then draws seven cards.
+        // Each player shuffles their hand and graveyard into their library, then draws seven cards.
         this.getSpellAbility().addEffect(new TimetwisterEffect());
         Effect effect = new DrawCardAllEffect(7);
         effect.setText(", then draws seven cards");
@@ -71,7 +71,7 @@ class TimetwisterEffect extends OneShotEffect {
 
     public TimetwisterEffect() {
         super(Outcome.Neutral);
-        staticText = "Each player shuffles his or her hand and graveyard into his or her library";
+        staticText = "Each player shuffles their hand and graveyard into their library";
     }
 
     public TimetwisterEffect(final TimetwisterEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/Tombfire.java b/Mage.Sets/src/mage/cards/t/Tombfire.java
index ce4e041426c..604aac33719 100644
--- a/Mage.Sets/src/mage/cards/t/Tombfire.java
+++ b/Mage.Sets/src/mage/cards/t/Tombfire.java
@@ -52,7 +52,7 @@ public class Tombfire extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{B}");
 
 
-        // Target player exiles all cards with flashback from his or her graveyard.
+        // Target player exiles all cards with flashback from their graveyard.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new TombfireEffect());
 
@@ -78,7 +78,7 @@ class TombfireEffect extends OneShotEffect {
 
     public TombfireEffect() {
         super(Outcome.Exile);
-        staticText = "Target player exiles all cards with flashback from his or her graveyard";
+        staticText = "Target player exiles all cards with flashback from their graveyard";
     }
 
     public TombfireEffect(final TombfireEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/TombstoneStairwell.java b/Mage.Sets/src/mage/cards/t/TombstoneStairwell.java
index 6ee6eb340cb..e2e6216f740 100644
--- a/Mage.Sets/src/mage/cards/t/TombstoneStairwell.java
+++ b/Mage.Sets/src/mage/cards/t/TombstoneStairwell.java
@@ -69,7 +69,7 @@ public class TombstoneStairwell extends CardImpl {
         // Cumulative upkeep-Pay {1}{B}.
         this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{1}{B}")));
 
-        // At the beginning of each upkeep, if Tombstone Stairwell is on the battlefield, each player creates a 2/2 black Zombie creature token with haste named Tombspawn for each creature card in his or her graveyard.
+        // At the beginning of each upkeep, if Tombstone Stairwell is on the battlefield, each player creates a 2/2 black Zombie creature token with haste named Tombspawn for each creature card in their graveyard.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new TombstoneStairwellCreateTokenEffect(), TargetController.ANY, false));
 
         // At the beginning of each end step or when Tombstone Stairwell leaves the battlefield, destroy all tokens created with Tombstone Stairwell. They can't be regenerated.
@@ -90,7 +90,7 @@ class TombstoneStairwellCreateTokenEffect extends OneShotEffect {
 
     TombstoneStairwellCreateTokenEffect() {
         super(Outcome.PutCreatureInPlay);
-        this.staticText = "if {this} is on the battlefield, each player creates a 2/2 black Zombie creature token with haste named Tombspawn for each creature card in his or her graveyard";
+        this.staticText = "if {this} is on the battlefield, each player creates a 2/2 black Zombie creature token with haste named Tombspawn for each creature card in their graveyard";
     }
 
     TombstoneStairwellCreateTokenEffect(final TombstoneStairwellCreateTokenEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/TraceOfAbundance.java b/Mage.Sets/src/mage/cards/t/TraceOfAbundance.java
index 9c9462bd04a..c3ec37655e5 100644
--- a/Mage.Sets/src/mage/cards/t/TraceOfAbundance.java
+++ b/Mage.Sets/src/mage/cards/t/TraceOfAbundance.java
@@ -73,7 +73,7 @@ public class TraceOfAbundance extends CardImpl {
         // Enchanted land has shroud.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield, rule)));
 
-        // Whenever enchanted land is tapped for mana, its controller adds one mana of any color to his or her mana pool.
+        // Whenever enchanted land is tapped for mana, its controller adds one mana of any color to their mana pool.
         this.addAbility(new TraceOfAbundanceTriggeredAbility());
     }
 
@@ -115,6 +115,6 @@ class TraceOfAbundanceTriggeredAbility extends TriggeredManaAbility {
 
     @Override
     public String getRule() {
-        return "Whenever enchanted land is tapped for mana, its controller adds one mana of any color to his or her mana pool.";
+        return "Whenever enchanted land is tapped for mana, its controller adds one mana of any color to their mana pool.";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/t/TransgressTheMind.java b/Mage.Sets/src/mage/cards/t/TransgressTheMind.java
index 371a475bef8..6cea59536d4 100644
--- a/Mage.Sets/src/mage/cards/t/TransgressTheMind.java
+++ b/Mage.Sets/src/mage/cards/t/TransgressTheMind.java
@@ -57,9 +57,9 @@ public class TransgressTheMind extends CardImpl {
         // Devoid
         this.addAbility(new DevoidAbility(this.color));
 
-        // Target player reveals his or her hand. You may choose a card from it with converted mana cost 3 or greater and exile that card.
+        // Target player reveals their hand. You may choose a card from it with converted mana cost 3 or greater and exile that card.
         Effect effect = new ExileCardYouChooseTargetOpponentEffect(filter);
-        effect.setText("Target player reveals his or her hand. You may choose a card from it with converted mana cost 3 or greater and exile that card");
+        effect.setText("Target player reveals their hand. You may choose a card from it with converted mana cost 3 or greater and exile that card");
         this.getSpellAbility().addEffect(effect);
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
diff --git a/Mage.Sets/src/mage/cards/t/TrapfindersTrick.java b/Mage.Sets/src/mage/cards/t/TrapfindersTrick.java
index 3d864c4de11..20e9f7c5105 100644
--- a/Mage.Sets/src/mage/cards/t/TrapfindersTrick.java
+++ b/Mage.Sets/src/mage/cards/t/TrapfindersTrick.java
@@ -52,7 +52,7 @@ public class TrapfindersTrick extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{1}{U}");
 
 
-        // Target player reveals his or her hand and discards all Trap cards.
+        // Target player reveals their hand and discards all Trap cards.
         this.getSpellAbility().addEffect(new TrapfindersTrickEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
@@ -71,7 +71,7 @@ class TrapfindersTrickEffect extends OneShotEffect {
 
     public TrapfindersTrickEffect() {
         super(Outcome.Discard);
-        this.staticText = "Target player reveals his or her hand and discards all Trap cards";
+        this.staticText = "Target player reveals their hand and discards all Trap cards";
     }
 
     public TrapfindersTrickEffect(final TrapfindersTrickEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/Traumatize.java b/Mage.Sets/src/mage/cards/t/Traumatize.java
index 71d51e8fc64..dd3df66ceae 100644
--- a/Mage.Sets/src/mage/cards/t/Traumatize.java
+++ b/Mage.Sets/src/mage/cards/t/Traumatize.java
@@ -67,7 +67,7 @@ class TraumatizeEffect extends OneShotEffect {
 
     public TraumatizeEffect() {
         super(Outcome.Detriment);
-        staticText = "Target player puts the top half of his or her library, rounded down, into his or her graveyard";
+        staticText = "Target player puts the top half of their library, rounded down, into their graveyard";
     }
 
     public TraumatizeEffect(final TraumatizeEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/TreacherousUrge.java b/Mage.Sets/src/mage/cards/t/TreacherousUrge.java
index edaa9445bc3..fb121d808b4 100644
--- a/Mage.Sets/src/mage/cards/t/TreacherousUrge.java
+++ b/Mage.Sets/src/mage/cards/t/TreacherousUrge.java
@@ -61,7 +61,7 @@ public class TreacherousUrge extends CardImpl {
     public TreacherousUrge(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{4}{B}");
 
-        // Target opponent reveals his or her hand. You may put a creature card from it onto the battlefield under your control. That creature gains haste. Sacrifice it at the beginning of the next end step.
+        // Target opponent reveals their hand. You may put a creature card from it onto the battlefield under your control. That creature gains haste. Sacrifice it at the beginning of the next end step.
         this.getSpellAbility().addEffect(new TreacherousUrgeEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
     }
@@ -82,7 +82,7 @@ class TreacherousUrgeEffect extends OneShotEffect {
 
     public TreacherousUrgeEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Target opponent reveals his or her hand. You may put a creature card from it onto the battlefield under your control. That creature gains haste. Sacrifice it at the beginning of the next end step";
+        this.staticText = "Target opponent reveals their hand. You may put a creature card from it onto the battlefield under your control. That creature gains haste. Sacrifice it at the beginning of the next end step";
     }
 
     public TreacherousUrgeEffect(final TreacherousUrgeEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/TrepanationBlade.java b/Mage.Sets/src/mage/cards/t/TrepanationBlade.java
index 220c92ec2bd..dad9896a3dc 100644
--- a/Mage.Sets/src/mage/cards/t/TrepanationBlade.java
+++ b/Mage.Sets/src/mage/cards/t/TrepanationBlade.java
@@ -60,8 +60,8 @@ public class TrepanationBlade extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}");
         this.subtype.add(SubType.EQUIPMENT);
 
-        // Whenever equipped creature attacks, defending player reveals cards from the top of his or her library until he or she reveals a land card.
-        // The creature gets +1/+0 until end of turn for each card revealed this way. That player puts the revealed cards into his or her graveyard.
+        // Whenever equipped creature attacks, defending player reveals cards from the top of their library until he or she reveals a land card.
+        // The creature gets +1/+0 until end of turn for each card revealed this way. That player puts the revealed cards into their graveyard.
         Ability ability = new AttacksAttachedTriggeredAbility(new TrepanationBladeDiscardEffect());
         ability.addEffect(new TrepanationBladeBoostEffect());
         this.addAbility(ability);
@@ -83,7 +83,7 @@ class TrepanationBladeDiscardEffect extends OneShotEffect {
 
     public TrepanationBladeDiscardEffect() {
         super(Outcome.Discard);
-        this.staticText = "defending player reveals cards from the top of his or her library until he or she reveals a land card. The creature gets +1/+0 until end of turn for each card revealed this way. That player puts the revealed cards into his or her graveyard";
+        this.staticText = "defending player reveals cards from the top of their library until he or she reveals a land card. The creature gets +1/+0 until end of turn for each card revealed this way. That player puts the revealed cards into their graveyard";
     }
 
     public TrepanationBladeDiscardEffect(final TrepanationBladeDiscardEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/TsabosDecree.java b/Mage.Sets/src/mage/cards/t/TsabosDecree.java
index 8975b2e9a2b..67372e86b8f 100644
--- a/Mage.Sets/src/mage/cards/t/TsabosDecree.java
+++ b/Mage.Sets/src/mage/cards/t/TsabosDecree.java
@@ -58,7 +58,7 @@ public class TsabosDecree extends CardImpl {
     public TsabosDecree(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{5}{B}");
 
-        // Choose a creature type. Target player reveals his or her hand and discards all creature cards of that type. Then destroy all creatures of that type that player controls. They can't be regenerated.
+        // Choose a creature type. Target player reveals their hand and discards all creature cards of that type. Then destroy all creatures of that type that player controls. They can't be regenerated.
         this.getSpellAbility().addEffect(new TsabosDecreeEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
@@ -77,7 +77,7 @@ class TsabosDecreeEffect extends OneShotEffect {
 
     public TsabosDecreeEffect() {
         super(Outcome.UnboostCreature);
-        staticText = "Choose a creature type. Target player reveals his or her hand and discards all creature cards of that type. Then destroy all creatures of that type that player controls. They can't be regenerated";
+        staticText = "Choose a creature type. Target player reveals their hand and discards all creature cards of that type. Then destroy all creatures of that type that player controls. They can't be regenerated";
     }
 
     public TsabosDecreeEffect(final TsabosDecreeEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/TunnelIgnus.java b/Mage.Sets/src/mage/cards/t/TunnelIgnus.java
index e69aaefbfe9..a3de7ea2cb7 100644
--- a/Mage.Sets/src/mage/cards/t/TunnelIgnus.java
+++ b/Mage.Sets/src/mage/cards/t/TunnelIgnus.java
@@ -150,6 +150,6 @@ class TunnelIgnusTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "Whenever a land enters the battlefield under an opponent's control, if that player had another land enter the battlefield under his or her control this turn, {this} deals 3 damage to that player.";
+        return "Whenever a land enters the battlefield under an opponent's control, if that player had another land enter the battlefield under their control this turn, {this} deals 3 damage to that player.";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/t/TunnelVision.java b/Mage.Sets/src/mage/cards/t/TunnelVision.java
index 9c1b33d6984..d67f374179b 100644
--- a/Mage.Sets/src/mage/cards/t/TunnelVision.java
+++ b/Mage.Sets/src/mage/cards/t/TunnelVision.java
@@ -55,9 +55,9 @@ public class TunnelVision extends CardImpl {
     public TunnelVision(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{5}{U}");
 
-        // Name a card. Target player reveals cards from the top of his or her library until the named card is revealed.
-        // If it is, that player puts the rest of the revealed cards into his or her graveyard and puts the named card on top of his or her library.
-        // Otherwise, the player shuffles his or her library.
+        // Name a card. Target player reveals cards from the top of their library until the named card is revealed.
+        // If it is, that player puts the rest of the revealed cards into their graveyard and puts the named card on top of their library.
+        // Otherwise, the player shuffles their library.
         this.getSpellAbility().addEffect(new NameACardEffect(NameACardEffect.TypeOfName.ALL));
         this.getSpellAbility().addEffect(new TunnelVisionEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
@@ -77,7 +77,7 @@ class TunnelVisionEffect extends OneShotEffect {
 
     public TunnelVisionEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Target player reveals cards from the top of his or her library until the named card is revealed. If it is, that player puts the rest of the revealed cards into his or her graveyard and puts the named card on top of his or her library. Otherwise, the player shuffles his or her library.";
+        this.staticText = "Target player reveals cards from the top of their library until the named card is revealed. If it is, that player puts the rest of the revealed cards into their graveyard and puts the named card on top of their library. Otherwise, the player shuffles their library.";
     }
 
     public TunnelVisionEffect(final TunnelVisionEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/t/TwilightsCall.java b/Mage.Sets/src/mage/cards/t/TwilightsCall.java
index d6649048a0f..c86a88c1310 100644
--- a/Mage.Sets/src/mage/cards/t/TwilightsCall.java
+++ b/Mage.Sets/src/mage/cards/t/TwilightsCall.java
@@ -58,7 +58,7 @@ public class TwilightsCall extends CardImpl {
         Ability ability = new PayMoreToCastAsThoughtItHadFlashAbility(this, new ManaCostsImpl("{2}"));
         ability.addEffect(effect);
         this.addAbility(ability);
-        // Each player returns all creature cards from his or her graveyard to the battlefield.
+        // Each player returns all creature cards from their graveyard to the battlefield.
         this.getSpellAbility().addEffect(effect);
     }
 
@@ -76,7 +76,7 @@ class TwilightsCallEffect extends OneShotEffect {
 
     public TwilightsCallEffect() {
         super(Outcome.Neutral);
-        staticText = "Each player returns all creature cards from his or her graveyard to the battlefield";
+        staticText = "Each player returns all creature cards from their graveyard to the battlefield";
     }
 
     public TwilightsCallEffect(TwilightsCallEffect copy) {
diff --git a/Mage.Sets/src/mage/cards/t/Tyrannize.java b/Mage.Sets/src/mage/cards/t/Tyrannize.java
index 25ba621caa3..f174b180e3c 100644
--- a/Mage.Sets/src/mage/cards/t/Tyrannize.java
+++ b/Mage.Sets/src/mage/cards/t/Tyrannize.java
@@ -52,7 +52,7 @@ public class Tyrannize extends CardImpl {
     public Tyrannize(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{B/R}{B/R}");
 
-        // Target player discards his or her hand unless he or she pays 7 life.
+        // Target player discards their hand unless he or she pays 7 life.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new TyrannizeEffect());
         
@@ -72,7 +72,7 @@ class TyrannizeEffect extends OneShotEffect {
     
     TyrannizeEffect() {
         super(Outcome.Discard);
-        this.staticText = "Target player discards his or her hand unless he or she pays 7 life";
+        this.staticText = "Target player discards their hand unless he or she pays 7 life";
     }
     
     TyrannizeEffect(final TyrannizeEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/u/UlamogTheCeaselessHunger.java b/Mage.Sets/src/mage/cards/u/UlamogTheCeaselessHunger.java
index 2cb969233e1..3d57a531d62 100644
--- a/Mage.Sets/src/mage/cards/u/UlamogTheCeaselessHunger.java
+++ b/Mage.Sets/src/mage/cards/u/UlamogTheCeaselessHunger.java
@@ -72,9 +72,9 @@ public class UlamogTheCeaselessHunger extends CardImpl {
         // Indestructible
         this.addAbility(IndestructibleAbility.getInstance());
 
-        // Whenever Ulamog attacks, defending player exiles the top twenty cards of his or her library.
+        // Whenever Ulamog attacks, defending player exiles the top twenty cards of their library.
         Effect effect = new UlamogExileLibraryEffect();
-        effect.setText("defending player exiles the top twenty cards of his or her library");
+        effect.setText("defending player exiles the top twenty cards of their library");
         this.addAbility(new UlamogAttackTriggeredAbility(effect));
     }
 
@@ -164,7 +164,7 @@ class UlamogExileLibraryEffect extends OneShotEffect {
 
     public UlamogExileLibraryEffect() {
         super(Outcome.Exile);
-        this.staticText = "defending player exiles the top twenty cards of his or her library";
+        this.staticText = "defending player exiles the top twenty cards of their library";
     }
 
     public UlamogExileLibraryEffect(final UlamogExileLibraryEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/u/UlamogTheInfiniteGyre.java b/Mage.Sets/src/mage/cards/u/UlamogTheInfiniteGyre.java
index fd9464bf377..4cabb45ba1e 100644
--- a/Mage.Sets/src/mage/cards/u/UlamogTheInfiniteGyre.java
+++ b/Mage.Sets/src/mage/cards/u/UlamogTheInfiniteGyre.java
@@ -66,7 +66,7 @@ public class UlamogTheInfiniteGyre extends CardImpl {
         this.addAbility(new AnnihilatorAbility(4));
         // Indestructible
         this.addAbility(IndestructibleAbility.getInstance());
-        // When Ulamog is put into a graveyard from anywhere, its owner shuffles his or her graveyard into his or her library.
+        // When Ulamog is put into a graveyard from anywhere, its owner shuffles their graveyard into their library.
         this.addAbility(new PutIntoGraveFromAnywhereSourceTriggeredAbility(new ShuffleIntoLibraryGraveOfSourceOwnerEffect(), false));
     }
 
diff --git a/Mage.Sets/src/mage/cards/u/UndeadAlchemist.java b/Mage.Sets/src/mage/cards/u/UndeadAlchemist.java
index cc269fa6499..b451c8dd791 100644
--- a/Mage.Sets/src/mage/cards/u/UndeadAlchemist.java
+++ b/Mage.Sets/src/mage/cards/u/UndeadAlchemist.java
@@ -62,10 +62,10 @@ public class UndeadAlchemist extends CardImpl {
         this.power = new MageInt(4);
         this.toughness = new MageInt(2);
 
-        // If a Zombie you control would deal combat damage to a player, instead that player puts that many cards from the top of his or her library into his or her graveyard.
+        // If a Zombie you control would deal combat damage to a player, instead that player puts that many cards from the top of their library into their graveyard.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new UndeadAlchemistEffect()));
 
-        // Whenever a creature card is put into an opponent's graveyard from his or her library, exile that card and create a 2/2 black Zombie creature token.
+        // Whenever a creature card is put into an opponent's graveyard from their library, exile that card and create a 2/2 black Zombie creature token.
         this.addAbility(new UndeadAlchemistTriggeredAbility());
     }
 
@@ -115,7 +115,7 @@ class UndeadAlchemistTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "Whenever a creature card is put into an opponent's graveyard from his or her library, exile that card and create a 2/2 black Zombie creature token.";
+        return "Whenever a creature card is put into an opponent's graveyard from their library, exile that card and create a 2/2 black Zombie creature token.";
     }
 }
 
@@ -123,7 +123,7 @@ class UndeadAlchemistEffect extends ReplacementEffectImpl {
 
     UndeadAlchemistEffect() {
         super(Duration.WhileOnBattlefield, Outcome.RedirectDamage);
-        staticText = "If a Zombie you control would deal combat damage to a player, instead that player puts that many cards from the top of his or her library into his or her graveyard";
+        staticText = "If a Zombie you control would deal combat damage to a player, instead that player puts that many cards from the top of their library into their graveyard";
     }
 
     UndeadAlchemistEffect(final UndeadAlchemistEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/u/UndercityInformer.java b/Mage.Sets/src/mage/cards/u/UndercityInformer.java
index e6f9a0c3295..127e1c14d81 100644
--- a/Mage.Sets/src/mage/cards/u/UndercityInformer.java
+++ b/Mage.Sets/src/mage/cards/u/UndercityInformer.java
@@ -65,7 +65,7 @@ public class UndercityInformer extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(3);
 
-        //{1}, Sacrifice a creature: Target player reveals the top card of his or her library until he or she reveals a land card, then puts those cards into his or her graveyard.
+        //{1}, Sacrifice a creature: Target player reveals the top card of their library until he or she reveals a land card, then puts those cards into their graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UndercityInformerEffect(), new ManaCostsImpl("{1}"));
         ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT)));
         ability.addTarget(new TargetPlayer());
@@ -86,7 +86,7 @@ class UndercityInformerEffect extends OneShotEffect {
 
     public UndercityInformerEffect() {
         super(Outcome.PutCardInPlay);
-        this.staticText = "Target player reveals the top card of his or her library until he or she reveals a land card, then puts those cards into his or her graveyard";
+        this.staticText = "Target player reveals the top card of their library until he or she reveals a land card, then puts those cards into their graveyard";
     }
 
     public UndercityInformerEffect(final UndercityInformerEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/u/UnderworldCerberus.java b/Mage.Sets/src/mage/cards/u/UnderworldCerberus.java
index bbf9cab2f5e..d5075fb9587 100644
--- a/Mage.Sets/src/mage/cards/u/UnderworldCerberus.java
+++ b/Mage.Sets/src/mage/cards/u/UnderworldCerberus.java
@@ -62,7 +62,7 @@ public class UnderworldCerberus extends CardImpl {
         // Cards in graveyards can't be the targets of spells or abilities.
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBeTargetedCardsGraveyardsEffect()));
 
-        // When Underworld Cerberus dies, exile it and each player returns all creature cards from his or her graveyard to his or her hand.
+        // When Underworld Cerberus dies, exile it and each player returns all creature cards from their graveyard to their hand.
         Ability ability = new DiesTriggeredAbility(new ExileSourceEffect());
         ability.addEffect(new ReturnToHandFromGraveyardAllEffect(new FilterCreatureCard("creature cards")));
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/u/Unmask.java b/Mage.Sets/src/mage/cards/u/Unmask.java
index 9cd9bbacd77..d705d0c6aac 100644
--- a/Mage.Sets/src/mage/cards/u/Unmask.java
+++ b/Mage.Sets/src/mage/cards/u/Unmask.java
@@ -64,7 +64,7 @@ public class Unmask extends CardImpl {
         // You may exile a black card from your hand rather than pay Unmask's mana cost.
         this.addAbility(new AlternativeCostSourceAbility(new ExileFromHandCost(new TargetCardInHand(filter))));     
         
-        // Target player reveals his or her hand. You choose a nonland card from it. That player discards that card.
+        // Target player reveals their hand. You choose a nonland card from it. That player discards that card.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new DiscardCardYouChooseTargetEffect(filterNonLand, TargetController.ANY));
     }
diff --git a/Mage.Sets/src/mage/cards/u/UnravelTheAether.java b/Mage.Sets/src/mage/cards/u/UnravelTheAether.java
index a033b50098a..b39474e91cd 100644
--- a/Mage.Sets/src/mage/cards/u/UnravelTheAether.java
+++ b/Mage.Sets/src/mage/cards/u/UnravelTheAether.java
@@ -45,7 +45,7 @@ public class UnravelTheAether extends CardImpl {
     public UnravelTheAether(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{G}");
 
-        // Choose target artifact or enchantment. Its owner shuffles it into his or her library.
+        // Choose target artifact or enchantment. Its owner shuffles it into their library.
         this.getSpellAbility().addEffect(new ShuffleIntoLibraryTargetEffect());
         this.getSpellAbility().addTarget(new TargetPermanent(StaticFilters.FILTER_PERMANENT_ARTIFACT_OR_ENCHANTMENT));
     }
diff --git a/Mage.Sets/src/mage/cards/u/UtopiaSprawl.java b/Mage.Sets/src/mage/cards/u/UtopiaSprawl.java
index dcbba8453dd..37e436f6af2 100644
--- a/Mage.Sets/src/mage/cards/u/UtopiaSprawl.java
+++ b/Mage.Sets/src/mage/cards/u/UtopiaSprawl.java
@@ -69,7 +69,7 @@ public class UtopiaSprawl extends CardImpl {
         this.addAbility(ability);
         // As Utopia Sprawl enters the battlefield, choose a color.
         this.addAbility(new AsEntersBattlefieldAbility(new ChooseColorEffect(Outcome.Detriment)));
-        // Whenever enchanted Forest is tapped for mana, its controller adds one mana of the chosen color to his or her mana pool.
+        // Whenever enchanted Forest is tapped for mana, its controller adds one mana of the chosen color to their mana pool.
         this.addAbility(new UtopiaSprawlTriggeredAbility());
     }
 
@@ -111,7 +111,7 @@ class UtopiaSprawlTriggeredAbility extends TriggeredManaAbility {
 
     @Override
     public String getRule() {
-        return "Whenever enchanted Forest is tapped for mana, its controller adds one mana of the chosen color to his or her mana pool.";
+        return "Whenever enchanted Forest is tapped for mana, its controller adds one mana of the chosen color to their mana pool.";
     }
 }
 
@@ -119,7 +119,7 @@ class UtopiaSprawlEffect extends ManaEffect {
 
     public UtopiaSprawlEffect() {
         super();
-        staticText = "its controller adds one mana of the chosen color to his or her mana pool";
+        staticText = "its controller adds one mana of the chosen color to their mana pool";
     }
 
     public UtopiaSprawlEffect(final UtopiaSprawlEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/v/Valleymaker.java b/Mage.Sets/src/mage/cards/v/Valleymaker.java
index 77c22e7c25b..e85761ff7c5 100644
--- a/Mage.Sets/src/mage/cards/v/Valleymaker.java
+++ b/Mage.Sets/src/mage/cards/v/Valleymaker.java
@@ -74,7 +74,7 @@ public class Valleymaker extends CardImpl {
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
         
-        // {tap}, Sacrifice a Forest: Choose a player. That player adds {G}{G}{G} to his or her mana pool.
+        // {tap}, Sacrifice a Forest: Choose a player. That player adds {G}{G}{G} to their mana pool.
         Ability ability2 = new SimpleManaAbility(Zone.BATTLEFIELD, new AddManaToManaPoolTargetControllerEffect(Mana.GreenMana(3), "chosen player"), new TapSourceCost());
         ability2.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter2)));
         ability2.addTarget(new TargetPlayer(1, 1, true));
diff --git a/Mage.Sets/src/mage/cards/v/VedalkenEntrancer.java b/Mage.Sets/src/mage/cards/v/VedalkenEntrancer.java
index b4fb40fa850..6881726d472 100644
--- a/Mage.Sets/src/mage/cards/v/VedalkenEntrancer.java
+++ b/Mage.Sets/src/mage/cards/v/VedalkenEntrancer.java
@@ -56,7 +56,7 @@ public class VedalkenEntrancer extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(4);
 
-        // {U}, {tap}: Target player puts the top two cards of his or her library into his or her graveyard.
+        // {U}, {tap}: Target player puts the top two cards of their library into their graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(2), new ColoredManaCost(ColoredManaSymbol.U));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetPlayer());
diff --git a/Mage.Sets/src/mage/cards/v/VenarianGlimmer.java b/Mage.Sets/src/mage/cards/v/VenarianGlimmer.java
index 552bbb38307..7f3ceb545fe 100644
--- a/Mage.Sets/src/mage/cards/v/VenarianGlimmer.java
+++ b/Mage.Sets/src/mage/cards/v/VenarianGlimmer.java
@@ -54,7 +54,7 @@ public class VenarianGlimmer extends CardImpl {
     public VenarianGlimmer(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{X}{U}");
 
-        // Target player reveals his or her hand. You choose a nonland card with converted mana cost X or less from it. That player discards that card.
+        // Target player reveals their hand. You choose a nonland card with converted mana cost X or less from it. That player discards that card.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new VenarianGlimmerEffect());
     }
@@ -73,7 +73,7 @@ class VenarianGlimmerEffect extends OneShotEffect {
 
     public VenarianGlimmerEffect() {
         super(Outcome.Discard);
-        this.staticText = "Target player reveals his or her hand. You choose a nonland card with converted mana cost X or less from it. That player discards that card";
+        this.staticText = "Target player reveals their hand. You choose a nonland card with converted mana cost X or less from it. That player discards that card";
     }
 
     public VenarianGlimmerEffect(final VenarianGlimmerEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/v/VendilionClique.java b/Mage.Sets/src/mage/cards/v/VendilionClique.java
index 9831ff92f66..d59303adfbe 100644
--- a/Mage.Sets/src/mage/cards/v/VendilionClique.java
+++ b/Mage.Sets/src/mage/cards/v/VendilionClique.java
@@ -69,7 +69,7 @@ public class VendilionClique extends CardImpl {
         this.addAbility(FlashAbility.getInstance());
         // Flying
         this.addAbility(FlyingAbility.getInstance());
-        // When Vendilion Clique enters the battlefield, look at target player's hand. You may choose a nonland card from it. If you do, that player reveals the chosen card, puts it on the bottom of his or her library, then draws a card.
+        // When Vendilion Clique enters the battlefield, look at target player's hand. You may choose a nonland card from it. If you do, that player reveals the chosen card, puts it on the bottom of their library, then draws a card.
         Ability ability = new EntersBattlefieldTriggeredAbility(new VendilionCliqueEffect());
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
@@ -89,7 +89,7 @@ class VendilionCliqueEffect extends OneShotEffect {
 
     VendilionCliqueEffect() {
         super(Outcome.Discard);
-        staticText = "look at target player's hand. You may choose a nonland card from it. If you do, that player reveals the chosen card, puts it on the bottom of his or her library, then draws a card";
+        staticText = "look at target player's hand. You may choose a nonland card from it. If you do, that player reveals the chosen card, puts it on the bottom of their library, then draws a card";
     }
 
     VendilionCliqueEffect(final VendilionCliqueEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/v/VerdantHaven.java b/Mage.Sets/src/mage/cards/v/VerdantHaven.java
index 74b55afa2ab..ff4b2a1098e 100644
--- a/Mage.Sets/src/mage/cards/v/VerdantHaven.java
+++ b/Mage.Sets/src/mage/cards/v/VerdantHaven.java
@@ -69,7 +69,7 @@ public class VerdantHaven extends CardImpl {
         // When Verdant Haven enters the battlefield, you gain 2 life.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new GainLifeEffect(2)));
 
-        // Whenever enchanted land is tapped for mana, its controller adds one mana of any color to his or her mana pool.
+        // Whenever enchanted land is tapped for mana, its controller adds one mana of any color to their mana pool.
         this.addAbility(new VerdantHavenTriggeredAbility());
     }
 
@@ -112,6 +112,6 @@ class VerdantHavenTriggeredAbility extends TriggeredManaAbility {
 
     @Override
     public String getRule() {
-        return "Whenever enchanted land is tapped for mana, its controller adds one mana of any color to his or her mana pool.";
+        return "Whenever enchanted land is tapped for mana, its controller adds one mana of any color to their mana pool.";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/v/VerdantSuccession.java b/Mage.Sets/src/mage/cards/v/VerdantSuccession.java
index 0405af99ac4..6edd126014e 100644
--- a/Mage.Sets/src/mage/cards/v/VerdantSuccession.java
+++ b/Mage.Sets/src/mage/cards/v/VerdantSuccession.java
@@ -61,7 +61,7 @@ public class VerdantSuccession extends CardImpl {
     public VerdantSuccession(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{G}");
 
-        // Whenever a green nontoken creature dies, that creature's controller may search his or her library for a card with the same name as that creature and put it onto the battlefield. If that player does, he or she shuffles his or her library.
+        // Whenever a green nontoken creature dies, that creature's controller may search their library for a card with the same name as that creature and put it onto the battlefield. If that player does, he or she shuffles their library.
         this.addAbility(new VerdantSuccessionTriggeredAbility());
 
     }
@@ -121,7 +121,7 @@ class VerdantSuccessionTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return "Whenever a green nontoken creature dies, that creature's controller may search his or her library for a card with the same name as that creature and put it onto the battlefield. If that player does, he or she shuffles his or her library.";
+        return "Whenever a green nontoken creature dies, that creature's controller may search their library for a card with the same name as that creature and put it onto the battlefield. If that player does, he or she shuffles their library.";
     }
 }
 
diff --git a/Mage.Sets/src/mage/cards/v/VernalBloom.java b/Mage.Sets/src/mage/cards/v/VernalBloom.java
index a3b6b961352..5f7e6bbd2c4 100644
--- a/Mage.Sets/src/mage/cards/v/VernalBloom.java
+++ b/Mage.Sets/src/mage/cards/v/VernalBloom.java
@@ -55,9 +55,9 @@ public class VernalBloom extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{G}");
 
 
-        // Whenever a Forest is tapped for mana, its controller adds {G} to his or her mana pool.
+        // Whenever a Forest is tapped for mana, its controller adds {G} to their mana pool.
         this.addAbility(new TapForManaAllTriggeredManaAbility(
-                new AddManaToManaPoolTargetControllerEffect(new Mana(ColoredManaSymbol.G), "his or her"),
+                new AddManaToManaPoolTargetControllerEffect(new Mana(ColoredManaSymbol.G), "their"),
                 filter, SetTargetPointer.PLAYER));
     }
 
diff --git a/Mage.Sets/src/mage/cards/v/VesselOfMalignity.java b/Mage.Sets/src/mage/cards/v/VesselOfMalignity.java
index f16eb4b5f87..13012d4dc43 100644
--- a/Mage.Sets/src/mage/cards/v/VesselOfMalignity.java
+++ b/Mage.Sets/src/mage/cards/v/VesselOfMalignity.java
@@ -49,7 +49,7 @@ public class VesselOfMalignity extends CardImpl {
     public VesselOfMalignity(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{B}");
 
-        // {1}{B}, Sacrifice Vessel of Malignity: Target opponent exiles two cards from his or her hand. Activate this ability only any time you could cast a sorcery.
+        // {1}{B}, Sacrifice Vessel of Malignity: Target opponent exiles two cards from their hand. Activate this ability only any time you could cast a sorcery.
         Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD,
                 new ExileFromZoneTargetEffect(Zone.HAND, null, "", new FilterCard("cards"), 2),
                 new ManaCostsImpl("{1}{B}"));
diff --git a/Mage.Sets/src/mage/cards/v/VesselOfParamnesia.java b/Mage.Sets/src/mage/cards/v/VesselOfParamnesia.java
index f72a0850577..c6f982310cb 100644
--- a/Mage.Sets/src/mage/cards/v/VesselOfParamnesia.java
+++ b/Mage.Sets/src/mage/cards/v/VesselOfParamnesia.java
@@ -49,7 +49,7 @@ public class VesselOfParamnesia extends CardImpl {
     public VesselOfParamnesia(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}");
 
-        // {U}, Sacrifice Vessel of Paramnesia: Target player puts the top three cards of his or her library into his or her graveyard. Draw a card.
+        // {U}, Sacrifice Vessel of Paramnesia: Target player puts the top three cards of their library into their graveyard. Draw a card.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutTopCardOfLibraryIntoGraveTargetEffect(3), new ManaCostsImpl("{U}"));
         ability.addCost(new SacrificeSourceCost());
         ability.addTarget(new TargetPlayer());
diff --git a/Mage.Sets/src/mage/cards/v/VeteranExplorer.java b/Mage.Sets/src/mage/cards/v/VeteranExplorer.java
index 566a4c9c887..8fc3e3a3703 100644
--- a/Mage.Sets/src/mage/cards/v/VeteranExplorer.java
+++ b/Mage.Sets/src/mage/cards/v/VeteranExplorer.java
@@ -61,7 +61,7 @@ public class VeteranExplorer extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        // When Veteran Explorer dies, each player may search his or her library for up to two basic land cards and put them onto the battlefield. Then each player who searched his or her library this way shuffles it.
+        // When Veteran Explorer dies, each player may search their library for up to two basic land cards and put them onto the battlefield. Then each player who searched their library this way shuffles it.
         this.addAbility(new DiesTriggeredAbility(new VeteranExplorerEffect()));
     }
 
@@ -79,7 +79,7 @@ class VeteranExplorerEffect extends OneShotEffect {
 
     public VeteranExplorerEffect() {
         super(Outcome.Detriment);
-        this.staticText = "each player may search his or her library for up to two basic land cards and put them onto the battlefield. Then each player who searched his or her library this way shuffles it";
+        this.staticText = "each player may search their library for up to two basic land cards and put them onto the battlefield. Then each player who searched their library this way shuffles it";
     }
 
     public VeteranExplorerEffect(final VeteranExplorerEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/v/VexingArcanix.java b/Mage.Sets/src/mage/cards/v/VexingArcanix.java
index add38ad8702..3d62aeffdce 100644
--- a/Mage.Sets/src/mage/cards/v/VexingArcanix.java
+++ b/Mage.Sets/src/mage/cards/v/VexingArcanix.java
@@ -54,7 +54,7 @@ public class VexingArcanix extends CardImpl {
     public VexingArcanix(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{4}");
 
-        // {3}, {tap}: Target player chooses a card name, then reveals the top card of his or her library. If that card has the chosen name, the player puts it into his or her hand. Otherwise, the player puts it into his or her graveyard and Vexing Arcanix deals 2 damage to him or her.
+        // {3}, {tap}: Target player chooses a card name, then reveals the top card of their library. If that card has the chosen name, the player puts it into their hand. Otherwise, the player puts it into their graveyard and Vexing Arcanix deals 2 damage to him or her.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new VexingArcanixEffect(), new GenericManaCost(3));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetPlayer());
@@ -76,7 +76,7 @@ class VexingArcanixEffect extends OneShotEffect {
 
     public VexingArcanixEffect() {
         super(Outcome.DrawCard);
-        staticText = "Target player chooses a card name, then reveals the top card of his or her library. If that card has the chosen name, the player puts it into his or her hand. Otherwise, the player puts it into his or her graveyard and {this} deals 2 damage to him or her";
+        staticText = "Target player chooses a card name, then reveals the top card of their library. If that card has the chosen name, the player puts it into their hand. Otherwise, the player puts it into their graveyard and {this} deals 2 damage to him or her";
     }
 
     public VexingArcanixEffect(final VexingArcanixEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/v/VillainousWealth.java b/Mage.Sets/src/mage/cards/v/VillainousWealth.java
index 484d3d91d37..f33f371f908 100644
--- a/Mage.Sets/src/mage/cards/v/VillainousWealth.java
+++ b/Mage.Sets/src/mage/cards/v/VillainousWealth.java
@@ -54,7 +54,7 @@ public class VillainousWealth extends CardImpl {
     public VillainousWealth(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{X}{B}{G}{U}");
 
-        // Target opponent exiles the top X cards of his or her library. You may cast any number of nonland cards with converted mana cost X or less from among them without paying their mana cost.
+        // Target opponent exiles the top X cards of their library. You may cast any number of nonland cards with converted mana cost X or less from among them without paying their mana cost.
         this.getSpellAbility().addTarget(new TargetOpponent());
         this.getSpellAbility().addEffect(new VillainousWealthEffect());
 
@@ -74,7 +74,7 @@ class VillainousWealthEffect extends OneShotEffect {
 
     public VillainousWealthEffect() {
         super(Outcome.PlayForFree);
-        this.staticText = "Target opponent exiles the top X cards of his or her library. You may cast any number of nonland cards with converted mana cost X or less from among them without paying their mana cost";
+        this.staticText = "Target opponent exiles the top X cards of their library. You may cast any number of nonland cards with converted mana cost X or less from among them without paying their mana cost";
     }
 
     public VillainousWealthEffect(final VillainousWealthEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/v/Viseling.java b/Mage.Sets/src/mage/cards/v/Viseling.java
index 75608929d34..daf72824c4e 100644
--- a/Mage.Sets/src/mage/cards/v/Viseling.java
+++ b/Mage.Sets/src/mage/cards/v/Viseling.java
@@ -54,7 +54,7 @@ public class Viseling extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        // At the beginning of each opponent's upkeep, Viseling deals X damage to that player, where X is the number of cards in his or her hand minus 4.
+        // At the beginning of each opponent's upkeep, Viseling deals X damage to that player, where X is the number of cards in their hand minus 4.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(new ViselingEffect(), TargetController.OPPONENT, false));
 
     }
@@ -73,7 +73,7 @@ class ViselingEffect extends OneShotEffect {
 
     public ViselingEffect() {
         super(Outcome.Damage);
-        this.staticText = "{source} deals X damage to that player, where X is the number of cards in his or her hand minus 4";
+        this.staticText = "{source} deals X damage to that player, where X is the number of cards in their hand minus 4";
     }
 
     public ViselingEffect(final ViselingEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/v/VisionCharm.java b/Mage.Sets/src/mage/cards/v/VisionCharm.java
index 5b5faaada33..f3cdad0360b 100644
--- a/Mage.Sets/src/mage/cards/v/VisionCharm.java
+++ b/Mage.Sets/src/mage/cards/v/VisionCharm.java
@@ -64,7 +64,7 @@ public class VisionCharm extends CardImpl {
     public VisionCharm(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{U}");
 
-        // Choose one - Target player puts the top four cards of his or her library into his or her graveyard;
+        // Choose one - Target player puts the top four cards of their library into their graveyard;
         this.getSpellAbility().addEffect(new PutLibraryIntoGraveTargetEffect(4));
         this.getSpellAbility().addTarget(new TargetPlayer());
 
diff --git a/Mage.Sets/src/mage/cards/v/VizkopaConfessor.java b/Mage.Sets/src/mage/cards/v/VizkopaConfessor.java
index 401ea4f2e7c..5ab422376a6 100644
--- a/Mage.Sets/src/mage/cards/v/VizkopaConfessor.java
+++ b/Mage.Sets/src/mage/cards/v/VizkopaConfessor.java
@@ -67,7 +67,7 @@ public class VizkopaConfessor extends CardImpl {
         // Extort (Whenever you cast a spell, you may pay {WB}. If you do, each opponent loses 1 life and you gain that much life.)
         this.addAbility(new ExtortAbility());
 
-        // When Vizkopa Confessor enters the battlefield, pay any amount of life. Target opponent reveals that many cards from his or her hand. You choose one of them and exile it.
+        // When Vizkopa Confessor enters the battlefield, pay any amount of life. Target opponent reveals that many cards from their hand. You choose one of them and exile it.
         Ability ability = new EntersBattlefieldTriggeredAbility(new VizkopaConfessorEffect());
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
@@ -87,7 +87,7 @@ class VizkopaConfessorEffect extends OneShotEffect {
 
     public VizkopaConfessorEffect() {
         super(Outcome.Benefit);
-        this.staticText = "pay any amount of life. Target opponent reveals that many cards from his or her hand. You choose one of them and exile it";
+        this.staticText = "pay any amount of life. Target opponent reveals that many cards from their hand. You choose one of them and exile it";
     }
 
     public VizkopaConfessorEffect(final VizkopaConfessorEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/v/Void.java b/Mage.Sets/src/mage/cards/v/Void.java
index 3565fb85f90..6587732a083 100644
--- a/Mage.Sets/src/mage/cards/v/Void.java
+++ b/Mage.Sets/src/mage/cards/v/Void.java
@@ -57,7 +57,7 @@ public class Void extends CardImpl {
     public Void(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{B}{R}");
 
-        // Choose a number. Destroy all artifacts and creatures with converted mana cost equal to that number. Then target player reveals his or her hand and discards all nonland cards with converted mana cost equal to the number.
+        // Choose a number. Destroy all artifacts and creatures with converted mana cost equal to that number. Then target player reveals their hand and discards all nonland cards with converted mana cost equal to the number.
         this.getSpellAbility().addTarget(new TargetPlayer());
         this.getSpellAbility().addEffect(new VoidEffect());
 
@@ -77,7 +77,7 @@ class VoidEffect extends OneShotEffect {
 
     public VoidEffect() {
         super(Outcome.DestroyPermanent);
-        this.staticText = "Choose a number. Destroy all artifacts and creatures with converted mana cost equal to that number. Then target player reveals his or her hand and discards all nonland cards with converted mana cost equal to the number";
+        this.staticText = "Choose a number. Destroy all artifacts and creatures with converted mana cost equal to that number. Then target player reveals their hand and discards all nonland cards with converted mana cost equal to the number";
     }
 
     public VoidEffect(final VoidEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/w/WandOfIth.java b/Mage.Sets/src/mage/cards/w/WandOfIth.java
index e5f1d901d0c..0cece3ab77a 100644
--- a/Mage.Sets/src/mage/cards/w/WandOfIth.java
+++ b/Mage.Sets/src/mage/cards/w/WandOfIth.java
@@ -57,7 +57,7 @@ public class WandOfIth extends CardImpl {
     public WandOfIth(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}");
 
-        // {3}, {T}: Target player reveals a card at random from his or her hand. If it's a land card, that player discards it unless he or she pays 1 life. If it isn't a land card, the player discards it unless he or she pays life equal to its converted mana cost. Activate this ability only during your turn.
+        // {3}, {T}: Target player reveals a card at random from their hand. If it's a land card, that player discards it unless he or she pays 1 life. If it isn't a land card, the player discards it unless he or she pays life equal to its converted mana cost. Activate this ability only during your turn.
         Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD, new WandOfIthEffect(), new GenericManaCost(3), MyTurnCondition.instance);
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetPlayer());
@@ -78,7 +78,7 @@ class WandOfIthEffect extends OneShotEffect {
 
     public WandOfIthEffect() {
         super(Outcome.Discard);
-        staticText = "Target player reveals a card at random from his or her hand. If it's a land card, that player discards it unless he or she pays 1 life. If it isn't a land card, the player discards it unless he or she pays life equal to its converted mana cost";
+        staticText = "Target player reveals a card at random from their hand. If it's a land card, that player discards it unless he or she pays 1 life. If it isn't a land card, the player discards it unless he or she pays life equal to its converted mana cost";
     }
 
     public WandOfIthEffect(final WandOfIthEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/w/WarpWorld.java b/Mage.Sets/src/mage/cards/w/WarpWorld.java
index 0c0e92dec71..d925c6a7ab5 100644
--- a/Mage.Sets/src/mage/cards/w/WarpWorld.java
+++ b/Mage.Sets/src/mage/cards/w/WarpWorld.java
@@ -56,7 +56,7 @@ public class WarpWorld extends CardImpl {
     public WarpWorld(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{5}{R}{R}{R}");
 
-        // Each player shuffles all permanents he or she owns into his or her library, then reveals that many cards from the top of his or her library. Each player puts all artifact, creature, and land cards revealed this way onto the battlefield, then does the same for enchantment cards, then puts all cards revealed this way that weren't put onto the battlefield on the bottom of his or her library.
+        // Each player shuffles all permanents he or she owns into their library, then reveals that many cards from the top of their library. Each player puts all artifact, creature, and land cards revealed this way onto the battlefield, then does the same for enchantment cards, then puts all cards revealed this way that weren't put onto the battlefield on the bottom of their library.
         this.getSpellAbility().addEffect(new WarpWorldEffect());
     }
 
@@ -74,7 +74,7 @@ class WarpWorldEffect extends OneShotEffect {
 
     public WarpWorldEffect() {
         super(Outcome.Neutral);
-        this.staticText = "Each player shuffles all permanents he or she owns into his or her library, then reveals that many cards from the top of his or her library. Each player puts all artifact, creature, and land cards revealed this way onto the battlefield, then does the same for enchantment cards, then puts all cards revealed this way that weren't put onto the battlefield on the bottom of his or her library";
+        this.staticText = "Each player shuffles all permanents he or she owns into their library, then reveals that many cards from the top of their library. Each player puts all artifact, creature, and land cards revealed this way onto the battlefield, then does the same for enchantment cards, then puts all cards revealed this way that weren't put onto the battlefield on the bottom of their library";
     }
 
     public WarpWorldEffect(final WarpWorldEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/w/WatchersOfTheDead.java b/Mage.Sets/src/mage/cards/w/WatchersOfTheDead.java
index f1620a0de5f..0e82384d38a 100644
--- a/Mage.Sets/src/mage/cards/w/WatchersOfTheDead.java
+++ b/Mage.Sets/src/mage/cards/w/WatchersOfTheDead.java
@@ -58,7 +58,7 @@ public class WatchersOfTheDead extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        // Exile Watchers of the Dead: Each opponent chooses 2 cards in his or her graveyard and exiles the rest.
+        // Exile Watchers of the Dead: Each opponent chooses 2 cards in their graveyard and exiles the rest.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new WatchersOfTheDeadEffect(), new ExileSourceCost()));
 
     }
@@ -77,7 +77,7 @@ class WatchersOfTheDeadEffect extends OneShotEffect {
 
     public WatchersOfTheDeadEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Each opponent chooses 2 cards in his or her graveyard and exiles the rest";
+        this.staticText = "Each opponent chooses 2 cards in their graveyard and exiles the rest";
     }
 
     public WatchersOfTheDeadEffect(final WatchersOfTheDeadEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/w/WaveOfVitriol.java b/Mage.Sets/src/mage/cards/w/WaveOfVitriol.java
index dd5359d18b6..ab3e0451085 100644
--- a/Mage.Sets/src/mage/cards/w/WaveOfVitriol.java
+++ b/Mage.Sets/src/mage/cards/w/WaveOfVitriol.java
@@ -57,7 +57,7 @@ public class WaveOfVitriol extends CardImpl {
     public WaveOfVitriol(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{5}{G}{G}");
 
-        // Each player sacrifices all artifacts, enchantments, and nonbasic lands he or she controls. For each land sacrificed this way, its controller may search his or her library for a basic land card and put it onto the battlefield tapped. Then each player who searched his or her library this way shuffles it.
+        // Each player sacrifices all artifacts, enchantments, and nonbasic lands he or she controls. For each land sacrificed this way, its controller may search their library for a basic land card and put it onto the battlefield tapped. Then each player who searched their library this way shuffles it.
         this.getSpellAbility().addEffect(new WaveOfVitriolEffect());
 
     }
@@ -89,7 +89,7 @@ class WaveOfVitriolEffect extends OneShotEffect {
 
     public WaveOfVitriolEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Each player sacrifices all artifacts, enchantments, and nonbasic lands he or she controls. For each land sacrificed this way, its controller may search his or her library for a basic land card and put it onto the battlefield tapped. Then each player who searched his or her library this way shuffles it";
+        this.staticText = "Each player sacrifices all artifacts, enchantments, and nonbasic lands he or she controls. For each land sacrificed this way, its controller may search their library for a basic land card and put it onto the battlefield tapped. Then each player who searched their library this way shuffles it";
     }
 
     public WaveOfVitriolEffect(final WaveOfVitriolEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/w/WebOfInertia.java b/Mage.Sets/src/mage/cards/w/WebOfInertia.java
index 983170a04c1..e8e5355db16 100644
--- a/Mage.Sets/src/mage/cards/w/WebOfInertia.java
+++ b/Mage.Sets/src/mage/cards/w/WebOfInertia.java
@@ -57,7 +57,7 @@ public class WebOfInertia extends CardImpl {
     public WebOfInertia(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{U}");
 
-        // At the beginning of combat on each opponent's turn, that player may exile a card from his or her graveyard. If the player doesn't, creatures he or she controls can't attack you this turn.
+        // At the beginning of combat on each opponent's turn, that player may exile a card from their graveyard. If the player doesn't, creatures he or she controls can't attack you this turn.
         this.addAbility(new BeginningOfCombatTriggeredAbility(Zone.BATTLEFIELD, new WebOfInertiaEffect(), TargetController.OPPONENT, false, true));
     }
 
@@ -75,7 +75,7 @@ class WebOfInertiaEffect extends OneShotEffect {
 
     public WebOfInertiaEffect() {
         super(Outcome.Detriment);
-        staticText = "that player may exile a card from his or her graveyard. If the player doesn't, creatures he or she controls can't attack you this turn";
+        staticText = "that player may exile a card from their graveyard. If the player doesn't, creatures he or she controls can't attack you this turn";
     }
 
     public WebOfInertiaEffect(final WebOfInertiaEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/w/WeirdHarvest.java b/Mage.Sets/src/mage/cards/w/WeirdHarvest.java
index ffc88e8a928..c0af8adbf05 100644
--- a/Mage.Sets/src/mage/cards/w/WeirdHarvest.java
+++ b/Mage.Sets/src/mage/cards/w/WeirdHarvest.java
@@ -54,7 +54,7 @@ public class WeirdHarvest extends CardImpl {
     public WeirdHarvest(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{X}{G}{G}");
 
-        // Each player may search his or her library for up to X creature cards, reveal those cards, and put them into his or her hand. Then each player who searched his or her library this way shuffles it.
+        // Each player may search their library for up to X creature cards, reveal those cards, and put them into their hand. Then each player who searched their library this way shuffles it.
         getSpellAbility().addEffect(new WeirdHarvestEffect());
     }
 
@@ -72,7 +72,7 @@ class WeirdHarvestEffect extends OneShotEffect {
 
     public WeirdHarvestEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Each player may search his or her library for up to X creature cards, reveal those cards, and put them into his or her hand. Then each player who searched his or her library this way shuffles it";
+        this.staticText = "Each player may search their library for up to X creature cards, reveal those cards, and put them into their hand. Then each player who searched their library this way shuffles it";
     }
 
     public WeirdHarvestEffect(final WeirdHarvestEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/w/WellOfKnowledge.java b/Mage.Sets/src/mage/cards/w/WellOfKnowledge.java
index d7353371654..6a18a11d475 100644
--- a/Mage.Sets/src/mage/cards/w/WellOfKnowledge.java
+++ b/Mage.Sets/src/mage/cards/w/WellOfKnowledge.java
@@ -53,7 +53,7 @@ public class WellOfKnowledge extends CardImpl {
     public WellOfKnowledge(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
 
-        // {2}: Draw a card. Any player may activate this ability but only during his or her draw step.
+        // {2}: Draw a card. Any player may activate this ability but only during their draw step.
         this.addAbility(new WellOfKnowledgeConditionalActivatedAbility());
 
     }
@@ -107,7 +107,7 @@ class WellOfKnowledgeConditionalActivatedAbility extends ActivatedAbilityImpl {
 
     @Override
     public String getRule() {
-        return "{2}: Draw a card. Any player may activate this ability but only during his or her draw step.";
+        return "{2}: Draw a card. Any player may activate this ability but only during their draw step.";
     }
 }
 
diff --git a/Mage.Sets/src/mage/cards/w/WheelAndDeal.java b/Mage.Sets/src/mage/cards/w/WheelAndDeal.java
index e739f9fbe09..e30ef0cd9c9 100644
--- a/Mage.Sets/src/mage/cards/w/WheelAndDeal.java
+++ b/Mage.Sets/src/mage/cards/w/WheelAndDeal.java
@@ -55,9 +55,9 @@ public class WheelAndDeal extends CardImpl {
     public WheelAndDeal(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{3}{U}");
 
-        // Any number of target opponents each discards his or her hand and draws seven cards.
+        // Any number of target opponents each discards their hand and draws seven cards.
         Effect effect = new DiscardHandTargetEffect();
-        effect.setText("Any number of target opponents each discards his or her hand");
+        effect.setText("Any number of target opponents each discards their hand");
         this.getSpellAbility().addTarget(new TargetPlayer(0, Integer.MAX_VALUE, false, filter));
         this.getSpellAbility().addEffect(effect);
         effect = new DrawCardTargetEffect(7);
diff --git a/Mage.Sets/src/mage/cards/w/WheelOfFate.java b/Mage.Sets/src/mage/cards/w/WheelOfFate.java
index 4dd0bd1ae02..989dd7a0f29 100644
--- a/Mage.Sets/src/mage/cards/w/WheelOfFate.java
+++ b/Mage.Sets/src/mage/cards/w/WheelOfFate.java
@@ -49,7 +49,7 @@ public class WheelOfFate extends CardImpl {
 
         // Suspend 4-{1}{R}
         this.addAbility(new SuspendAbility(4, new ManaCostsImpl("{1}{R}"), this));
-        // Each player discards his or her hand, then draws seven cards.
+        // Each player discards their hand, then draws seven cards.
         this.getSpellAbility().addEffect(new DiscardHandAllEffect());
         this.getSpellAbility().addEffect(new DrawCardAllEffect(7).setText(", then draws seven cards"));
     }
diff --git a/Mage.Sets/src/mage/cards/w/WheelOfFortune.java b/Mage.Sets/src/mage/cards/w/WheelOfFortune.java
index 94ceff08226..a6979eb1b54 100644
--- a/Mage.Sets/src/mage/cards/w/WheelOfFortune.java
+++ b/Mage.Sets/src/mage/cards/w/WheelOfFortune.java
@@ -44,7 +44,7 @@ public class WheelOfFortune extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{R}");
 
 
-        // Each player discards his or her hand,
+        // Each player discards their hand,
         this.getSpellAbility().addEffect(new DiscardHandAllEffect());
         // then draws seven cards.
         Effect effect = new DrawCardAllEffect(7);
diff --git a/Mage.Sets/src/mage/cards/w/WheelOfTorture.java b/Mage.Sets/src/mage/cards/w/WheelOfTorture.java
index 0054f32400d..00324045682 100644
--- a/Mage.Sets/src/mage/cards/w/WheelOfTorture.java
+++ b/Mage.Sets/src/mage/cards/w/WheelOfTorture.java
@@ -49,7 +49,7 @@ public class WheelOfTorture extends CardImpl {
     public WheelOfTorture(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}");
 
-        // At the beginning of each opponent's upkeep, Wheel of Torture deals X damage to that player, where X is 3 minus the number of cards in his or her hand.
+        // At the beginning of each opponent's upkeep, Wheel of Torture deals X damage to that player, where X is 3 minus the number of cards in their hand.
         Ability ability = new BeginningOfUpkeepTriggeredAbility(new WheelOfTortureEffect(), TargetController.OPPONENT, false);
         this.addAbility(ability);
     }
@@ -100,7 +100,7 @@ class WheelOfTortureEffect extends OneShotEffect {
 
     @Override
     public String getText(Mode mode) {
-        return "Wheel of Torture deals X damage to that player, where X is 3 minus the number of cards in his or her hand";
+        return "Wheel of Torture deals X damage to that player, where X is 3 minus the number of cards in their hand";
     }
 
 
diff --git a/Mage.Sets/src/mage/cards/w/Whetstone.java b/Mage.Sets/src/mage/cards/w/Whetstone.java
index 311b827edfb..a63ddc87561 100644
--- a/Mage.Sets/src/mage/cards/w/Whetstone.java
+++ b/Mage.Sets/src/mage/cards/w/Whetstone.java
@@ -49,7 +49,7 @@ public class Whetstone extends CardImpl {
     public Whetstone(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{3}");
 
-        //{3}: Each player puts the top two cards of his or her library into his or her graveyard.
+        //{3}: Each player puts the top two cards of their library into their graveyard.
         SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WhetstoneEffect(), new ManaCostsImpl("{3}"));
         this.addAbility(ability);
     }
@@ -68,7 +68,7 @@ class WhetstoneEffect extends OneShotEffect {
 
     WhetstoneEffect() {
         super(Outcome.Detriment);
-        staticText = "Each player puts the top two cards of his or her library into his or her graveyard";
+        staticText = "Each player puts the top two cards of their library into their graveyard";
     }
 
     WhetstoneEffect(final WhetstoneEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/w/Whetwheel.java b/Mage.Sets/src/mage/cards/w/Whetwheel.java
index 3ad53f9de22..ede9c67b095 100644
--- a/Mage.Sets/src/mage/cards/w/Whetwheel.java
+++ b/Mage.Sets/src/mage/cards/w/Whetwheel.java
@@ -50,7 +50,7 @@ public class Whetwheel extends CardImpl {
     public Whetwheel(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{4}");
 
-        // {X}{X}, {tap}: Target player puts the top X cards of his or her library into his or her graveyard.
+        // {X}{X}, {tap}: Target player puts the top X cards of their library into their graveyard.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutLibraryIntoGraveTargetEffect(
             new ManacostVariableValue()), new ManaCostsImpl("{X}{X}"));
         ability.addCost(new TapSourceCost());
diff --git a/Mage.Sets/src/mage/cards/w/WhimsOfTheFates.java b/Mage.Sets/src/mage/cards/w/WhimsOfTheFates.java
index 8261fc5b4d3..084e3189516 100644
--- a/Mage.Sets/src/mage/cards/w/WhimsOfTheFates.java
+++ b/Mage.Sets/src/mage/cards/w/WhimsOfTheFates.java
@@ -54,7 +54,7 @@ public class WhimsOfTheFates extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{R}");
 
 
-        // Starting with you, each player separates all permanents he or she controls into three piles. Then each player chooses one of his or her piles at random and sacrifices those permanents.
+        // Starting with you, each player separates all permanents he or she controls into three piles. Then each player chooses one of their piles at random and sacrifices those permanents.
         this.getSpellAbility().addEffect(new WhimsOfTheFateEffect());
     }
 
@@ -73,7 +73,7 @@ class WhimsOfTheFateEffect extends OneShotEffect {
 
     public WhimsOfTheFateEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Starting with you, each player separates all permanents he or she controls into three piles. Then each player chooses one of his or her piles at random and sacrifices those permanents.";
+        this.staticText = "Starting with you, each player separates all permanents he or she controls into three piles. Then each player chooses one of their piles at random and sacrifices those permanents.";
     }
 
     public WhimsOfTheFateEffect(final WhimsOfTheFateEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/w/WhiplashTrap.java b/Mage.Sets/src/mage/cards/w/WhiplashTrap.java
index 68b4d1ec365..47a2ef1aebf 100644
--- a/Mage.Sets/src/mage/cards/w/WhiplashTrap.java
+++ b/Mage.Sets/src/mage/cards/w/WhiplashTrap.java
@@ -53,7 +53,7 @@ public class WhiplashTrap extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{3}{U}{U}");
         this.subtype.add(SubType.TRAP);
 
-        // If an opponent had two or more creatures enter the battlefield under his or her control this turn, you may pay {U} rather than pay Whiplash Trap's mana cost.
+        // If an opponent had two or more creatures enter the battlefield under their control this turn, you may pay {U} rather than pay Whiplash Trap's mana cost.
         this.addAbility(new AlternativeCostSourceAbility(new ManaCostsImpl("{U}"), WhiplashTrapCondition.instance), new PermanentsEnteredBattlefieldWatcher());
 
         // Return two target creatures to their owners' hands.
@@ -100,6 +100,6 @@ enum WhiplashTrapCondition implements Condition {
 
     @Override
     public String toString() {
-        return "If an opponent had two or more creatures enter the battlefield under his or her control this turn";
+        return "If an opponent had two or more creatures enter the battlefield under their control this turn";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/w/WhirlpoolWarrior.java b/Mage.Sets/src/mage/cards/w/WhirlpoolWarrior.java
index 99ff8e5a381..4df8b5fda42 100644
--- a/Mage.Sets/src/mage/cards/w/WhirlpoolWarrior.java
+++ b/Mage.Sets/src/mage/cards/w/WhirlpoolWarrior.java
@@ -65,7 +65,7 @@ public class WhirlpoolWarrior extends CardImpl {
         // When Whirlpool Warrior enters the battlefield, shuffle the cards from your hand into your library, then draw that many cards.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new ShuffleHandIntoLibraryDrawThatManySourceEffect()));
 
-        // {R}, Sacrifice Whirlpool Warrior: Each player shuffles the cards from his or her hand into his or her library, then draws that many cards.
+        // {R}, Sacrifice Whirlpool Warrior: Each player shuffles the cards from their hand into their library, then draws that many cards.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new WhirlpoolWarriorActivatedEffect(), new ManaCostsImpl("{R}"));
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
@@ -85,7 +85,7 @@ class WhirlpoolWarriorActivatedEffect extends OneShotEffect {
 
     public WhirlpoolWarriorActivatedEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Each player shuffles the cards from his or her hand into his or her library, then draws that many cards";
+        this.staticText = "Each player shuffles the cards from their hand into their library, then draws that many cards";
     }
 
     public WhirlpoolWarriorActivatedEffect(final WhirlpoolWarriorActivatedEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/w/WhisperingMadness.java b/Mage.Sets/src/mage/cards/w/WhisperingMadness.java
index 12ce2205903..771bb86eed2 100644
--- a/Mage.Sets/src/mage/cards/w/WhisperingMadness.java
+++ b/Mage.Sets/src/mage/cards/w/WhisperingMadness.java
@@ -49,7 +49,7 @@ public class WhisperingMadness extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{U}{B}");
 
 
-        // Each player discards his or her hand, then draws cards equal to the greatest number of cards a player discarded this way.
+        // Each player discards their hand, then draws cards equal to the greatest number of cards a player discarded this way.
         this.getSpellAbility().addEffect(new WhisperingMadnessEffect());
         // Cipher
         this.getSpellAbility().addEffect(new CipherEffect());
@@ -68,7 +68,7 @@ public class WhisperingMadness extends CardImpl {
 class WhisperingMadnessEffect extends OneShotEffect {
     WhisperingMadnessEffect() {
         super(Outcome.Discard);
-        staticText = "Each player discards his or her hand, then draws cards equal to the greatest number of cards a player discarded this way";
+        staticText = "Each player discards their hand, then draws cards equal to the greatest number of cards a player discarded this way";
     }
 
     WhisperingMadnessEffect(final WhisperingMadnessEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/w/WidespreadPanic.java b/Mage.Sets/src/mage/cards/w/WidespreadPanic.java
index 9020117af33..31ec10d2537 100644
--- a/Mage.Sets/src/mage/cards/w/WidespreadPanic.java
+++ b/Mage.Sets/src/mage/cards/w/WidespreadPanic.java
@@ -54,7 +54,7 @@ public class WidespreadPanic extends CardImpl {
     public WidespreadPanic(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}");
 
-        // Whenever a spell or ability causes its controller to shuffle his or her library, that player puts a card from his or her hand on top of his or her library.
+        // Whenever a spell or ability causes its controller to shuffle their library, that player puts a card from their hand on top of their library.
         this.addAbility(new WidespreadPanicTriggeredAbility());
     }
 
@@ -101,7 +101,7 @@ class WidespreadPanicTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public String getRule() {
-        return new StringBuilder("Whenever a spell or ability causes its controller to shuffle his or her library, ").append(super.getRule()).toString();
+        return new StringBuilder("Whenever a spell or ability causes its controller to shuffle their library, ").append(super.getRule()).toString();
     }
 }
 
@@ -109,7 +109,7 @@ class WidespreadPanicEffect extends OneShotEffect {
 
     public WidespreadPanicEffect() {
         super(Outcome.Detriment);
-        this.staticText = "that player puts a card from his or her hand on top of his or her library";
+        this.staticText = "that player puts a card from their hand on top of their library";
     }
 
     public WidespreadPanicEffect(final WidespreadPanicEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/w/WildEvocation.java b/Mage.Sets/src/mage/cards/w/WildEvocation.java
index d42fc379258..ef18829166e 100644
--- a/Mage.Sets/src/mage/cards/w/WildEvocation.java
+++ b/Mage.Sets/src/mage/cards/w/WildEvocation.java
@@ -54,7 +54,7 @@ public class WildEvocation extends CardImpl {
     public WildEvocation(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{5}{R}");
 
-        //At the beginning of each player's upkeep, that player reveals a card at random from his or her hand. If it's a land card, the player puts it onto the battlefield. Otherwise, the player casts it without paying its mana cost if able.
+        //At the beginning of each player's upkeep, that player reveals a card at random from their hand. If it's a land card, the player puts it onto the battlefield. Otherwise, the player casts it without paying its mana cost if able.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new WildEvocationEffect(), TargetController.ANY, false));
     }
 
@@ -73,7 +73,7 @@ class WildEvocationEffect extends OneShotEffect {
 
     public WildEvocationEffect() {
         super(Outcome.PutCardInPlay);
-        staticText = "that player reveals a card at random from his or her hand. "
+        staticText = "that player reveals a card at random from their hand. "
                 + "If it's a land card, that player puts it onto the battlefield. "
                 + "Otherwise, the player casts it without paying its mana cost if able";
     }
diff --git a/Mage.Sets/src/mage/cards/w/WildGrowth.java b/Mage.Sets/src/mage/cards/w/WildGrowth.java
index 82a4dd34a51..2ef466c63ad 100644
--- a/Mage.Sets/src/mage/cards/w/WildGrowth.java
+++ b/Mage.Sets/src/mage/cards/w/WildGrowth.java
@@ -67,7 +67,7 @@ public class WildGrowth extends CardImpl {
         this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility));
         Ability ability = new EnchantAbility(auraTarget.getTargetName());
         this.addAbility(ability);
-        // Whenever enchanted land is tapped for mana, its controller adds {G} to his or her mana pool.
+        // Whenever enchanted land is tapped for mana, its controller adds {G} to their mana pool.
         this.addAbility(new WildGrowthTriggeredAbility());
     }
 
@@ -85,7 +85,7 @@ class WildGrowthTriggeredAbility extends TriggeredManaAbility {
 
 
     public WildGrowthTriggeredAbility() {
-        super(Zone.BATTLEFIELD, new AddManaToManaPoolTargetControllerEffect(new Mana(ColoredManaSymbol.G), "his or her"));
+        super(Zone.BATTLEFIELD, new AddManaToManaPoolTargetControllerEffect(new Mana(ColoredManaSymbol.G), "their"));
     }
 
     public WildGrowthTriggeredAbility(final WildGrowthTriggeredAbility ability) {
@@ -120,6 +120,6 @@ class WildGrowthTriggeredAbility extends TriggeredManaAbility {
 
     @Override
     public String getRule() {
-        return "Whenever enchanted land is tapped for mana, its controller adds {G} to his or her mana pool";
+        return "Whenever enchanted land is tapped for mana, its controller adds {G} to their mana pool";
     }
 }
diff --git a/Mage.Sets/src/mage/cards/w/Windfall.java b/Mage.Sets/src/mage/cards/w/Windfall.java
index e6fde3ae0e7..e6ebc1eadd2 100644
--- a/Mage.Sets/src/mage/cards/w/Windfall.java
+++ b/Mage.Sets/src/mage/cards/w/Windfall.java
@@ -47,7 +47,7 @@ public class Windfall extends CardImpl {
     public Windfall(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{U}");
 
-        // Each player discards his or her hand, then draws cards equal to the greatest number of cards a player discarded this way.
+        // Each player discards their hand, then draws cards equal to the greatest number of cards a player discarded this way.
         this.getSpellAbility().addEffect(new WindfallEffect());
     }
 
@@ -65,7 +65,7 @@ class WindfallEffect extends OneShotEffect {
 
     WindfallEffect() {
         super(Outcome.Discard);
-        staticText = "Each player discards his or her hand, then draws cards equal to the greatest number of cards a player discarded this way.";
+        staticText = "Each player discards their hand, then draws cards equal to the greatest number of cards a player discarded this way.";
     }
 
     WindfallEffect(final WindfallEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/w/WindsOfChange.java b/Mage.Sets/src/mage/cards/w/WindsOfChange.java
index d92dd4dc4b6..afbbe7bf52c 100644
--- a/Mage.Sets/src/mage/cards/w/WindsOfChange.java
+++ b/Mage.Sets/src/mage/cards/w/WindsOfChange.java
@@ -49,7 +49,7 @@ public class WindsOfChange extends CardImpl {
     public WindsOfChange(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{R}");
 
-        // Each player shuffles the cards from his or her hand into his or her library, then draws that many cards.
+        // Each player shuffles the cards from their hand into their library, then draws that many cards.
         this.getSpellAbility().addEffect(new WindsOfChangeEffect());
     }
 
@@ -67,7 +67,7 @@ class WindsOfChangeEffect extends OneShotEffect {
 
     public WindsOfChangeEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Each player shuffles the cards from his or her hand into his or her library, then draws that many cards";
+        this.staticText = "Each player shuffles the cards from their hand into their library, then draws that many cards";
     }
 
     public WindsOfChangeEffect(final WindsOfChangeEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/w/WindsOfRebuke.java b/Mage.Sets/src/mage/cards/w/WindsOfRebuke.java
index accf4931129..01c808643c6 100644
--- a/Mage.Sets/src/mage/cards/w/WindsOfRebuke.java
+++ b/Mage.Sets/src/mage/cards/w/WindsOfRebuke.java
@@ -45,7 +45,7 @@ public class WindsOfRebuke extends CardImpl {
     public WindsOfRebuke(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{U}");
 
-        // Return target nonland permanent to its owner's hand. Each player puts the top two cards of his or her library into his or her graveyard.
+        // Return target nonland permanent to its owner's hand. Each player puts the top two cards of their library into their graveyard.
         getSpellAbility().addTarget(new TargetNonlandPermanent());
         getSpellAbility().addEffect(new ReturnToHandTargetEffect());
         getSpellAbility().addEffect(new PutTopCardOfLibraryIntoGraveEachPlayerEffect(2, TargetController.ANY));
diff --git a/Mage.Sets/src/mage/cards/w/WintersNight.java b/Mage.Sets/src/mage/cards/w/WintersNight.java
index 115056ee575..d5ad0d931b5 100644
--- a/Mage.Sets/src/mage/cards/w/WintersNight.java
+++ b/Mage.Sets/src/mage/cards/w/WintersNight.java
@@ -58,10 +58,10 @@ public class WintersNight extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{R}{G}{W}");
         addSuperType(SuperType.WORLD);
 
-        // Whenever a player taps a snow land for mana, that player adds one mana to his or her mana pool of any type that land produced.
+        // Whenever a player taps a snow land for mana, that player adds one mana to their mana pool of any type that land produced.
         // That land doesn't untap during its controller's next untap step.
         ManaEffect effect = new AddManaOfAnyTypeProducedEffect();
-        effect.setText("that player adds one mana to his or her mana pool of any type that land produced");
+        effect.setText("that player adds one mana to their mana pool of any type that land produced");
         Ability ability = new TapForManaAllTriggeredManaAbility(effect, filter, SetTargetPointer.PERMANENT);
         Effect effect2 = new DontUntapInControllersNextUntapStepTargetEffect();
         effect2.setText("That land doesn't untap during its controller's next untap step");
diff --git a/Mage.Sets/src/mage/cards/w/WitheringGaze.java b/Mage.Sets/src/mage/cards/w/WitheringGaze.java
index 1280f782f90..2acd8956c5b 100644
--- a/Mage.Sets/src/mage/cards/w/WitheringGaze.java
+++ b/Mage.Sets/src/mage/cards/w/WitheringGaze.java
@@ -56,7 +56,7 @@ public class WitheringGaze extends CardImpl {
     public WitheringGaze(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{U}");
 
-        // Target opponent reveals his or her hand. You draw a card for each Forest and green card in it.
+        // Target opponent reveals their hand. You draw a card for each Forest and green card in it.
         this.getSpellAbility().addEffect(new RevealHandTargetEffect());
         this.getSpellAbility().addEffect(new WitheringGazeEffect());
         this.getSpellAbility().addTarget(new TargetOpponent());
diff --git a/Mage.Sets/src/mage/cards/w/WitnessTheEnd.java b/Mage.Sets/src/mage/cards/w/WitnessTheEnd.java
index 62be34eb0cb..97bd5c5f042 100644
--- a/Mage.Sets/src/mage/cards/w/WitnessTheEnd.java
+++ b/Mage.Sets/src/mage/cards/w/WitnessTheEnd.java
@@ -50,7 +50,7 @@ public class WitnessTheEnd extends CardImpl {
 
         // Devoid
         this.addAbility(new DevoidAbility(this.color));
-        // Target opponent exiles two cards from his or her hand and loses 2 life.
+        // Target opponent exiles two cards from their hand and loses 2 life.
         getSpellAbility().addEffect(new ExileFromZoneTargetEffect(Zone.HAND, null, "", new FilterCard("cards"), 2));
         Effect effect = new LoseLifeTargetEffect(2);
         effect.setText("and loses 2 life");
diff --git a/Mage.Sets/src/mage/cards/w/WitsEnd.java b/Mage.Sets/src/mage/cards/w/WitsEnd.java
index 51879a56851..bea8f33fc59 100644
--- a/Mage.Sets/src/mage/cards/w/WitsEnd.java
+++ b/Mage.Sets/src/mage/cards/w/WitsEnd.java
@@ -50,7 +50,7 @@ public class WitsEnd extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{5}{B}{B}");
 
 
-        // Target player discards his or her hand.
+        // Target player discards their hand.
         this.getSpellAbility().addEffect(new WitsEndEffect());
         this.getSpellAbility().addTarget(new TargetPlayer());
     }
@@ -69,7 +69,7 @@ class WitsEndEffect extends OneShotEffect {
 
     public WitsEndEffect() {
         super(Outcome.Benefit);
-        this.staticText = "Target player discards his or her hand";
+        this.staticText = "Target player discards their hand";
     }
 
     public WitsEndEffect(final WitsEndEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/w/WoodvineElemental.java b/Mage.Sets/src/mage/cards/w/WoodvineElemental.java
index b021f63a070..403f369171f 100644
--- a/Mage.Sets/src/mage/cards/w/WoodvineElemental.java
+++ b/Mage.Sets/src/mage/cards/w/WoodvineElemental.java
@@ -53,7 +53,7 @@ import mage.players.Player;
  */
 public class WoodvineElemental extends CardImpl {
     
-    static final private String rule = "<i>Parley &mdash; </i> Whenever {this} attacks, each player reveals the top card of his or her library. "
+    static final private String rule = "<i>Parley &mdash; </i> Whenever {this} attacks, each player reveals the top card of their library. "
                         + "For each nonland card revealed this way, attacking creatures you control get +1/+1 until end of turn. Then each player draws a card.";
     
     public WoodvineElemental(UUID ownerId, CardSetInfo setInfo) {
@@ -65,7 +65,7 @@ public class WoodvineElemental extends CardImpl {
         // Trample
         this.addAbility(TrampleAbility.getInstance());
         
-        // Parley - Whenever Woodvine Elemental attacks, each player reveals the top card of his or her library. 
+        // Parley - Whenever Woodvine Elemental attacks, each player reveals the top card of their library.
         // For each nonland card revealed this way, attacking creatures you control get +1/+1 until end of turn. Then each player draws a card.
         Ability ability = new AttacksTriggeredAbility(new WoodvineElementalEffect(), false, rule);
         Effect effect = new DrawCardAllEffect(1);
diff --git a/Mage.Sets/src/mage/cards/w/Worldpurge.java b/Mage.Sets/src/mage/cards/w/Worldpurge.java
index cec0a7d4f96..daf4bd7c4c3 100644
--- a/Mage.Sets/src/mage/cards/w/Worldpurge.java
+++ b/Mage.Sets/src/mage/cards/w/Worldpurge.java
@@ -56,7 +56,7 @@ public class Worldpurge extends CardImpl {
     public Worldpurge(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{4}{W/U}{W/U}{W/U}{W/U}");
 
-        // Return all permanents to their owners' hands. Each player chooses up to seven cards in his or her hand, then shuffles the rest into his or her library. Empty all mana pools.
+        // Return all permanents to their owners' hands. Each player chooses up to seven cards in their hand, then shuffles the rest into their library. Empty all mana pools.
         this.getSpellAbility().addEffect(new WorldpurgeEffect());
 
     }
@@ -75,7 +75,7 @@ class WorldpurgeEffect extends OneShotEffect {
 
     public WorldpurgeEffect() {
         super(Outcome.Discard);
-        this.staticText = "Return all permanents to their owners' hands. Each player chooses up to seven cards in his or her hand, then shuffles the rest into his or her library. Empty all mana pools.";
+        this.staticText = "Return all permanents to their owners' hands. Each player chooses up to seven cards in their hand, then shuffles the rest into their library. Empty all mana pools.";
     }
 
     public WorldpurgeEffect(final WorldpurgeEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/w/WorryBeads.java b/Mage.Sets/src/mage/cards/w/WorryBeads.java
index 6966036f9bd..f44e6862eac 100644
--- a/Mage.Sets/src/mage/cards/w/WorryBeads.java
+++ b/Mage.Sets/src/mage/cards/w/WorryBeads.java
@@ -45,9 +45,9 @@ public class WorryBeads extends CardImpl {
     public WorryBeads(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{3}");
 
-        // At the beginning of each player's upkeep, that player puts the top card of his or her library into his or her graveyard.
+        // At the beginning of each player's upkeep, that player puts the top card of their library into their graveyard.
         this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD,
-                new PutLibraryIntoGraveTargetEffect(1).setText("that player puts the top card of his or her library into his or her graveyard"),
+                new PutLibraryIntoGraveTargetEffect(1).setText("that player puts the top card of their library into their graveyard"),
                 TargetController.ANY, false, true));
     }
 
diff --git a/Mage.Sets/src/mage/cards/w/WriteIntoBeing.java b/Mage.Sets/src/mage/cards/w/WriteIntoBeing.java
index 9a6495ad8f1..24cd65f28a3 100644
--- a/Mage.Sets/src/mage/cards/w/WriteIntoBeing.java
+++ b/Mage.Sets/src/mage/cards/w/WriteIntoBeing.java
@@ -115,7 +115,7 @@ class WriteIntoBeingEffect extends OneShotEffect {
                     cardToPutBack.moveToZone(Zone.LIBRARY, source.getSourceId(), game, false);
                     position = "on bottom";
                 }
-                game.informPlayers(sourceObject.getLogName() + ": " + controller.getLogName() + " puts the other card " + position + " of his or her library");
+                game.informPlayers(sourceObject.getLogName() + ": " + controller.getLogName() + " puts the other card " + position + " of their library");
             }
             return true;
         }
diff --git a/Mage.Sets/src/mage/cards/w/WuSpy.java b/Mage.Sets/src/mage/cards/w/WuSpy.java
index 3b86994d12c..24d1046d431 100644
--- a/Mage.Sets/src/mage/cards/w/WuSpy.java
+++ b/Mage.Sets/src/mage/cards/w/WuSpy.java
@@ -62,7 +62,7 @@ public class WuSpy extends CardImpl {
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        // When Wu Spy enters the battlefield, look at the top two cards of target player's library. Put one of them into his or her graveyard.
+        // When Wu Spy enters the battlefield, look at the top two cards of target player's library. Put one of them into their graveyard.
         Ability ability = new EntersBattlefieldTriggeredAbility(new WuSpyEffect(), false);
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
@@ -83,7 +83,7 @@ class WuSpyEffect extends OneShotEffect {
 
     WuSpyEffect() {
         super(Outcome.Exile);
-        this.staticText = "look at the top two cards of target player's library. Put one of them into his or her graveyard";
+        this.staticText = "look at the top two cards of target player's library. Put one of them into their graveyard";
     }
 
     WuSpyEffect(final WuSpyEffect effect) {
diff --git a/Mage.Sets/src/mage/cards/y/YoseiTheMorningStar.java b/Mage.Sets/src/mage/cards/y/YoseiTheMorningStar.java
index bbc1cd0fb0b..8667ad513e4 100644
--- a/Mage.Sets/src/mage/cards/y/YoseiTheMorningStar.java
+++ b/Mage.Sets/src/mage/cards/y/YoseiTheMorningStar.java
@@ -69,7 +69,7 @@ public class YoseiTheMorningStar extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
 
-        // When Yosei, the Morning Star dies, target player skips his or her next untap step. Tap up to five target permanents that player controls.
+        // When Yosei, the Morning Star dies, target player skips their next untap step. Tap up to five target permanents that player controls.
         Ability ability = new DiesTriggeredAbility(new SkipNextPlayerUntapStepEffect("target "));
         ability.addTarget(new TargetPlayer());
         ability.addTarget(new YoseiTheMorningStarTarget());
diff --git a/Mage.Sets/src/mage/cards/z/ZamWesell.java b/Mage.Sets/src/mage/cards/z/ZamWesell.java
index 71515eaffce..1d6a7681b0f 100644
--- a/Mage.Sets/src/mage/cards/z/ZamWesell.java
+++ b/Mage.Sets/src/mage/cards/z/ZamWesell.java
@@ -57,7 +57,7 @@ public class ZamWesell extends CardImpl {
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
 
-        // When you cast Zam Wessel, target opponent reveals his or her hand. You may choose a creature card from it and have Zam Wessel enter the battlefield as a copy of that creature card.
+        // When you cast Zam Wessel, target opponent reveals their hand. You may choose a creature card from it and have Zam Wessel enter the battlefield as a copy of that creature card.
         Ability ability = new CastSourceTriggeredAbility(new RevealHandTargetEffect());
         ability.addEffect(new ZamWesselEffect());
         ability.addTarget(new TargetOpponent());
diff --git a/Mage.Sets/src/mage/cards/z/ZhurTaaAncient.java b/Mage.Sets/src/mage/cards/z/ZhurTaaAncient.java
index e888b841519..d9d17351b7f 100644
--- a/Mage.Sets/src/mage/cards/z/ZhurTaaAncient.java
+++ b/Mage.Sets/src/mage/cards/z/ZhurTaaAncient.java
@@ -51,7 +51,7 @@ public class ZhurTaaAncient extends CardImpl {
         this.power = new MageInt(7);
         this.toughness = new MageInt(5);
 
-        // Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
+        // Whenever a player taps a land for mana, that player adds one mana to their mana pool of any type that land produced.
         this.addAbility(new TapForManaAllTriggeredManaAbility(
                 new AddManaOfAnyTypeProducedEffect(),
                 new FilterLandPermanent("a player taps a land"),
diff --git a/Mage.Sets/src/mage/sets/Dominaria.java b/Mage.Sets/src/mage/sets/Dominaria.java
index 0634cb39821..5717cf987f4 100644
--- a/Mage.Sets/src/mage/sets/Dominaria.java
+++ b/Mage.Sets/src/mage/sets/Dominaria.java
@@ -60,6 +60,10 @@ public class Dominaria extends ExpansionSet {
         cards.add(new SetCardInfo("Lyra Dawnbringer", 14, Rarity.MYTHIC, mage.cards.l.LyraDawnbringer.class));
         cards.add(new SetCardInfo("Serra Disciple", 34, Rarity.COMMON, mage.cards.s.SerraDisciple.class));
         cards.add(new SetCardInfo("Knight of Malice", 52, Rarity.UNCOMMON, mage.cards.k.KnightOfMalice.class));
+        cards.add(new SetCardInfo("Homarid Explorer", 53, Rarity.UNCOMMON, mage.cards.h.HomaridExplorer.class));
+        cards.add(new SetCardInfo("Opt", 60, Rarity.COMMON, mage.cards.o.Opt.class));
         cards.add(new SetCardInfo("Academy Drake", 40, Rarity.UNCOMMON, mage.cards.a.AcademyDrake.class));
+        cards.add(new SetCardInfo("Fall into Oblivion", 81, Rarity.UNCOMMON, mage.cards.f.FallIntoOblivion.class));
+        cards.add(new SetCardInfo("Llanowar Elves", 168, Rarity.COMMON, mage.cards.l.LlanowarElves.class));
     }
 }
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/BloodMoonTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/BloodMoonTest.java
index d2844086f62..5774778524f 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/BloodMoonTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/BloodMoonTest.java
@@ -185,7 +185,7 @@ public class BloodMoonTest extends CardTestPlayerBase {
         addCard(Zone.HAND, playerB, "Pithing Needle"); // {1}
         addCard(Zone.HAND, playerB, "Ghost Quarter", 1);
         // {T}: Add {C} to your mana pool.
-        // {T}, Sacrifice Ghost Quarter: Destroy target land. Its controller may search his or her library for a basic land card, put it onto the battlefield, then shuffle his or her library.
+        // {T}, Sacrifice Ghost Quarter: Destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield, then shuffle their library.
         addCard(Zone.BATTLEFIELD, playerB, "Ghost Quarter", 1);
 
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Blood Moon");
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/NayaSoulbeastTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/NayaSoulbeastTest.java
index cc5217b5bb2..d7e82904fcf 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/NayaSoulbeastTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/NayaSoulbeastTest.java
@@ -28,7 +28,7 @@ public class NayaSoulbeastTest extends CardTestPlayerBase {
         
         // Naya Soulbeast - {6}{G}{G}
         // Creature Beast - 0/0 - Trample
-        // When you cast Naya Soulbeast, each player reveals the top card of his or her library. 
+        // When you cast Naya Soulbeast, each player reveals the top card of their library.
         // Naya Soulbeast enters the battlefield with X +1/+1 counters on it, where X is the total converted mana cost of all cards revealed this way.
         addCard(Zone.HAND, playerA, "Naya Soulbeast", 1);
         addCard(Zone.BATTLEFIELD, playerA, "Forest", 8);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/WarpWorldTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/WarpWorldTest.java
index f4a0d258c73..f8af8dd6330 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/WarpWorldTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/enters/WarpWorldTest.java
@@ -49,9 +49,9 @@ public class WarpWorldTest extends CardTestPlayerBase {
      */
     @Test
     public void testWarpWorld() {
-        // Each player shuffles all permanents he or she owns into his or her library, then reveals that many cards from the top of his or her library.
+        // Each player shuffles all permanents he or she owns into their library, then reveals that many cards from the top of their library.
         // Each player puts all artifact, creature, and land cards revealed this way onto the battlefield, then does the same for enchantment cards,
-        // then puts all cards revealed this way that weren't put onto the battlefield on the bottom of his or her library.
+        // then puts all cards revealed this way that weren't put onto the battlefield on the bottom of their library.
         addCard(Zone.HAND, playerA, "Warp World"); // Sorcery {5}{R}{R}{R}
         addCard(Zone.BATTLEFIELD, playerA, "Mountain", 8);
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CascadeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CascadeTest.java
index 78d880e6d93..cc058468a27 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CascadeTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/CascadeTest.java
@@ -210,7 +210,7 @@ public class CascadeTest extends CardTestPlayerBase {
     public void testWithSplitSpell() {
 
         playerA.getLibrary().clear();
-        // Breaking - Target player puts the top eight cards of his or her library into his or her graveyard.
+        // Breaking - Target player puts the top eight cards of their library into their graveyard.
         // Entering - Put a creature card from a graveyard onto the battlefield under your control. It gains haste until end of turn.
         // Fuse (You may cast one or both halves of this card from your hand.)
         addCard(Zone.LIBRARY, playerA, "Breaking // Entering", 1); // Sorcery {U}{B} // {4}{U}{B}
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DiscardTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DiscardTest.java
index 795088dc07c..36f41348cfa 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DiscardTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DiscardTest.java
@@ -110,7 +110,7 @@ public class DiscardTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5);
         // Whenever an opponent discards a card, that player loses 2 life.
         addCard(Zone.HAND, playerA, "Liliana's Caress", 1); // ENCHANTMENT {1}{B}
-        // Target opponent reveals his or her hand. You choose a card from it. That player discards that card.
+        // Target opponent reveals their hand. You choose a card from it. That player discards that card.
         addCard(Zone.HAND, playerA, "Coercion", 1); // SORCERY {2}{B}
 
         addCard(Zone.HAND, playerB, "Island", 2);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DredgeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DredgeTest.java
index 9bf9be535fe..8b680128744 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DredgeTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DredgeTest.java
@@ -41,7 +41,7 @@ public class DredgeTest extends CardTestPlayerBase {
     /**
      *  702.51. Dredge
      *   702.51a Dredge is a static ability that functions only while the card with dredge is in a player's graveyard. "Dredge N" means "As long as you have at least N cards in your library, if you would draw a card, you may instead put N cards from the top of your library into your graveyard and return this card from your graveyard to your hand."
-     *   702.51b A player with fewer cards in his or her library than the number required by a dredge ability can't put any of them into his or her graveyard this way.
+     *   702.51b A player with fewer cards in their library than the number required by a dredge ability can't put any of them into their graveyard this way.
      */
 
     
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EscalateTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EscalateTest.java
index 34db143d05e..62339233baf 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EscalateTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EscalateTest.java
@@ -70,7 +70,7 @@ public class EscalateTest extends CardTestPlayerBase {
 
         // Escalate {1} (Pay this cost for each mode chosen beyond the first.)
         // Choose one or more —
-        // * Target player discards all the cards in his or her hand, then draws that many cards.
+        // * Target player discards all the cards in their hand, then draws that many cards.
         // * Collective Defiance deals 4 damage to target creature.
         // * Collective Defiance deals 3 damage to target opponent.
         addCard(Zone.HAND, playerA, "Collective Defiance"); // {1}{R}{R} sorcery
@@ -98,7 +98,7 @@ public class EscalateTest extends CardTestPlayerBase {
 
         // Escalate {1} (Pay this cost for each mode chosen beyond the first.)
         // Choose one or more —
-        // * Target player discards all the cards in his or her hand, then draws that many cards.
+        // * Target player discards all the cards in their hand, then draws that many cards.
         // * Collective Defiance deals 4 damage to target creature.
         // * Collective Defiance deals 3 damage to target opponent.
         addCard(Zone.HAND, playerA, "Collective Defiance"); // {1}{R}{R} sorcery
@@ -129,7 +129,7 @@ public class EscalateTest extends CardTestPlayerBase {
         
         // Escalate {1} (Pay this cost for each mode chosen beyond the first.)
         // Choose one or more —
-        // * Target player discards all the cards in his or her hand, then draws that many cards.
+        // * Target player discards all the cards in their hand, then draws that many cards.
         // * Collective Defiance deals 4 damage to target creature.
         // * Collective Defiance deals 3 damage to target opponent.
         addCard(Zone.HAND, playerA, "Collective Defiance"); // {1}{R}{R} sorcery
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EvokeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EvokeTest.java
index ae1a74395f6..c13e68c3e1c 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EvokeTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/EvokeTest.java
@@ -50,7 +50,7 @@ public class EvokeTest extends CardTestPlayerBase {
 
     Exhume  {1}{B}
     Sorcery
-    Each player puts a creature card from his or her graveyard onto the battlefield.
+    Each player puts a creature card from their graveyard onto the battlefield.
 
     */
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ForecastTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ForecastTest.java
index 20043cab319..cf95d8151f2 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ForecastTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ForecastTest.java
@@ -46,8 +46,8 @@ public class ForecastTest extends CardTestPlayerBase {
      *
      * 702.56b A forecast ability may be activated only during the upkeep step of
      * the card's owner and only once each turn. The controller of the forecast
-     * ability reveals the card with that ability from his or her hand as the
-     * ability is activated. That player plays with that card revealed in his or her
+     * ability reveals the card with that ability from their hand as the
+     * ability is activated. That player plays with that card revealed in their
      * hand until it leaves the player's hand or until a step or phase that isn't an
      * upkeep step begins, whichever comes first.
      *
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HideawayTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HideawayTest.java
index 85add42f968..5a78133ca8e 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HideawayTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/HideawayTest.java
@@ -89,7 +89,7 @@ public class HideawayTest extends CardTestPlayerBase {
         addCard(Zone.HAND, playerA, "Mosswort Bridge");
         // When you cast Ulamog, the Ceaseless Hunger, exile two target permanents.
         // Indestructible
-        // Whenever Ulamog attacks, defending player exiles the top twenty cards of his or her library.
+        // Whenever Ulamog attacks, defending player exiles the top twenty cards of their library.
         addCard(Zone.LIBRARY, playerA, "Ulamog, the Ceaseless Hunger");
         skipInitShuffling();
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/LandfallTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/LandfallTest.java
index 8edf2014d6f..2a564e73337 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/LandfallTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/LandfallTest.java
@@ -74,7 +74,7 @@ public class LandfallTest extends CardTestPlayerBase {
     public void testHiveMind() {
         addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
 
-        // Whenever a player casts an instant or sorcery spell, each other player copies that spell. Each of those players may choose new targets for his or her copy.
+        // Whenever a player casts an instant or sorcery spell, each other player copies that spell. Each of those players may choose new targets for their copy.
         addCard(Zone.BATTLEFIELD, playerB, "Hive Mind");
 
         // Instant - {1}{W}
@@ -183,7 +183,7 @@ public class LandfallTest extends CardTestPlayerBase {
      21:10: arucki activates: Inkmoth Nexus [1b5] becomes a 1/1 Blinkmoth artifact creature with flying and infect until end of turn. It's still a land. (It deals damage to creatures in the form of -1/-1 counters and to players in the form of poison counters.). from Inkmoth Nexus [1b5]
      21:10: arucki casts Groundswell [b28] targeting Inkmoth Nexus [1b5]
      21:10: Ability triggers: Wild Defiance [990] - Whenever a creature you control becomes the target of an instant or sorcery spell, that creature gets +3/+3 until end of turn
-     21:10: arucki puts Groundswell [b28] from stack into his or her graveyard
+     21:10: arucki puts Groundswell [b28] from stack into their graveyard
      21:10: arucki attacks with 1 creature
      21:10: Attacker: Inkmoth Nexus 1b5 unblocked
      */
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MadnessTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MadnessTest.java
index d44ac078833..51c8c36f090 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MadnessTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MadnessTest.java
@@ -45,10 +45,10 @@ public class MadnessTest extends CardTestPlayerBase {
      * with madness is in a player’s hand. The second is a triggered ability
      * that functions when the first ability is applied. “Madness [cost]” means
      * “If a player would discard this card, that player discards it, but may
-     * exile it instead of putting it into his or her graveyard” and “When this
+     * exile it instead of putting it into their graveyard” and “When this
      * card is exiled this way, its owner may cast it by paying [cost] rather
      * than paying its mana cost. If that player doesn’t, he or she puts this
-     * card into his or her graveyard.” 702.34b Casting a spell using its
+     * card into their graveyard.” 702.34b Casting a spell using its
      * madness ability follows the rules for paying alternative costs in rules
      * 601.2b and 601.2e–g.
      *
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ManifestTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ManifestTest.java
index 058c8787f88..4f09b89690c 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ManifestTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ManifestTest.java
@@ -111,7 +111,7 @@ public class ManifestTest extends CardTestPlayerBase {
     @Test
     public void testETBTriggeredAbilities3() {
         addCard(Zone.BATTLEFIELD, playerB, "Island", 2);
-        // Exile target creature. Its controller manifests the top card of his or her library {1}{U}
+        // Exile target creature. Its controller manifests the top card of their library {1}{U}
         addCard(Zone.HAND, playerB, "Reality Shift");
 
         // Constellation - When Doomwake Giant or another enchantment enters the battlefield
@@ -148,7 +148,7 @@ public class ManifestTest extends CardTestPlayerBase {
     @Test
     public void testNylea() {
         addCard(Zone.BATTLEFIELD, playerB, "Island", 2);
-        // Exile target creature. Its controller manifests the top card of his or her library {1}{U}
+        // Exile target creature. Its controller manifests the top card of their library {1}{U}
         addCard(Zone.HAND, playerB, "Reality Shift");
 
         // As long as your devotion to white is less than five, Nylea isn't a creature.
@@ -182,7 +182,7 @@ public class ManifestTest extends CardTestPlayerBase {
     @Test
     public void testColorOfManifestedCardDoesNotCount() {
         addCard(Zone.BATTLEFIELD, playerB, "Island", 2);
-        // Exile target creature. Its controller manifests the top card of his or her library {1}{U}
+        // Exile target creature. Its controller manifests the top card of their library {1}{U}
         addCard(Zone.HAND, playerB, "Reality Shift");
 
         // Gore Swine {2}{R}
@@ -219,7 +219,7 @@ public class ManifestTest extends CardTestPlayerBase {
     public void testCardGetsExiledFaceUp() {
         addCard(Zone.BATTLEFIELD, playerB, "Island", 2);
         addCard(Zone.BATTLEFIELD, playerB, "Swamp", 4);
-        // Exile target creature. Its controller manifests the top card of his or her library {1}{U}
+        // Exile target creature. Its controller manifests the top card of their library {1}{U}
         addCard(Zone.HAND, playerB, "Reality Shift");
         // Silence the Believers - Instant {2}{B}{B}
         // Strive — Silence the Believers costs more to cast for each target beyond the first.
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MorphTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MorphTest.java
index d10e8b485ec..95d48105783 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MorphTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/MorphTest.java
@@ -603,7 +603,7 @@ public class MorphTest extends CardTestPlayerBase {
 
         // Flying, haste
         // Other creatures you control have haste.
-        // Whenever an opponent casts a creature or planeswalker spell with the same name as a card in his or her graveyard, that player loses 10 life.
+        // Whenever an opponent casts a creature or planeswalker spell with the same name as a card in their graveyard, that player loses 10 life.
         addCard(Zone.BATTLEFIELD, playerB, "Dragonlord Kolaghan", 1);
 
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Akroma, Angel of Fury");
@@ -751,7 +751,7 @@ public class MorphTest extends CardTestPlayerBase {
     public void testVesuvanShapeshifter() {
 
         // Morph {5}{U}{U}
-        // When Brine Elemental is turned face up, each opponent skips his or her next untap step.
+        // When Brine Elemental is turned face up, each opponent skips their next untap step.
         addCard(Zone.HAND, playerA, "Brine Elemental"); // Creature {4}{U}{U} 5/4
         addCard(Zone.BATTLEFIELD, playerA, "Island", 6);
 
@@ -876,7 +876,7 @@ public class MorphTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Island", 3);
 
         // Each creature has "When this creature dies, choose target opponent. That player puts this card from its owner's graveyard
-        // onto the battlefield under his or her control at the beginning of the next end step."
+        // onto the battlefield under their control at the beginning of the next end step."
         addCard(Zone.BATTLEFIELD, playerA, "Endless Whispers", 1);
 
         addCard(Zone.HAND, playerB, "Lightning Bolt");
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ParleyTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ParleyTest.java
index 0a125ece7d8..9574c302d55 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ParleyTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ParleyTest.java
@@ -51,7 +51,7 @@ public class ParleyTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Forest");
         addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
 
-        // Parley - {T}: Each player reveals the top card of his or her library. For each nonland card revealed this way, add {G} to your mana pool and you gain 1 life. Then each player draws a card.
+        // Parley - {T}: Each player reveals the top card of their library. For each nonland card revealed this way, add {G} to your mana pool and you gain 1 life. Then each player draws a card.
         addCard(Zone.HAND, playerA, "Selvala, Explorer Returned");// Creature {1}{G}{W}
 
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Selvala, Explorer Returned");
@@ -68,7 +68,7 @@ public class ParleyTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Forest");
         addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
 
-        // Parley - {T}: Each player reveals the top card of his or her library. For each nonland card revealed this way, add {G} to your mana pool and you gain 1 life. Then each player draws a card.
+        // Parley - {T}: Each player reveals the top card of their library. For each nonland card revealed this way, add {G} to your mana pool and you gain 1 life. Then each player draws a card.
         addCard(Zone.HAND, playerA, "Selvala, Explorer Returned");// Creature {1}{G}{W}
 
         addCard(Zone.LIBRARY, playerA, "Silvercoat Lion", 2);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ScavengeTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ScavengeTest.java
index 4e5a9f222ad..e07080e0244 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ScavengeTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/ScavengeTest.java
@@ -54,7 +54,7 @@ public class ScavengeTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion", 1);
 
         // Activated abilities of creature cards in your graveyard cost {1} less to activate.
-        // Tap an untapped Zombie you control: Target player puts the top card of his or her library into his or her graveyard.
+        // Tap an untapped Zombie you control: Target player puts the top card of their library into their graveyard.
         addCard(Zone.BATTLEFIELD, playerA, "Embalmer's Tools", 1);
 
         activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Scavenge", "Silvercoat Lion");
@@ -105,7 +105,7 @@ public class ScavengeTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Varolz, the Scar-Striped", 1);
 
         // Activated abilities of creature cards in your graveyard cost {1} less to activate.
-        // Tap an untapped Zombie you control: Target player puts the top card of his or her library into his or her graveyard.
+        // Tap an untapped Zombie you control: Target player puts the top card of their library into their graveyard.
         addCard(Zone.BATTLEFIELD, playerA, "Embalmer's Tools", 1);
 
         activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Scavenge", "Silvercoat Lion");
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/StormTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/StormTest.java
index fbefd4b0063..87e1cbdf6ea 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/StormTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/StormTest.java
@@ -249,7 +249,7 @@ public class StormTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Swamp", 3);
         addCard(Zone.BATTLEFIELD, playerA, "Island", 10);
         addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
-        // Each player discards his or her hand,
+        // Each player discards their hand,
         // then draws seven cards.
         addCard(Zone.HAND, playerA, "Wheel of Fortune", 1); // {2}{R}
         addCard(Zone.LIBRARY, playerA, "Mox Emerald", 1);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TransformTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TransformTest.java
index e22a46920a3..f998e7cdab3 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TransformTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TransformTest.java
@@ -193,7 +193,7 @@ public class TransformTest extends CardTestPlayerBase {
      */
     @Test
     public void testStartledAwake() {
-        // Target opponent puts the top thirteen cards of his or her library into his or her graveyard.
+        // Target opponent puts the top thirteen cards of their library into their graveyard.
         // {3}{U}{U}: Put Startled Awake from your graveyard onto the battlefield transformed. Activate this ability only any time you could cast a sorcery.
         addCard(Zone.HAND, playerA, "Startled Awake"); // SORCERY {2}{U}{U}"
         addCard(Zone.BATTLEFIELD, playerA, "Island", 9);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TransmuteTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TransmuteTest.java
index ebaf77092ef..1a93ca962df 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TransmuteTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/TransmuteTest.java
@@ -97,7 +97,7 @@ public class TransmuteTest extends CardTestPlayerBase {
     public void searchSplittedCardThreeManaCmcSpell() {
         addCard(Zone.BATTLEFIELD, playerA, "Island", 2);
         addCard(Zone.BATTLEFIELD, playerA, "Swamp", 1);
-        // Counter target spell unless its controller discards his or her hand.
+        // Counter target spell unless its controller discards their hand.
         // Transmute {1}{U}{B}
         addCard(Zone.HAND, playerA, "Perplex"); // Instant {1}{U}{B}
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterspellTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterspellTest.java
index caed99a59d5..8af9c8b3d62 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterspellTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CounterspellTest.java
@@ -45,9 +45,9 @@ public class CounterspellTest extends CardTestPlayerBase {
         Code: Select all
             13:10: Benno casts Boom [8ce] targeting Mountain [4c8] Island [80c]
             13:10: Benno casts Counterspell [2b7] targeting Boom [8ce]
-            13:10: Benno puts Boom [8ce] from stack into his or her graveyard
+            13:10: Benno puts Boom [8ce] from stack into their graveyard
             13:10: Boom is countered by Counterspell [2b7]
-            13:10: Benno puts Counterspell [2b7] from stack into his or her graveyard
+            13:10: Benno puts Counterspell [2b7] from stack into their graveyard
             13:10: Mountain [4c8] was destroyed
             13:10: Island [80c] was destroyed
      */
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CrypticCommandTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CrypticCommandTest.java
index 47d417e9519..f97e9121803 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CrypticCommandTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/CrypticCommandTest.java
@@ -86,7 +86,7 @@ public class CrypticCommandTest extends CardTestPlayerBase {
      */
     @Test
     public void testCommandChangeTarget() {
-        // Target player reveals his or her hand. You choose a nonland card from it. That player discards that card. You lose 2 life.
+        // Target player reveals their hand. You choose a nonland card from it. That player discards that card. You lose 2 life.
         addCard(Zone.HAND, playerA, "Thoughtseize");
         // Counter target spell. If that spell is countered this way, put it into its owner's hand instead of into that player's graveyard.
         // Draw a card.
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/DesertionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/DesertionTest.java
index 2bc5ebcdc39..df4dcd0b682 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/DesertionTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/DesertionTest.java
@@ -49,7 +49,7 @@ public class DesertionTest extends CardTestPlayerBase {
     public void testCounterKozilek() {
         // When you cast Kozilek, Butcher of Truth, draw four cards.
         // Annihilator 4 (Whenever this creature attacks, defending player sacrifices four permanents.)
-        // When Kozilek is put into a graveyard from anywhere, its owner shuffles his or her graveyard into his or her library.
+        // When Kozilek is put into a graveyard from anywhere, its owner shuffles their graveyard into their library.
         addCard(Zone.HAND, playerA, "Kozilek, Butcher of Truth"); // {10}
         addCard(Zone.BATTLEFIELD, playerA, "Island", 10);
         addCard(Zone.GRAVEYARD, playerA, "Silvercoat Lion"); // {10}
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/NotOfThisWorldTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/NotOfThisWorldTest.java
index d3a652e9795..7ee12c7ae6a 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/NotOfThisWorldTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/NotOfThisWorldTest.java
@@ -46,7 +46,7 @@ public class NotOfThisWorldTest extends CardTestPlayerBase {
      */
     @Test
     public void testCounterFirstSpell() {
-        // At the beginning of each player's upkeep, destroy target nonartifact creature that player controls of his or her choice. It can't be regenerated.
+        // At the beginning of each player's upkeep, destroy target nonartifact creature that player controls of their choice. It can't be regenerated.
         addCard(Zone.BATTLEFIELD, playerA, "The Abyss", 1);
 
         addCard(Zone.BATTLEFIELD, playerB, "Island", 7);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/ResetTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/ResetTest.java
index 92b592dd86b..8722f971f37 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/ResetTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/counterspell/ResetTest.java
@@ -55,7 +55,7 @@ public class ResetTest extends CardTestPlayerBase {
 
         addCard(Zone.BATTLEFIELD, playerB, "Island", 2, true);
         addCard(Zone.BATTLEFIELD, playerB, "Island", 2);
-        // Cast Reset only during an opponent's turn after his or her upkeep step.
+        // Cast Reset only during an opponent's turn after their upkeep step.
         // Untap all lands you control.
         addCard(Zone.HAND, playerB, "Reset");
         // Counter target spell.
@@ -85,7 +85,7 @@ public class ResetTest extends CardTestPlayerBase {
     public void testResetDoesNotWork() {
         addCard(Zone.BATTLEFIELD, playerA, "Island", 2);
         addCard(Zone.BATTLEFIELD, playerA, "Island", 2);
-        // Cast Reset only during an opponent's turn after his or her upkeep step.
+        // Cast Reset only during an opponent's turn after their upkeep step.
         // Untap all lands you control.
         addCard(Zone.HAND, playerA, "Reset");
         // Counter target spell.
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/DestroyTheEvidanceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/DestroyTheEvidanceTest.java
index aaf1b5aa625..0f36613e933 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/DestroyTheEvidanceTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/destroy/DestroyTheEvidanceTest.java
@@ -41,7 +41,7 @@ public class DestroyTheEvidanceTest extends CardTestPlayerBase {
 
     // Destroy the Evidence - Sorcery {4}{B}
     // Destroy target land. Its controller reveals cards from the top of his
-    // or her library until he or she reveals a land card, then puts those cards into his or her graveyard.
+    // or her library until he or she reveals a land card, then puts those cards into their graveyard.
     
     /**
      * The target land is destroyed
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/OblivionSowerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/OblivionSowerTest.java
index 92409017ace..9dfbb04da1e 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/OblivionSowerTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/OblivionSowerTest.java
@@ -47,7 +47,7 @@ public class OblivionSowerTest extends CardTestPlayerBase {
     @Test
     public void testPlayLandsFromExile() {
         addCard(Zone.BATTLEFIELD, playerA, "Plains", 6);
-        // When you cast Oblivion Sower, target opponent exiles the top four cards of his or her library, then you may put any number of land cards that player owns from exile onto the battlefield under your control.
+        // When you cast Oblivion Sower, target opponent exiles the top four cards of their library, then you may put any number of land cards that player owns from exile onto the battlefield under your control.
         addCard(Zone.HAND, playerA, "Oblivion Sower"); // Creature - 5/8
 
         // Canopy Vista enters the battlefield tapped unless you control two or more basic lands.
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/SurgicalExtractionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/SurgicalExtractionTest.java
index 1ddeaaa8fd1..a7cfc42d2b5 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/SurgicalExtractionTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/oneshot/exile/SurgicalExtractionTest.java
@@ -26,7 +26,7 @@ public class SurgicalExtractionTest extends CardTestPlayerBase {
     public void testSearchAndExileSplitCards() {
         // Choose target card in a graveyard other than a basic land card. Search its owner's graveyard,
         // hand, and library for any number of cards with the same name as that card and exile them.
-        // Then that player shuffles his or her library.
+        // Then that player shuffles their library.
         addCard(Zone.HAND, playerA, "Surgical Extraction", 1); // Instant {B/P}
         addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2);
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/EndTurnEffectTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/EndTurnEffectTest.java
index be66f20be72..270c739d8b4 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/EndTurnEffectTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/EndTurnEffectTest.java
@@ -50,11 +50,11 @@ public class EndTurnEffectTest extends CardTestPlayerBase {
     public void testSpellsAffinity() {
         addCard(Zone.BATTLEFIELD, playerA, "Island", 3);
 
-        // Whenever you draw a card, target opponent puts the top two cards of his or her library into his or her graveyard. If they're both nonland cards that share a color, repeat this process.
+        // Whenever you draw a card, target opponent puts the top two cards of their library into their graveyard. If they're both nonland cards that share a color, repeat this process.
         // {5}{U}: Draw a card, then discard a card.
         addCard(Zone.BATTLEFIELD, playerA, "Sphinx's Tutelage");
 
-        // Each player shuffles his or her hand and graveyard into his or her library, then draws seven cards. If it's your turn, end the turn.
+        // Each player shuffles their hand and graveyard into their library, then draws seven cards. If it's your turn, end the turn.
         //  (Exile all spells and abilities on the stack, including this card.
         //   Discard down to your maximum hand size. Damage wears off, and
         //   "this turn" and "until end of turn" effects end.)
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/CastAsInstantTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/CastAsInstantTest.java
index fee519fb60c..ea0276051e3 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/asthough/CastAsInstantTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/asthough/CastAsInstantTest.java
@@ -46,7 +46,7 @@ public class CastAsInstantTest extends CardTestPlayerBase {
         // Draw a card.
         addCard(Zone.HAND, playerB, "Quicken"); // {U}
         // Devoid (This card has no color.)
-        // Target opponent exiles two cards from his or her hand and loses 2 life.
+        // Target opponent exiles two cards from their hand and loses 2 life.
         addCard(Zone.HAND, playerB, "Witness the End"); // {3}{B}
 
         addCard(Zone.HAND, playerA, "Silvercoat Lion", 2);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/LandTypeChangingEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/LandTypeChangingEffectsTest.java
index 3184641c2df..6edd6caf065 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/LandTypeChangingEffectsTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/LandTypeChangingEffectsTest.java
@@ -223,7 +223,7 @@ public class LandTypeChangingEffectsTest extends CardTestPlayerBase {
 
         addCard(Zone.BATTLEFIELD, playerA, "Mountain", 4);
 
-        // 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.
+        // At the beginning of each player's upkeep, that player puts a flood counter on target non-Island land he or she controls of their choice.
         //  That land is an Island for as long as it has a flood counter on it.
         // At the beginning of each end step, if all lands on the battlefield are Islands, remove all flood counters from them.
         addCard(Zone.HAND, playerB, "Quicksilver Fountain", 1); // Artifact {3}
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PsychicIntrusionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PsychicIntrusionTest.java
index adecee927fa..f83875f4c87 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PsychicIntrusionTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/PsychicIntrusionTest.java
@@ -46,7 +46,7 @@ public class PsychicIntrusionTest extends CardTestPlayerBase {
     public void testCastFromExile() {
         // Psychic Intrusion  {3}{U}{B}
         // Sorcery
-        // Target opponent reveals his or her hand. You choose a nonland card from that player's 
+        // Target opponent reveals their hand. You choose a nonland card from that player's
         // graveyard or hand and exile it. You may cast that card for as long as it remains exiled,
         // and you may spend mana as though it were mana of any color to cast that spell.
         addCard(Zone.HAND, playerA, "Psychic Intrusion", 1);        
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/control/BronzeBombshellTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/control/BronzeBombshellTest.java
index 9130c50c4d8..0340075364e 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/control/BronzeBombshellTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/control/BronzeBombshellTest.java
@@ -46,7 +46,7 @@ public class BronzeBombshellTest extends CardTestPlayerBase {
 
         // Each creature has "When this creature dies, choose target opponent.
         // That player puts this card from its owner's graveyard onto the battlefield
-        // under his or her control at the beginning of the next end step."
+        // under their control at the beginning of the next end step."
         addCard(Zone.BATTLEFIELD, playerA, "Endless Whispers", 1);
 
         addCard(Zone.BATTLEFIELD, playerA, "Swamp", 3);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/control/CastOtherPlayersCardFromExileTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/control/CastOtherPlayersCardFromExileTest.java
index bcecebc2ca2..b81c7512480 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/control/CastOtherPlayersCardFromExileTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/control/CastOtherPlayersCardFromExileTest.java
@@ -58,7 +58,7 @@ public class CastOtherPlayersCardFromExileTest extends CardTestPlayerBase {
     public void testCastWithThadaAdelAcquisitor() {
         addCard(Zone.BATTLEFIELD, playerA, "Swamp", 3);
         // Islandwalk
-        // Whenever Thada Adel, Acquisitor deals combat damage to a player, search that player's library for an artifact card and exile it. Then that player shuffles his or her library.
+        // Whenever Thada Adel, Acquisitor deals combat damage to a player, search that player's library for an artifact card and exile it. Then that player shuffles their library.
         // Until end of turn, you may play that card.
         addCard(Zone.BATTLEFIELD, playerA, "Thada Adel, Acquisitor", 1); // Creature {1}{U}{U} 2/2
 
@@ -91,7 +91,7 @@ public class CastOtherPlayersCardFromExileTest extends CardTestPlayerBase {
     public void testCastWithThadaAdelAcquisitorReturnedFromBattlefield() {
         addCard(Zone.BATTLEFIELD, playerA, "Swamp", 3);
         // Islandwalk
-        // Whenever Thada Adel, Acquisitor deals combat damage to a player, search that player's library for an artifact card and exile it. Then that player shuffles his or her library.
+        // Whenever Thada Adel, Acquisitor deals combat damage to a player, search that player's library for an artifact card and exile it. Then that player shuffles their library.
         // Until end of turn, you may play that card.
         addCard(Zone.BATTLEFIELD, playerA, "Thada Adel, Acquisitor", 1); // Creature {1}{U}{U} 2/2
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/control/ExileAndReturnUnderYourControl.java b/Mage.Tests/src/test/java/org/mage/test/cards/control/ExileAndReturnUnderYourControl.java
index ae2ab5f4d82..59009ff581a 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/control/ExileAndReturnUnderYourControl.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/control/ExileAndReturnUnderYourControl.java
@@ -39,7 +39,7 @@ public class ExileAndReturnUnderYourControl extends CardTestPlayerBase {
     @Test
     public void testVillainousWealthExilesCourser() {
         // Villainous Wealth {X}{B}{G}{U}
-        // Target opponent exiles the top X cards of his or her library. You may cast any number
+        // Target opponent exiles the top X cards of their library. You may cast any number
         // of nonland cards with converted mana cost X or less from among them without paying
         // their mana costs.
         addCard(Zone.HAND, playerA, "Villainous Wealth");
@@ -72,7 +72,7 @@ public class ExileAndReturnUnderYourControl extends CardTestPlayerBase {
     @Test
     public void testVillainousWealthExilesBoost() {
         // Villainous Wealth {X}{B}{G}{U}
-        // Target opponent exiles the top X cards of his or her library. You may cast any number
+        // Target opponent exiles the top X cards of their library. You may cast any number
         // of nonland cards with converted mana cost X or less from among them without paying
         // their mana costs.
         addCard(Zone.HAND, playerA, "Villainous Wealth");
@@ -115,7 +115,7 @@ public class ExileAndReturnUnderYourControl extends CardTestPlayerBase {
     @Test
     public void testVillainousWealthExilesSylvanLibrary() {
         // Villainous Wealth {X}{B}{G}{U}
-        // Target opponent exiles the top X cards of his or her library. You may cast any number
+        // Target opponent exiles the top X cards of their library. You may cast any number
         // of nonland cards with converted mana cost X or less from among them without paying
         // their mana costs.
         addCard(Zone.HAND, playerA, "Villainous Wealth");
@@ -159,7 +159,7 @@ public class ExileAndReturnUnderYourControl extends CardTestPlayerBase {
     @Test
     public void testVillainousWealthAndQuicken() {
         // Villainous Wealth {X}{B}{G}{U}
-        // Target opponent exiles the top X cards of his or her library. You may cast any number
+        // Target opponent exiles the top X cards of their library. You may cast any number
         // of nonland cards with converted mana cost X or less from among them without paying
         // their mana costs.
         addCard(Zone.HAND, playerA, "Villainous Wealth"); // {X}{B}{G}{U}
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/control/PutIntoPlayEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/control/PutIntoPlayEffectsTest.java
index 013ce94c9d1..b93d5201c09 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/control/PutIntoPlayEffectsTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/control/PutIntoPlayEffectsTest.java
@@ -112,7 +112,7 @@ public class PutIntoPlayEffectsTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Island", 5);
         // Bribery - Sorcery {3}{U}{U}
         // Search target opponent's library for a creature card and put that card onto the battlefield
-        // under your control. Then that player shuffles his or her library.
+        // under your control. Then that player shuffles their library.
         addCard(Zone.HAND, playerA, "Bribery");
 
         addCard(Zone.BATTLEFIELD, playerB, "Island", 2);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CleverImpersonatorTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CleverImpersonatorTest.java
index 836ca912273..7cb9d15d87a 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CleverImpersonatorTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CleverImpersonatorTest.java
@@ -191,7 +191,7 @@ public class CleverImpersonatorTest extends CardTestPlayerBase {
         /*
         {3}{G} Dawn's Reflection
         Enchantment - Aura, Enchant Land
-        Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors to his or her mana pool (in addition to the mana the land produces).
+        Whenever enchanted land is tapped for mana, its controller adds two mana in any combination of colors to their mana pool (in addition to the mana the land produces).
          */
         addCard(Zone.HAND, playerA, dReflection);
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java
index 9488fbf4550..167ac7f8856 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/CopySpellTest.java
@@ -170,7 +170,7 @@ public class CopySpellTest extends CardTestPlayerBase {
      * additional costs in rules 601.2b and 601.2e–g. 601.2b If the spell is
      * modal the player announces the mode choice (see rule 700.2). If the
      * player wishes to splice any cards onto the spell (see rule 702.46), he or
-     * she reveals those cards in his or her hand. 706.10. To copy a spell,
+     * she reveals those cards in their hand. 706.10. To copy a spell,
      * activated ability, or triggered ability means to put a copy of it onto
      * the stack; a copy of a spell isn’t cast and a copy of an activated
      * ability isn’t activated. A copy of a spell or ability copies both the
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/EldraziMimicTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/EldraziMimicTest.java
index 953f183c1de..fdd60c41048 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/EldraziMimicTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/EldraziMimicTest.java
@@ -47,7 +47,7 @@ public class EldraziMimicTest extends CardTestPlayerBase {
     public void testCopyIfPermanentIsGone() {
         // Devoid (This card has no color.)
         // Flying
-        // Whenever you cast a colorless spell, target opponent exiles the top card of his or her library.
+        // Whenever you cast a colorless spell, target opponent exiles the top card of their library.
         addCard(Zone.HAND, playerA, "Thought Harvester", 1); // {3}{U} 2/4
         addCard(Zone.BATTLEFIELD, playerA, "Island", 4);
         // Whenever another colorless creature enters the battlefield under your control, you may have the base power and toughness of Eldrazi Mimic
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/HiveMindTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/HiveMindTest.java
index 8ed959619cd..5b1c6937de0 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/HiveMindTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/HiveMindTest.java
@@ -46,7 +46,7 @@ public class HiveMindTest extends CardTestPlayerBase {
     public void testTransform() {
         addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
         // Whenever a player casts an instant or sorcery spell, each other player copies that spell.
-        // Each of those players may choose new targets for his or her copy.
+        // Each of those players may choose new targets for their copy.
         addCard(Zone.BATTLEFIELD, playerA, "Hive Mind", 1);
         addCard(Zone.HAND, playerA, "Lightning Bolt", 1);
         setChoice(playerB, "Yes");
@@ -72,7 +72,7 @@ public class HiveMindTest extends CardTestPlayerBase {
     @Test
     public void testChaliceOfTtheVoid() {
         // Whenever a player casts an instant or sorcery spell, each other player copies that spell.
-        // Each of those players may choose new targets for his or her copy.
+        // Each of those players may choose new targets for their copy.
         addCard(Zone.BATTLEFIELD, playerA, "Hive Mind", 1);
         // Create a 4/4 red Giant creature token onto the battlefield.
         // At the beginning of your next upkeep, pay {4}{R}. If you don't, you lose the game.
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/LazavDimirMastermindTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/LazavDimirMastermindTest.java
index 6d0c8f05191..fde9b4d0c74 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/LazavDimirMastermindTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/LazavDimirMastermindTest.java
@@ -32,7 +32,7 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase {
     public void testCopySimpleCreature() {
         addCard(Zone.BATTLEFIELD, playerA, "Lazav, Dimir Mastermind", 1);
         // Codex Shredder - Artifact
-        // {T}: Target player puts the top card of his or her library into his or her graveyard.
+        // {T}: Target player puts the top card of their library into their graveyard.
         // {5}, {T}, Sacrifice Codex Shredder: Return target card from your graveyard to your hand.
         addCard(Zone.BATTLEFIELD, playerA, "Codex Shredder", 1);
 
@@ -40,7 +40,7 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase {
         addCard(Zone.LIBRARY, playerB, "Assault Griffin",5);
         skipInitShuffling();
 
-        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of his or her library into his or her graveyard.", playerB);
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of their library into their graveyard.", playerB);
 
         setStopAt(1, PhaseStep.END_TURN);
         execute();
@@ -67,7 +67,7 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase {
         addCard(Zone.LIBRARY, playerB, "Ogre Slumlord",5);
         skipInitShuffling();
 
-        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of his or her library into his or her graveyard.", playerB);
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of their library into their graveyard.", playerB);
 
         setStopAt(1, PhaseStep.END_TURN);
         execute();
@@ -89,7 +89,7 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase {
      * Nightveil Specter
      * Creature — Specter 2/3, {U/B}{U/B}{U/B}
      * Flying
-     * Whenever Nightveil Specter deals combat damage to a player, that player exiles the top card of his or her library.
+     * Whenever Nightveil Specter deals combat damage to a player, that player exiles the top card of their library.
      * You may play cards exiled with Nightveil Specter.
      *
      */
@@ -103,7 +103,7 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase {
         addCard(Zone.LIBRARY, playerB, "Nightveil Specter",1);
         skipInitShuffling();
 
-        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of his or her library into his or her graveyard.", playerB);
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of their library into their graveyard.", playerB);
 
         attack(3, playerA, "Lazav, Dimir Mastermind");
 
@@ -135,10 +135,10 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase {
         skipInitShuffling();
 
         // Lazav becomes a Nightveil Specter
-        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of his or her library into his or her graveyard.", playerB);
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of their library into their graveyard.", playerB);
 
         // Lazav becomes a Silvercoat Lion
-        activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of his or her library into his or her graveyard.", playerB);
+        activateAbility(3, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of their library into their graveyard.", playerB);
 
         setStopAt(3, PhaseStep.END_TURN);
         execute();
@@ -161,7 +161,7 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase {
         addCard(Zone.HAND, playerA ,"Reanimate");        
         addCard(Zone.BATTLEFIELD, playerA, "Lazav, Dimir Mastermind", 1);
         // Codex Shredder - Artifact
-        // {T}: Target player puts the top card of his or her library into his or her graveyard.
+        // {T}: Target player puts the top card of their library into their graveyard.
         // {5}, {T}, Sacrifice Codex Shredder: Return target card from your graveyard to your hand.
         addCard(Zone.BATTLEFIELD, playerA, "Codex Shredder", 1);
 
@@ -173,7 +173,7 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase {
         
         skipInitShuffling();
 
-        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of his or her library into his or her graveyard.", playerB);
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of their library into their graveyard.", playerB);
 
         castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "Tribute to Hunger");
         
@@ -204,7 +204,7 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase {
     public void testCopyCreatureExiled() {
         addCard(Zone.BATTLEFIELD, playerA, "Lazav, Dimir Mastermind", 1);
         // Codex Shredder - Artifact
-        // {T}: Target player puts the top card of his or her library into his or her graveyard.
+        // {T}: Target player puts the top card of their library into their graveyard.
         // {5}, {T}, Sacrifice Codex Shredder: Return target card from your graveyard to your hand.
         addCard(Zone.BATTLEFIELD, playerA, "Codex Shredder", 1);
         
@@ -216,7 +216,7 @@ public class LazavDimirMastermindTest extends CardTestPlayerBase {
         addCard(Zone.LIBRARY, playerB, "Assault Griffin",5);
         skipInitShuffling();
 
-        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of his or her library into his or her graveyard.", playerB);
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of their library into their graveyard.", playerB);
         
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Rest in Peace");
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhyrexianMetamorphTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhyrexianMetamorphTest.java
index 14e90953a85..526e5c6acf0 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhyrexianMetamorphTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhyrexianMetamorphTest.java
@@ -233,7 +233,7 @@ public class PhyrexianMetamorphTest extends CardTestPlayerBase {
     public void testShowAndTell() {
         addCard(Zone.BATTLEFIELD, playerA, "Island", 3);
 
-        // Each player may put an artifact, creature, enchantment, or land card from his or her hand onto the battlefield.
+        // Each player may put an artifact, creature, enchantment, or land card from their hand onto the battlefield.
         addCard(Zone.HAND, playerA, "Show and Tell"); // SORCERY {2}{U}
 
         // Swampwalk
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/ReversalOfFortuneTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/ReversalOfFortuneTest.java
index 31d1197c014..4ce8646ef54 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/ReversalOfFortuneTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/ReversalOfFortuneTest.java
@@ -43,7 +43,7 @@ public class ReversalOfFortuneTest extends CardTestPlayerBase {
     /**
      * Reversal of Fortune
      * Sorcery, 4RR (6)
-     * Target opponent reveals his or her hand. You may copy an instant or sorcery 
+     * Target opponent reveals their hand. You may copy an instant or sorcery
      * card in it. If you do, you may cast the copy without paying its mana cost.
      * 
     */    
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/VolrathsShapshifterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/VolrathsShapshifterTest.java
index 0bd4bc3f916..d8f4d44902c 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/VolrathsShapshifterTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/VolrathsShapshifterTest.java
@@ -56,7 +56,7 @@ public class VolrathsShapshifterTest extends CardTestPlayerBase {
 	public void testLosingCopy() {
         addCard(Zone.BATTLEFIELD, playerA, "Volrath's Shapeshifter", 1);
         // Codex Shredder - Artifact
-        // {T}: Target player puts the top card of his or her library into his or her graveyard.
+        // {T}: Target player puts the top card of their library into their graveyard.
         // {5}, {T}, Sacrifice Codex Shredder: Return target card from your graveyard to your hand.
         addCard(Zone.BATTLEFIELD, playerA, "Codex Shredder", 1);
 
@@ -65,7 +65,7 @@ public class VolrathsShapshifterTest extends CardTestPlayerBase {
         addCard(Zone.LIBRARY, playerA, "Forest", 1);
         skipInitShuffling();
 
-        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of his or her library into his or her graveyard.", playerA);
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "{T}: Target player puts the top card of their library into their graveyard.", playerA);
 
         setStopAt(1, PhaseStep.END_TURN);
         execute();
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/CastFromHandWithoutPayingManaCostTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/CastFromHandWithoutPayingManaCostTest.java
index 0f51dac53d2..d0b8d4e8e11 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/CastFromHandWithoutPayingManaCostTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/alternate/CastFromHandWithoutPayingManaCostTest.java
@@ -335,7 +335,7 @@ public class CastFromHandWithoutPayingManaCostTest extends CardTestPlayerBase {
         Jeleva, Nephalia's Scourge {1}{U}{B}{R}
         Legendary Creature - Vampire Wizard 1/3
         Flying
-        When Jeleva, Nephalia's Scourge enters the battlefield, each player exiles the top X cards of his or her library, where X is the amount of mana spent to cast Jeleva.
+        When Jeleva, Nephalia's Scourge enters the battlefield, each player exiles the top X cards of their library, where X is the amount of mana spent to cast Jeleva.
         Whenever Jeleva attacks, you may cast an instant or sorcery card exiled with it without paying its mana cost.
          */
         String jeleva = "Jeleva, Nephalia's Scourge";
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/CastSplitCardsFromOtherZonesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/CastSplitCardsFromOtherZonesTest.java
index d6430520c35..f0181b6c1bc 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/CastSplitCardsFromOtherZonesTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/CastSplitCardsFromOtherZonesTest.java
@@ -48,7 +48,7 @@ public class CastSplitCardsFromOtherZonesTest extends CardTestPlayerBase {
     @Test
     public void testCastTearFromOpponentsHand() {
         addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5);
-        // When Mindclaw Shaman enters the battlefield, target opponent reveals his or her hand.
+        // When Mindclaw Shaman enters the battlefield, target opponent reveals their hand.
         // You may cast an instant or sorcery card from it without paying its mana cost.
         addCard(Zone.HAND, playerA, "Mindclaw Shaman"); // Creature {4}{R}
 
@@ -74,7 +74,7 @@ public class CastSplitCardsFromOtherZonesTest extends CardTestPlayerBase {
     @Test
     public void testCastFearFromOpponentsHand() {
         addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5);
-        // When Mindclaw Shaman enters the battlefield, target opponent reveals his or her hand.
+        // When Mindclaw Shaman enters the battlefield, target opponent reveals their hand.
         // You may cast an instant or sorcery card from it without paying its mana cost.
         addCard(Zone.HAND, playerA, "Mindclaw Shaman"); // Creature {4}{R}
 
@@ -100,7 +100,7 @@ public class CastSplitCardsFromOtherZonesTest extends CardTestPlayerBase {
     @Test
     public void testCastFusedFromOpponentsHand() {
         addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5);
-        // When Mindclaw Shaman enters the battlefield, target opponent reveals his or her hand.
+        // When Mindclaw Shaman enters the battlefield, target opponent reveals their hand.
         // You may cast an instant or sorcery card from it without paying its mana cost.
         addCard(Zone.HAND, playerA, "Mindclaw Shaman"); // Creature {4}{R}
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/SplitCardCmcTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/SplitCardCmcTest.java
index 0d18400e618..8e09ec0f02e 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/SplitCardCmcTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/cost/splitcards/SplitCardCmcTest.java
@@ -29,7 +29,7 @@ public class SplitCardCmcTest extends CardTestPlayerBase {
         // Total CMC of Failure // Comply is 3, so should be exiled by Transgress the Mind.
         addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2);
         // Devoid
-        // Target player reveals his or her hand. You may choose a card from it with converted mana cost 3 or greater and exile that card.
+        // Target player reveals their hand. You may choose a card from it with converted mana cost 3 or greater and exile that card.
         addCard(Zone.HAND, playerA, "Transgress the Mind");
         addCard(Zone.HAND, playerB, "Failure // Comply");
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/dynamicvalue/SewerNemesisTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/dynamicvalue/SewerNemesisTest.java
index 2cb494bf6ff..a1c34b50a1c 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/dynamicvalue/SewerNemesisTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/dynamicvalue/SewerNemesisTest.java
@@ -50,7 +50,7 @@ public class SewerNemesisTest extends CardTestPlayerBase {
 
         // As Sewer Nemesis enters the battlefield, choose a player.
         // Sewer Nemesis's power and toughness are each equal to the number of cards in the chosen player's graveyard.
-        // Whenever the chosen player casts a spell, that player puts the top card of his or her library into his or her graveyard.
+        // Whenever the chosen player casts a spell, that player puts the top card of their library into their graveyard.
         addCard(Zone.HAND, playerA, "Sewer Nemesis");
 
         addCard(Zone.GRAVEYARD, playerA, "Raging Goblin",4);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/AuraTargetRemovedTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/AuraTargetRemovedTest.java
index f8c4c0715e2..d9105aa54c7 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/AuraTargetRemovedTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/AuraTargetRemovedTest.java
@@ -37,7 +37,7 @@ public class AuraTargetRemovedTest extends CardTestPlayerBase {
         addCard(Zone.HAND, playerA, "Spreading Seas", 1); //Enchantment {1}{U}
 
         // {T}: Add {C} to your mana pool.
-        // {2}, {T}, Sacrifice Field of Ruin: Destroy target nonbasic land an opponent controls. Each player searches his or her library for a basic land card, puts it onto the battlefield, then shuffles his or her library.
+        // {2}, {T}, Sacrifice Field of Ruin: Destroy target nonbasic land an opponent controls. Each player searches their library for a basic land card, puts it onto the battlefield, then shuffles their library.
         addCard(Zone.BATTLEFIELD, playerB, "Field of Ruin", 1); //
         addCard(Zone.BATTLEFIELD, playerB, "Island", 2);
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/OathOfLiegesTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/OathOfLiegesTest.java
index 5c4d4b25dd7..9d3247555f9 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/OathOfLiegesTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/OathOfLiegesTest.java
@@ -41,8 +41,8 @@ public class OathOfLiegesTest extends CardTestPlayerBase {
     @Test
     public void testSearchLandOwner() {
         addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
-        // At the beginning of each player's upkeep, that player chooses target player who controls more lands than he or she does and is his or her opponent.
-        // The first player may search his or her library for a basic land card, put that card onto the battlefield, then shuffle his or her library.
+        // At the beginning of each player's upkeep, that player chooses target player who controls more lands than he or she does and is their opponent.
+        // The first player may search their library for a basic land card, put that card onto the battlefield, then shuffle their library.
         addCard(Zone.HAND, playerA, "Oath of Lieges", 1); // {1}{W}
         addCard(Zone.LIBRARY, playerA, "Plains", 1);
 
@@ -63,8 +63,8 @@ public class OathOfLiegesTest extends CardTestPlayerBase {
     @Test
     public void testSearchLandOpponent() {
         addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
-        // At the beginning of each player's upkeep, that player chooses target player who controls more lands than he or she does and is his or her opponent.
-        // The first player may search his or her library for a basic land card, put that card onto the battlefield, then shuffle his or her library.
+        // At the beginning of each player's upkeep, that player chooses target player who controls more lands than he or she does and is their opponent.
+        // The first player may search their library for a basic land card, put that card onto the battlefield, then shuffle their library.
         addCard(Zone.HAND, playerA, "Oath of Lieges", 1); // {1}{W}
 
         addCard(Zone.BATTLEFIELD, playerB, "Plains", 1);
@@ -85,8 +85,8 @@ public class OathOfLiegesTest extends CardTestPlayerBase {
     @Test
     public void testSearchLandOwnerCopy() {
         addCard(Zone.BATTLEFIELD, playerA, "Plains", 2);
-        // At the beginning of each player's upkeep, that player chooses target player who controls more lands than he or she does and is his or her opponent.
-        // The first player may search his or her library for a basic land card, put that card onto the battlefield, then shuffle his or her library.
+        // At the beginning of each player's upkeep, that player chooses target player who controls more lands than he or she does and is their opponent.
+        // The first player may search their library for a basic land card, put that card onto the battlefield, then shuffle their library.
         addCard(Zone.HAND, playerA, "Oath of Lieges", 1); // {1}{W}
         addCard(Zone.LIBRARY, playerA, "Plains", 3);
         addCard(Zone.HAND, playerA, "Plains", 1);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/SagesReverieTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/SagesReverieTest.java
index 5c5eaee7032..45a349bee88 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/SagesReverieTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/enchantments/SagesReverieTest.java
@@ -44,7 +44,7 @@ public class SagesReverieTest extends CardTestPlayerBase {
      21:11: mbvash casts Crackling Doom [b78]
      21:11: MarioPineda loses 2 life
      21:11: MarioPineda sacrificed face down creature
-     21:11: mbvash puts Crackling Doom [b78] from stack into his or her graveyard
+     21:11: mbvash puts Crackling Doom [b78] from stack into their graveyard
      21:11: Cloudform [9cd] is put into graveyard from battlefield
      21:11: Sage's Reverie [26d] is put into graveyard from battlefield
      21:11: MarioPineda draws two cards
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/EmptyOnlyOnTurnsEndManaTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/EmptyOnlyOnTurnsEndManaTest.java
index 67b8b7a9339..9ab2021b2e9 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/EmptyOnlyOnTurnsEndManaTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/EmptyOnlyOnTurnsEndManaTest.java
@@ -41,7 +41,7 @@ public class EmptyOnlyOnTurnsEndManaTest extends CardTestPlayerBase {
 
     @Test
     public void testDaxosOfMeletis() {
-        // At the beginning of each player's upkeep, that player adds {G}{G}{G} to his or her mana pool. Until end of turn, this mana doesn't empty from that player's mana pool as steps and phases end.
+        // At the beginning of each player's upkeep, that player adds {G}{G}{G} to their mana pool. Until end of turn, this mana doesn't empty from that player's mana pool as steps and phases end.
         addCard(Zone.BATTLEFIELD, playerA, "Shizuko, Caller of Autumn", 1);
         addCard(Zone.HAND, playerA, "Birds of Paradise", 1);
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/mana/ManaFlareTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/mana/ManaFlareTest.java
index c06bd6ce1b7..203eda4664d 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/mana/ManaFlareTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/mana/ManaFlareTest.java
@@ -41,7 +41,7 @@ public class ManaFlareTest extends CardTestPlayerBase {
 
     @Test
     public void testIsland() {
-        // Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
+        // Whenever a player taps a land for mana, that player adds one mana to their mana pool of any type that land produced.
         addCard(Zone.BATTLEFIELD, playerA, "Mana Flare", 1);
         addCard(Zone.BATTLEFIELD, playerA, "Island", 1);
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/JaceTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/JaceTest.java
index e9d1ce042c0..b5c0f2fbf71 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/JaceTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/planeswalker/JaceTest.java
@@ -43,7 +43,7 @@ public class JaceTest extends CardTestPlayerBase {
     public void TelepathUnboundSecondAbility() {
         // +1: Up to one target creature gets -2/-0 until your next turn.
         // -3: You may cast target instant or sorcery card from your graveyard this turn. If that card would be put into your graveyard this turn, exile it instead.
-        // -9: You get an emblem with "Whenever you cast a spell, target opponent puts the top five cards of his or her library into his or her graveyard".
+        // -9: You get an emblem with "Whenever you cast a spell, target opponent puts the top five cards of their library into their graveyard".
         addCard(Zone.BATTLEFIELD, playerA, "Jace, Telepath Unbound"); // starts with 7 Loyality counters
 
         // As an additional cost to cast Magmatic Insight, discard a land card.
@@ -143,7 +143,7 @@ public class JaceTest extends CardTestPlayerBase {
     public void testJaceUnravelerOfSecretsEmblem() {
         // +1: Scry 1, then draw a card.
         // -2: Return target creature to its owner's hand.
-        // -8: You get an emblem with "Whenever an opponent casts his or her first spell each turn, counter that spell."
+        // -8: You get an emblem with "Whenever an opponent casts their first spell each turn, counter that spell."
         addCard(Zone.BATTLEFIELD, playerA, "Jace, Unraveler of Secrets", 1); // starts with 5 Loyality counters
         addCounters(1, PhaseStep.UPKEEP, playerA, "Jace, Unraveler of Secrets", CounterType.LOYALTY, 5);
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/protection/ProtectionTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/protection/ProtectionTest.java
index 2c8b82fc710..aea0d355b8b 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/protection/ProtectionTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/protection/ProtectionTest.java
@@ -48,7 +48,7 @@ public class ProtectionTest extends CardTestPlayerBase {
         // Emrakul, the Aeons Torn can't be countered.
         // When you cast Emrakul, take an extra turn after this one.
         // Flying, protection from colored spells, annihilator 6
-        // When Emrakul is put into a graveyard from anywhere, its owner shuffles his or her graveyard into his or her library.
+        // When Emrakul is put into a graveyard from anywhere, its owner shuffles their graveyard into their library.
         addCard(Zone.BATTLEFIELD, playerB, "Emrakul, the Aeons Torn");
 
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Murderous Cut", "Emrakul, the Aeons Torn");
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DrawEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DrawEffectsTest.java
index 90d6463d701..9383cd86742 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DrawEffectsTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/DrawEffectsTest.java
@@ -66,7 +66,7 @@ public class DrawEffectsTest extends CardTestPlayerBase {
     public void testNotionThief() {
         addCard(Zone.BATTLEFIELD, playerA, "Island", 6);
         // Flash
-        // If an opponent would draw a card except the first one he or she draws in each of his or her draw steps, instead that player skips that draw and you draw a card.
+        // If an opponent would draw a card except the first one he or she draws in each of their draw steps, instead that player skips that draw and you draw a card.
         addCard(Zone.BATTLEFIELD, playerA, "Notion Thief", 1);
 
         // Target player draws four cards.
@@ -92,9 +92,9 @@ public class DrawEffectsTest extends CardTestPlayerBase {
         skipInitShuffling();
         addCard(Zone.BATTLEFIELD, playerA, "Mountain", 5);
         // Flash
-        // If an opponent would draw a card except the first one he or she draws in each of his or her draw steps, instead that player skips that draw and you draw a card.
+        // If an opponent would draw a card except the first one he or she draws in each of their draw steps, instead that player skips that draw and you draw a card.
         addCard(Zone.BATTLEFIELD, playerA, "Notion Thief", 1);
-        // Each player discards his or her hand, then draws seven cards.
+        // Each player discards their hand, then draws seven cards.
         // Miracle {1}{R}
         addCard(Zone.HAND, playerA, "Reforge the Soul", 1);
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/GrindstoneTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/GrindstoneTest.java
index 56e6ce1d86c..51f717b22c0 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/GrindstoneTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/GrindstoneTest.java
@@ -49,7 +49,7 @@ public class GrindstoneTest extends CardTestPlayerBase {
         // As Painter's Servant enters the battlefield, choose a color.
         // All cards that aren't on the battlefield, spells, and permanents are the chosen color in addition to their other colors.
         addCard(Zone.HAND, playerA, "Painter's Servant");
-        // {3}, {T}: Target player puts the top two cards of his or her library into his or her graveyard. If both cards share a color, repeat this process.
+        // {3}, {T}: Target player puts the top two cards of their library into their graveyard. If both cards share a color, repeat this process.
         addCard(Zone.BATTLEFIELD, playerA, "Grindstone");
 
         // Protection from everything
@@ -60,7 +60,7 @@ public class GrindstoneTest extends CardTestPlayerBase {
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Painter's Servant");
         setChoice(playerA, "Blue");
 
-        activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{3}, {T}: Target player puts the top two cards of his or her library into his or her graveyard. If both cards share a color, repeat this process.");
+        activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{3}, {T}: Target player puts the top two cards of their library into their graveyard. If both cards share a color, repeat this process.");
         addTarget(playerA, playerB);
 
         setStopAt(1, PhaseStep.END_TURN);
@@ -80,7 +80,7 @@ public class GrindstoneTest extends CardTestPlayerBase {
         // As Painter's Servant enters the battlefield, choose a color.
         // All cards that aren't on the battlefield, spells, and permanents are the chosen color in addition to their other colors.
         addCard(Zone.HAND, playerA, "Painter's Servant");
-        // {3}, {T}: Target player puts the top two cards of his or her library into his or her graveyard. If both cards share a color, repeat this process.
+        // {3}, {T}: Target player puts the top two cards of their library into their graveyard. If both cards share a color, repeat this process.
         addCard(Zone.BATTLEFIELD, playerA, "Grindstone");
 
         // Protection from everything
@@ -91,7 +91,7 @@ public class GrindstoneTest extends CardTestPlayerBase {
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Painter's Servant");
         setChoice(playerA, "Blue");
 
-        activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{3}, {T}: Target player puts the top two cards of his or her library into his or her graveyard. If both cards share a color, repeat this process.");
+        activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{3}, {T}: Target player puts the top two cards of their library into their graveyard. If both cards share a color, repeat this process.");
         addTarget(playerA, playerB);
 
         setStopAt(1, PhaseStep.END_TURN);
@@ -111,20 +111,20 @@ public class GrindstoneTest extends CardTestPlayerBase {
         // As Painter's Servant enters the battlefield, choose a color.
         // All cards that aren't on the battlefield, spells, and permanents are the chosen color in addition to their other colors.
         addCard(Zone.HAND, playerA, "Painter's Servant");
-        // {3}, {T}: Target player puts the top two cards of his or her library into his or her graveyard. If both cards share a color, repeat this process.
+        // {3}, {T}: Target player puts the top two cards of their library into their graveyard. If both cards share a color, repeat this process.
         addCard(Zone.BATTLEFIELD, playerA, "Grindstone");
 
         // When you cast Ulamog, the Infinite Gyre, destroy target permanent.
         // Annihilator 4 (Whenever this creature attacks, defending player sacrifices four permanents.)
         // Ulamog is indestructible.
-        // When Ulamog is put into a graveyard from anywhere, its owner shuffles his or her graveyard into his or her library.
+        // When Ulamog is put into a graveyard from anywhere, its owner shuffles their graveyard into their library.
         addCard(Zone.LIBRARY, playerB, "Ulamog, the Infinite Gyre", 2);
         skipInitShuffling();
 
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Painter's Servant");
         setChoice(playerA, "Blue");
 
-        activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{3}, {T}: Target player puts the top two cards of his or her library into his or her graveyard. If both cards share a color, repeat this process.");
+        activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{3}, {T}: Target player puts the top two cards of their library into their graveyard. If both cards share a color, repeat this process.");
         addTarget(playerA, playerB);
 
         setStopAt(1, PhaseStep.END_TURN);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/LeylineOfTheVoidTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/LeylineOfTheVoidTest.java
index 52168da7c82..22e93b3edd5 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/LeylineOfTheVoidTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/LeylineOfTheVoidTest.java
@@ -56,7 +56,7 @@ public class LeylineOfTheVoidTest extends CardTestPlayerBase {
         // If a card would be put into an opponent's graveyard from anywhere, exile it instead.
         addCard(Zone.BATTLEFIELD, playerA, "Leyline of the Void");
 
-        // {X}, {T}: Target opponent puts cards from the top of his or her library into his or her graveyard until a creature card or X cards are put into that graveyard this way, whichever comes first. If a creature card is put into that graveyard this way, sacrifice Helm of Obedience and put that card onto the battlefield under your control. X can't be 0.
+        // {X}, {T}: Target opponent puts cards from the top of their library into their graveyard until a creature card or X cards are put into that graveyard this way, whichever comes first. If a creature card is put into that graveyard this way, sacrifice Helm of Obedience and put that card onto the battlefield under your control. X can't be 0.
         addCard(Zone.BATTLEFIELD, playerA, "Helm of Obedience");
 
         activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{X}, {T}: Target opponent puts cards", playerB);
@@ -83,8 +83,8 @@ public class LeylineOfTheVoidTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Leyline of the Void");
 
         // Exile Ill-Gotten Gains.
-        // Each player discards his or her hand,
-        // then returns up to three cards from his or her graveyard to his or her hand.
+        // Each player discards their hand,
+        // then returns up to three cards from their graveyard to their hand.
         addCard(Zone.HAND, playerA, "Ill-Gotten Gains"); // Sorcery - {2}{B}{B}
         addCard(Zone.HAND, playerA, "Silvercoat Lion", 4);
         addCard(Zone.HAND, playerB, "Silvercoat Lion", 4);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/SigardaHostOfHeronsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/SigardaHostOfHeronsTest.java
index 13c45dc7d4f..b2413001f8f 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/SigardaHostOfHeronsTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/SigardaHostOfHeronsTest.java
@@ -22,7 +22,7 @@ public class SigardaHostOfHeronsTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Sigarda, Host of Herons");
         // {T}, Tap two untapped Humans you control: Exile target artifact or enchantment.
         addCard(Zone.BATTLEFIELD, playerA, "Devout Chaplain");
-        // {2}{B}, Sacrifice a creature: Target opponent reveals his or her hand. You choose a card from it. That player discards that card. Activate this ability only any time you could cast a sorcery.
+        // {2}{B}, Sacrifice a creature: Target opponent reveals their hand. You choose a card from it. That player discards that card. Activate this ability only any time you could cast a sorcery.
         addCard(Zone.BATTLEFIELD, playerA, "Corpse Traders");
         // Target player sacrifices a creature.
         addCard(Zone.HAND, playerA, "Diabolic Edict");
@@ -94,7 +94,7 @@ public class SigardaHostOfHeronsTest extends CardTestPlayerBase {
         addCard(Zone.GRAVEYARD, playerB, "Merciless Executioner");
         
         // Tempting offer — Return a creature card from your graveyard to the battlefield. 
-        // Each opponent may return a creature card from his or her graveyard to the battlefield. 
+        // Each opponent may return a creature card from their graveyard to the battlefield.
         // For each player who does, return a creature card from your graveyard to the battlefield.
         addCard(Zone.HAND, playerB, "Tempt with Immortality"); // sorcery {4}{B}
         
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ZoneChangeReplacementTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ZoneChangeReplacementTest.java
index 6680c849773..5593c845ac4 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ZoneChangeReplacementTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/replacement/ZoneChangeReplacementTest.java
@@ -46,7 +46,7 @@ public class ZoneChangeReplacementTest extends CardTestPlayerBase {
     public void testFromLibraryZoneChange() {
         addCard(Zone.LIBRARY, playerA, "Darksteel Colossus");
         // Tome Scour - Sorcery - {U}
-        // Target player puts the top five cards of his or her library into his or her graveyard.
+        // Target player puts the top five cards of their library into their graveyard.
         addCard(Zone.HAND, playerA, "Tome Scour");
         addCard(Zone.BATTLEFIELD, playerA, "Island", 1);
         skipInitShuffling();
@@ -65,7 +65,7 @@ public class ZoneChangeReplacementTest extends CardTestPlayerBase {
     public void testFromHandZoneChange() {
         addCard(Zone.HAND, playerA, "Progenitus");
         // Distress - Sorcery - {B}{B}
-        // Target player reveals his or her hand. You choose a nonland card from it. That player discards that card.
+        // Target player reveals their hand. You choose a nonland card from it. That player discards that card.
         addCard(Zone.HAND, playerA, "Distress");
         addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2);
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantCastTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantCastTest.java
index 3f875d6fa98..fe165b4c656 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantCastTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/rules/CantCastTest.java
@@ -243,7 +243,7 @@ public class CantCastTest extends CardTestPlayerBase {
     @Test
     public void testAlhammarret() {
         // Flying
-        // As Alhammarret, High Arbiter enters the battlefield, each opponent reveals his or her hand. You choose the name of a nonland card revealed this way.
+        // As Alhammarret, High Arbiter enters the battlefield, each opponent reveals their hand. You choose the name of a nonland card revealed this way.
         // Your opponents can't cast spells with the chosen name.
         addCard(Zone.HAND, playerA, "Alhammarret, High Arbiter", 4); // Creature - {5}{U}{U}
         addCard(Zone.BATTLEFIELD, playerA, "Island", 7);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/DivergentTransformationsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/DivergentTransformationsTest.java
index 772923a1b6c..574e5c52ea2 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/single/DivergentTransformationsTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/DivergentTransformationsTest.java
@@ -22,8 +22,8 @@ public class DivergentTransformationsTest extends CardTestPlayerBase {
         Divergent Transformations {6}{R}
          Instant
         Undaunted (This spell costs 1 less to cast for each opponent.)
-        Exile two target creatures. For each of those creatures, its controller reveals cards from the top of his or her library until he or she reveals a creature card, 
-                puts that card onto the battlefield, then shuffles the rest into his or her library.
+        Exile two target creatures. For each of those creatures, its controller reveals cards from the top of their library until he or she reveals a creature card,
+                puts that card onto the battlefield, then shuffles the rest into their library.
         */
         String dTransformations = "Divergent Transformations";        
         String memnite = "Memnite"; // {0} 1/1
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/FiendOfTheShadowsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/FiendOfTheShadowsTest.java
index 78cd96a002b..9c5b8ca20e4 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/single/FiendOfTheShadowsTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/FiendOfTheShadowsTest.java
@@ -17,7 +17,7 @@ public class FiendOfTheShadowsTest extends CardTestPlayerBase {
     @Test
     public void testCard() {
         addCard(Zone.BATTLEFIELD, playerA, "White Knight");
-        // Whenever Fiend of the Shadows deals combat damage to a player, that player exiles a card from his or her hand. You may play that card for as long as it remains exiled.
+        // Whenever Fiend of the Shadows deals combat damage to a player, that player exiles a card from their hand. You may play that card for as long as it remains exiled.
         // Sacrifice a Human: Regenerate Fiend of the Shadows.
         addCard(Zone.BATTLEFIELD, playerA, "Fiend of the Shadows");
         addCard(Zone.BATTLEFIELD, playerB, "Mountain");
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/GrafdiggersCageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/GrafdiggersCageTest.java
index e30fda6c788..1f9a01bb50e 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/single/GrafdiggersCageTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/GrafdiggersCageTest.java
@@ -65,7 +65,7 @@ public class GrafdiggersCageTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Grafdigger's Cage");
         addCard(Zone.BATTLEFIELD, playerA, "Silvercoat Lion", 2);
         
-        // Name a nonland card. Target player reveals his or her hand and discards all cards with that name.
+        // Name a nonland card. Target player reveals their hand and discards all cards with that name.
         // Flashback-Sacrifice a creature. (You may cast this card from your graveyard for its flashback cost. Then exile it.)       
         addCard(Zone.GRAVEYARD, playerA, "Cabal Therapy");
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/IncreasingCardsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/IncreasingCardsTest.java
index fdb0c57829b..cd75d177c94 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/single/IncreasingCardsTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/IncreasingCardsTest.java
@@ -45,9 +45,9 @@ public class IncreasingCardsTest extends CardTestPlayerBase {
     }
     // Increasing Confusion {X}{U}
     // Sorcery
-    // Target player puts the top X cards of his or her library into his or her graveyard.
+    // Target player puts the top X cards of their library into their graveyard.
     // If Increasing Confusion was cast from a graveyard, that player puts twice that many
-    // cards into his or her graveyard instead.
+    // cards into their graveyard instead.
     @Test
     public void testIncreasingConfusion() {
         addCard(Zone.BATTLEFIELD, playerA, "Island", 4);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/JacesMindseekerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/JacesMindseekerTest.java
index 582bd52d956..9ec93273095 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/single/JacesMindseekerTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/JacesMindseekerTest.java
@@ -50,7 +50,7 @@ public class JacesMindseekerTest extends CardTestPlayerBase {
     public void testJacesMindseeker() {
         addCard(Zone.BATTLEFIELD, playerA, "Island", 6);
         // Flying
-        // When Jace's Mindseeker enters the battlefield, target opponent puts the top five cards of his or her library into his or her graveyard.
+        // When Jace's Mindseeker enters the battlefield, target opponent puts the top five cards of their library into their graveyard.
         // You may cast an instant or sorcery card from among them without paying its mana cost.
         addCard(Zone.HAND, playerA, "Jace's Mindseeker", 1); // Creature 4/4 {4}{U}{U}
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/NephaliaAcademyTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/NephaliaAcademyTest.java
index e76964054b8..3f321cd93f6 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/NephaliaAcademyTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/NephaliaAcademyTest.java
@@ -14,7 +14,7 @@ public class NephaliaAcademyTest extends CardTestPlayerBase {
     @Test
     public void testReplacementEffectBySpell() {
         // Sorcery {B}
-        // Target opponent reveals his or her hand. You choose a noncreature, nonland card from it. That player discards that card.
+        // Target opponent reveals their hand. You choose a noncreature, nonland card from it. That player discards that card.
         addCard(Zone.HAND, playerA, "Duress", 1);
         addCard(Zone.BATTLEFIELD, playerA, "Swamp", 1);
         
@@ -39,7 +39,7 @@ public class NephaliaAcademyTest extends CardTestPlayerBase {
     @Test
     public void testDeclineReplacementEffectBySpell() {
         // Sorcery {B}
-        // Target opponent reveals his or her hand. You choose a noncreature, nonland card from it. That player discards that card.
+        // Target opponent reveals their hand. You choose a noncreature, nonland card from it. That player discards that card.
         addCard(Zone.HAND, playerA, "Duress", 1);
         addCard(Zone.BATTLEFIELD, playerA, "Swamp", 1);
         
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/ogw/ThoughtKnotSeerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/ogw/ThoughtKnotSeerTest.java
index fbc4d8fca86..3e516532750 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/single/ogw/ThoughtKnotSeerTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/ogw/ThoughtKnotSeerTest.java
@@ -27,7 +27,7 @@ public class ThoughtKnotSeerTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Island", 2);
 
         // {3}{<>} 4/4
-        // When Thought-Knot Seer enters the battlefield, target opponent reveals his or her hand. You choose a nonland card from it and exile that card.
+        // When Thought-Knot Seer enters the battlefield, target opponent reveals their hand. You choose a nonland card from it and exile that card.
         // When Thought-Knot Seer leaves the battlefield, target opponent draws a card.
         addCard(Zone.BATTLEFIELD, playerB, "Thought-Knot Seer");
         addCard(Zone.BATTLEFIELD, playerB, "Wastes", 4);
@@ -55,7 +55,7 @@ public class ThoughtKnotSeerTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Island", 2);
 
         // {3}{<>} 4/4
-        // When Thought-Knot Seer enters the battlefield, target opponent reveals his or her hand. You choose a nonland card from it and exile that card.
+        // When Thought-Knot Seer enters the battlefield, target opponent reveals their hand. You choose a nonland card from it and exile that card.
         // When Thought-Knot Seer leaves the battlefield, target opponent draws a card.
         addCard(Zone.BATTLEFIELD, playerB, "Thought-Knot Seer");
         addCard(Zone.BATTLEFIELD, playerB, "Wastes", 4);
@@ -82,7 +82,7 @@ public class ThoughtKnotSeerTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2);
 
         // {3}{<>} 4/4
-        // When Thought-Knot Seer enters the battlefield, target opponent reveals his or her hand. You choose a nonland card from it and exile that card.
+        // When Thought-Knot Seer enters the battlefield, target opponent reveals their hand. You choose a nonland card from it and exile that card.
         // When Thought-Knot Seer leaves the battlefield, target opponent draws a card.
         addCard(Zone.BATTLEFIELD, playerB, "Thought-Knot Seer");
         addCard(Zone.BATTLEFIELD, playerB, "Wastes", 4);
@@ -103,12 +103,12 @@ public class ThoughtKnotSeerTest extends CardTestPlayerBase {
     @Test
     public void testThoughtKnotSeerExiled() {
 
-        // {W} Exile target creature. Its controller may search his or her library for a basic land card, put that card onto the battlefield tapped, then shuffle his or her library.
+        // {W} Exile target creature. Its controller may search their library for a basic land card, put that card onto the battlefield tapped, then shuffle their library.
         addCard(Zone.HAND, playerA, "Path to Exile");
         addCard(Zone.BATTLEFIELD, playerA, "Plains", 1);
 
         // {3}{<>} 4/4
-        // When Thought-Knot Seer enters the battlefield, target opponent reveals his or her hand. You choose a nonland card from it and exile that card.
+        // When Thought-Knot Seer enters the battlefield, target opponent reveals their hand. You choose a nonland card from it and exile that card.
         // When Thought-Knot Seer leaves the battlefield, target opponent draws a card.
         addCard(Zone.BATTLEFIELD, playerB, "Thought-Knot Seer");
         addCard(Zone.BATTLEFIELD, playerB, "Wastes", 4);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/rtr/JaceArchitectOfThoughtTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/rtr/JaceArchitectOfThoughtTest.java
index 200a252a0e9..652bfeecf69 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/single/rtr/JaceArchitectOfThoughtTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/rtr/JaceArchitectOfThoughtTest.java
@@ -40,7 +40,7 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
  * opponent separates those cards into two piles. Put one pile into your hand
  * and the other on the bottom of your library in any order. -8: For each
  * player, search that player's library for a nonland card and exile it, then
- * that player shuffles his or her library. You may cast those cards without
+ * that player shuffles their library. You may cast those cards without
  * paying their mana costs.
  *
  * @author LevelX2
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BorosReckonerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BorosReckonerTest.java
index 8b44238ab1c..48ba9d94eed 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BorosReckonerTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/BorosReckonerTest.java
@@ -54,7 +54,7 @@ public class BorosReckonerTest extends CardTestPlayerBase {
      */
     @Test
     public void testDamageAmountLikeDamageDealt() {
-        // When Phytotitan dies, return it to the battlefield tapped under its owner's control at the beginning of his or her next upkeep.
+        // When Phytotitan dies, return it to the battlefield tapped under its owner's control at the beginning of their next upkeep.
         addCard(Zone.BATTLEFIELD, playerA, "Phytotitan");
         addCard(Zone.BATTLEFIELD, playerB, "Boros Reckoner");
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DrawTriggeredTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DrawTriggeredTest.java
index 6e20fc055a0..dfd3b4be595 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DrawTriggeredTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/DrawTriggeredTest.java
@@ -49,7 +49,7 @@ public class DrawTriggeredTest extends CardTestPlayerBase {
      */
     @Test
     public void DaysUndoingTriggeredDrewEventAreRemovedTest() {
-        // Each player shuffles his or her hand and graveyard into his or her library, then draws seven cards. If it's your turn, end the turn.
+        // Each player shuffles their hand and graveyard into their library, then draws seven cards. If it's your turn, end the turn.
         addCard(Zone.HAND, playerA, "Day's Undoing");
         addCard(Zone.BATTLEFIELD, playerA, "Island", 3);
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/HeartbeatOfSpringTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/HeartbeatOfSpringTest.java
index 23a6f5fc1b5..f3da97d7a70 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/HeartbeatOfSpringTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/HeartbeatOfSpringTest.java
@@ -46,7 +46,7 @@ public class HeartbeatOfSpringTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Forest", 3);
         // {T}: Add {C} to your mana pool. If you control an Urza's Power-Plant and an Urza's Tower, add {C}{C} to your mana pool instead.
         addCard(Zone.HAND, playerA, "Urza's Mine", 1);
-        // Whenever a player taps a land for mana, that player adds one mana to his or her mana pool of any type that land produced.
+        // Whenever a player taps a land for mana, that player adds one mana to their mana pool of any type that land produced.
         addCard(Zone.HAND, playerA, "Heartbeat of Spring"); // {2}{G}
         // Whenever a player casts a white spell, you may gain 1 life.
         addCard(Zone.HAND, playerA, "Angel's Feather"); // {2}
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/PossibilityStormTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/PossibilityStormTest.java
index 69403791c3a..eabfd4e0ce5 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/PossibilityStormTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/PossibilityStormTest.java
@@ -55,10 +55,10 @@ public class PossibilityStormTest extends CardTestPlayerBase {
     @Test
     public void TestWithZoeticCavern() {
         addCard(Zone.BATTLEFIELD, playerA, "Swamp", 3);
-        // Whenever a player casts a spell from his or her hand, that player exiles it, then exiles cards from
-        // the top of his or her library until he or she exiles a card that shares a card type with it. That
+        // Whenever a player casts a spell from their hand, that player exiles it, then exiles cards from
+        // the top of their library until he or she exiles a card that shares a card type with it. That
         // player may cast that card without paying its mana cost. Then he or she puts all cards exiled with
-        // Possibility Storm on the bottom of his or her library in a random order.
+        // Possibility Storm on the bottom of their library in a random order.
         addCard(Zone.BATTLEFIELD, playerA, "Possibility Storm", 1);
 
         // {T}: Add {C} to your mana pool.
@@ -99,10 +99,10 @@ public class PossibilityStormTest extends CardTestPlayerBase {
     public void TestWithCrypticCommand() {
         addCard(Zone.BATTLEFIELD, playerA, "Island", 3);
         addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
-        // Whenever a player casts a spell from his or her hand, that player exiles it, then exiles cards from
-        // the top of his or her library until he or she exiles a card that shares a card type with it. That
+        // Whenever a player casts a spell from their hand, that player exiles it, then exiles cards from
+        // the top of their library until he or she exiles a card that shares a card type with it. That
         // player may cast that card without paying its mana cost. Then he or she puts all cards exiled with
-        // Possibility Storm on the bottom of his or her library in a random order.
+        // Possibility Storm on the bottom of their library in a random order.
         addCard(Zone.BATTLEFIELD, playerA, "Possibility Storm", 1);
 
         // Choose one — Counter target noncreature spell unless its controller pays {2};
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToBattlefieldEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToBattlefieldEffectsTest.java
index f465183f84e..6d9ba3066fa 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToBattlefieldEffectsTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToBattlefieldEffectsTest.java
@@ -97,7 +97,7 @@ public class ReturnToBattlefieldEffectsTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerB, "Mountain", 1);
         addCard(Zone.HAND, playerB, "Lightning Bolt", 1);
 
-        // {T}: Target player exiles a card from his or her graveyard.
+        // {T}: Target player exiles a card from their graveyard.
         // {1}, Exile Relic of Progenitus: Exile all cards from all graveyards. Draw a card.
         addCard(Zone.BATTLEFIELD, playerB, "Relic of Progenitus", 1);
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java
index b2548eb569d..15e861c812d 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ReturnToHandEffectsTest.java
@@ -53,7 +53,7 @@ public class ReturnToHandEffectsTest extends CardTestPlayerBase {
         // Whenever a creature is put into your graveyard from the battlefield, return it to your hand.
         addCard(Zone.BATTLEFIELD, playerA, "Enduring Renewal");
 
-        // {T}, Sacrifice an artifact: Target player puts the top three cards of his or her library into his or her graveyard.
+        // {T}, Sacrifice an artifact: Target player puts the top three cards of their library into their graveyard.
         // Whenever an artifact enters the battlefield, you may untap Grinding Station.
         addCard(Zone.BATTLEFIELD, playerA, "Grinding Station", 1);
         addCard(Zone.BATTLEFIELD, playerA, "Ornithopter", 1);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SacredGroundTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SacredGroundTest.java
index 0ac639ffa43..68c158a1f40 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SacredGroundTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/SacredGroundTest.java
@@ -156,7 +156,7 @@ public class SacredGroundTest extends CardTestPlayerBase {
         addCard(Zone.HAND, playerA, "Molten Rain");// Instant {1}{R}{R}
         // Choose target card in a graveyard other than a basic land card. Search its owner's graveyard,
         // hand, and library for any number of cards with the same name as that card and exile them.
-        // Then that player shuffles his or her library.
+        // Then that player shuffles their library.
         addCard(Zone.HAND, playerA, "Surgical Extraction"); // Instant {B/P}
 
         addCard(Zone.BATTLEFIELD, playerB, "Caves of Koilos", 1);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ShuffleTriggeredTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ShuffleTriggeredTest.java
index 69bc2dbfae1..978df2ba6da 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ShuffleTriggeredTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ShuffleTriggeredTest.java
@@ -42,7 +42,7 @@ public class ShuffleTriggeredTest extends CardTestPlayerBase {
     public void testWidespreadPanicDoesTrigger() {
         addCard(Zone.BATTLEFIELD, playerA, "Forest", 5);
         addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
-        // Whenever a spell or ability causes its controller to shuffle his or her library, that player puts a card from his or her hand on top of his or her library.
+        // Whenever a spell or ability causes its controller to shuffle their library, that player puts a card from their hand on top of their library.
         addCard(Zone.HAND, playerA, "Widespread Panic", 1); // Enchantment {2}{R}
         // Search your library for a basic land card and put that card onto the battlefield. Then shuffle your library.
         addCard(Zone.HAND, playerA, "Untamed Wilds"); // Sorcery - {2}{G}
@@ -72,10 +72,10 @@ public class ShuffleTriggeredTest extends CardTestPlayerBase {
     public void testWidespreadPanicDoesNotTriggerIfOpponentShufflesPlayersLibrary() {
         addCard(Zone.BATTLEFIELD, playerA, "Island", 9);
         addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
-        // Whenever a spell or ability causes its controller to shuffle his or her library, that player puts a card from his or her hand on top of his or her library.
+        // Whenever a spell or ability causes its controller to shuffle their library, that player puts a card from their hand on top of their library.
         addCard(Zone.HAND, playerA, "Widespread Panic", 1); // Enchantment {2}{R}
         // Prowl {3}{U}
-        // Search target opponent's library for an instant or sorcery card. You may cast that card without paying its mana cost. Then that player shuffles his or her library.
+        // Search target opponent's library for an instant or sorcery card. You may cast that card without paying its mana cost. Then that player shuffles their library.
         addCard(Zone.HAND, playerA, "Knowledge Exploitation"); // Sorcery - {5}{U}{U}
 
         addCard(Zone.HAND, playerB, "Silvercoat Lion");
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/StormCauldronTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/StormCauldronTest.java
index 33a8ed90f7b..e91f86882f9 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/StormCauldronTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/StormCauldronTest.java
@@ -35,7 +35,7 @@ public class StormCauldronTest extends CardTestPlayerBase {
         // {T}, Sacrifice Crystal Vein: Add {C}{C} to your mana pool.
         addCard(Zone.BATTLEFIELD, playerA, "Crystal Vein", 1);
 
-        // Each player may play an additional land during each of his or her turns.
+        // Each player may play an additional land during each of their turns.
         // Whenever a land is tapped for mana, return it to its owner's hand.
         addCard(Zone.BATTLEFIELD, playerB, "Storm Cauldron", 1);
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/UlamogTheInfiniteGyreTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/UlamogTheInfiniteGyreTest.java
index 163e82e171b..b15b9423ee6 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/UlamogTheInfiniteGyreTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/UlamogTheInfiniteGyreTest.java
@@ -73,7 +73,7 @@ public class UlamogTheInfiniteGyreTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Swamp", 15);
         // When you cast Kozilek, Butcher of Truth, draw four cards.
         // Annihilator 4 (Whenever this creature attacks, defending player sacrifices four permanents.)
-        // When Kozilek is put into a graveyard from anywhere, its owner shuffles his or her graveyard into his or her library.
+        // When Kozilek is put into a graveyard from anywhere, its owner shuffles their graveyard into their library.
         addCard(Zone.HAND, playerA, "Kozilek, Butcher of Truth"); // {10}
         // Destroy target creature.
         // Spell mastery - If there are two or more instant and/or sorcery cards in your graveyard, you gain 2 life.
@@ -122,7 +122,7 @@ public class UlamogTheInfiniteGyreTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Island", 5);
         // When you cast Kozilek, Butcher of Truth, draw four cards.
         // Annihilator 4 (Whenever this creature attacks, defending player sacrifices four permanents.)
-        // When Kozilek is put into a graveyard from anywhere, its owner shuffles his or her graveyard into his or her library.
+        // When Kozilek is put into a graveyard from anywhere, its owner shuffles their graveyard into their library.
         addCard(Zone.BATTLEFIELD, playerA, "Kozilek, Butcher of Truth"); // {10}
         // As Ixidron enters the battlefield, turn all other nontoken creatures face down.
         // Ixidron's power and toughness are each equal to the number of face-down creatures on the battlefield.
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BrainMaggotTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BrainMaggotTest.java
index 49b840a07bb..da2e46e2dcb 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BrainMaggotTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/BrainMaggotTest.java
@@ -64,7 +64,7 @@ public class BrainMaggotTest extends CardTestPlayerBase {
     @Test
     public void testCardFromHandWillBeExiledAndReturn() {
         addCard(Zone.BATTLEFIELD, playerA, "Swamp", 2);
-        // When Brain Maggot enters the battlefield, target opponent reveals his or her hand and you choose a nonland card from it. Exile that card until Brain Maggot leaves the battlefield.
+        // When Brain Maggot enters the battlefield, target opponent reveals their hand and you choose a nonland card from it. Exile that card until Brain Maggot leaves the battlefield.
         addCard(Zone.HAND, playerA, "Brain Maggot", 2);
 
         addCard(Zone.HAND, playerB, "Bloodflow Connoisseur", 1);
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/FlagstonesOfTrokairTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/FlagstonesOfTrokairTest.java
index 045bf042f8a..08c0842d8d8 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/FlagstonesOfTrokairTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/FlagstonesOfTrokairTest.java
@@ -54,7 +54,7 @@ public class FlagstonesOfTrokairTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Flagstones of Trokair", 1);
         addCard(Zone.LIBRARY, playerA, "Plains", 5);
         // {T}: Add {C} to your mana pool.
-        // {T}, Sacrifice Ghost Quarter: Destroy target land. Its controller may search his or her library for a basic land card, put it onto the battlefield, then shuffle his or her library.
+        // {T}, Sacrifice Ghost Quarter: Destroy target land. Its controller may search their library for a basic land card, put it onto the battlefield, then shuffle their library.
         addCard(Zone.BATTLEFIELD, playerB, "Ghost Quarter", 1);
 
         castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Spreading Seas", "Flagstones of Trokair");
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/RotcrownGhoulTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/RotcrownGhoulTest.java
index 76bb43b39ec..01180440762 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/RotcrownGhoulTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/RotcrownGhoulTest.java
@@ -9,7 +9,7 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
  *
  * @author noxx
  *
- *   When Rotcrown Ghoul dies, target player puts the top five cards of his or her library into his or her graveyard.
+ *   When Rotcrown Ghoul dies, target player puts the top five cards of their library into their graveyard.
  */
 public class RotcrownGhoulTest extends CardTestPlayerBase {
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SelhoffOccultistTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SelhoffOccultistTest.java
index 4066be98e4d..f0fec784c91 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SelhoffOccultistTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/SelhoffOccultistTest.java
@@ -9,7 +9,7 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
  *
  * @author noxx
  *
- *   Whenever Selhoff Occultist or another creature dies, target player puts the top card of his or her library into his or her graveyard.
+ *   Whenever Selhoff Occultist or another creature dies, target player puts the top card of their library into their graveyard.
  */
 public class SelhoffOccultistTest extends CardTestPlayerBase {
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/TidehollowScullerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/TidehollowScullerTest.java
index 88e32d96c4a..e70814b4749 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/TidehollowScullerTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/dies/TidehollowScullerTest.java
@@ -49,7 +49,7 @@ public class TidehollowScullerTest extends CardTestPlayerBase {
         addCard(Zone.BATTLEFIELD, playerA, "Island", 2);
         addCard(Zone.BATTLEFIELD, playerA, "Plains", 3);
         // Tidehollow Sculler {W}{B}
-        // When Tidehollow Sculler enters the battlefield, target opponent reveals his or her hand and you choose a nonland card from it. Exile that card.
+        // When Tidehollow Sculler enters the battlefield, target opponent reveals their hand and you choose a nonland card from it. Exile that card.
         // When Tidehollow Sculler leaves the battlefield, return the exiled card to its owner's hand.
         addCard(Zone.HAND, playerA, "Tidehollow Sculler", 1);
         // Boomerang {U}{U}
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/TunnelIgnusTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/TunnelIgnusTest.java
index d80e7b1e3fd..2847f49bd94 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/watchers/TunnelIgnusTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/watchers/TunnelIgnusTest.java
@@ -14,7 +14,7 @@ public class TunnelIgnusTest extends CardTestPlayerBase {
      * Tunnel Ignus
      * Creature — Elemental 2/1, 1R (2)
      * Whenever a land enters the battlefield under an opponent's control, if 
-     * that player had another land enter the battlefield under his or her 
+     * that player had another land enter the battlefield under their
      * control this turn, Tunnel Ignus deals 3 damage to that player.
      *
     */
diff --git a/Mage.Tests/src/test/java/org/mage/test/combat/AttackBlockRestrictionsTest.java b/Mage.Tests/src/test/java/org/mage/test/combat/AttackBlockRestrictionsTest.java
index 304530946b3..27015363192 100644
--- a/Mage.Tests/src/test/java/org/mage/test/combat/AttackBlockRestrictionsTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/combat/AttackBlockRestrictionsTest.java
@@ -437,7 +437,7 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase {
     	/* Underworld Cerberus {3}{B}{3} 6/6
     	*  Underworld Cerberus can't be blocked except by three or more creatures.
     	*  Cards in graveyards can't be the targets of spells or abilities.
-    	*  When Underworld Cerberus dies, exile it and each player returns all creature cards from his or her graveyard to his or her hand.
+    	*  When Underworld Cerberus dies, exile it and each player returns all creature cards from their graveyard to their hand.
     	*/
         addCard(Zone.BATTLEFIELD, playerA, "Underworld Cerberus");
         addCard(Zone.BATTLEFIELD, playerB, "Memnite"); // 1/1
@@ -461,7 +461,7 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase {
     	/* Underworld Cerberus {3}{B}{3} 6/6
     	*  Underworld Cerberus can't be blocked except by three or more creatures.
     	*  Cards in graveyards can't be the targets of spells or abilities.
-    	*  When Underworld Cerberus dies, exile it and each player returns all creature cards from his or her graveyard to his or her hand.
+    	*  When Underworld Cerberus dies, exile it and each player returns all creature cards from their graveyard to their hand.
     	*/
         addCard(Zone.BATTLEFIELD, playerA, "Underworld Cerberus");
         addCard(Zone.BATTLEFIELD, playerB, "Memnite", 2); // 1/1
@@ -486,7 +486,7 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase {
     	/* Underworld Cerberus {3}{B}{3} 6/6
     	*  Underworld Cerberus can't be blocked except by three or more creatures.
     	*  Cards in graveyards can't be the targets of spells or abilities.
-    	*  When Underworld Cerberus dies, exile it and each player returns all creature cards from his or her graveyard to his or her hand.
+    	*  When Underworld Cerberus dies, exile it and each player returns all creature cards from their graveyard to their hand.
     	*/
         addCard(Zone.BATTLEFIELD, playerA, "Underworld Cerberus");
         addCard(Zone.BATTLEFIELD, playerB, "Memnite", 3); // 1/1
@@ -515,7 +515,7 @@ public class AttackBlockRestrictionsTest extends CardTestPlayerBase {
     	/* Underworld Cerberus {3}{B}{3} 6/6
     	*  Underworld Cerberus can't be blocked except by three or more creatures.
     	*  Cards in graveyards can't be the targets of spells or abilities.
-    	*  When Underworld Cerberus dies, exile it and each player returns all creature cards from his or her graveyard to his or her hand.
+    	*  When Underworld Cerberus dies, exile it and each player returns all creature cards from their graveyard to their hand.
     	*/
         addCard(Zone.BATTLEFIELD, playerA, "Underworld Cerberus");
         addCard(Zone.BATTLEFIELD, playerB, "Memnite", 10); // 1/1
diff --git a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBRGCommanderTest.java b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBRGCommanderTest.java
index 8883c121236..04a7f43bc0b 100644
--- a/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBRGCommanderTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/commander/duel/CastBRGCommanderTest.java
@@ -79,7 +79,7 @@ public class CastBRGCommanderTest extends CardTestCommanderDuelBase {
      */
     @Test
     public void castCommanderAfterKarnUltimate() {
-        // +4: Target player exiles a card from his or her hand.
+        // +4: Target player exiles a card from their hand.
         // -3: Exile target permanent.
         // -14: Restart the game, leaving in exile all non-Aura permanent cards exiled with Karn Liberated. Then put those cards onto the battlefield under your control.
         addCard(Zone.BATTLEFIELD, playerA, "Karn Liberated", 1);
diff --git a/Mage.Tests/src/test/java/org/mage/test/game/ends/PhageTheUntouchableTest.java b/Mage.Tests/src/test/java/org/mage/test/game/ends/PhageTheUntouchableTest.java
index 933e1334ac4..6623fe173b1 100644
--- a/Mage.Tests/src/test/java/org/mage/test/game/ends/PhageTheUntouchableTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/game/ends/PhageTheUntouchableTest.java
@@ -44,7 +44,7 @@ public class PhageTheUntouchableTest extends CardTestPlayerBase {
     public void TestWithEndlessWhispers() {
         // Each creature has "When this creature dies, choose target opponent.
         // That player puts this card from its owner's graveyard onto the battlefield
-        // under his or her control at the beginning of the next end step."
+        // under their control at the beginning of the next end step."
         addCard(Zone.BATTLEFIELD, playerA, "Endless Whispers");
 
         // Destroy target creature or planeswalker..
diff --git a/Mage.Tests/src/test/java/org/mage/test/multiplayer/BloodchiefAscensionTest.java b/Mage.Tests/src/test/java/org/mage/test/multiplayer/BloodchiefAscensionTest.java
index 1569a8ec8d3..30b3ccf471d 100644
--- a/Mage.Tests/src/test/java/org/mage/test/multiplayer/BloodchiefAscensionTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/multiplayer/BloodchiefAscensionTest.java
@@ -92,7 +92,7 @@ public class BloodchiefAscensionTest extends CardTestMultiPlayerBase {
      * Bloodchief Ascension at my end step. I think he should, even though I had
      * left the game from dying, because of:
      *
-     * 800.4g. If a player leaves the game during his or her turn, that turn
+     * 800.4g. If a player leaves the game during their turn, that turn
      * continues to its completion without an active player. If the active
      * player would receive priority, instead the next player in turn order
      * receives priority, or the top object on the stack resolves, or the phase
@@ -163,7 +163,7 @@ public class BloodchiefAscensionTest extends CardTestMultiPlayerBase {
         addCard(Zone.BATTLEFIELD, playerD, "Bloodchief Ascension");
         addCounters(2, PhaseStep.UPKEEP, playerD, "Bloodchief Ascension", CounterType.QUEST, 3);
         addCard(Zone.BATTLEFIELD, playerD, "Island", 1);
-        // {U}, {T}: Each player discards his or her hand, then draws cards equal to the greatest number of cards a player discarded this way.
+        // {U}, {T}: Each player discards their hand, then draws cards equal to the greatest number of cards a player discarded this way.
         addCard(Zone.BATTLEFIELD, playerD, "Jace's Archivist", 1); // {1}{U}{U}
         addCard(Zone.LIBRARY, playerD, "Demolish");
         addCard(Zone.HAND, playerD, "Demolish", 1);
diff --git a/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRange1Test.java b/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRange1Test.java
index 1ac18334e58..a58da9ac1b3 100644
--- a/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRange1Test.java
+++ b/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRange1Test.java
@@ -167,7 +167,7 @@ public class PlayerLeftGameRange1Test extends CardTestMultiPlayerBase {
     public void TestOtherPlayerPlaneswalkerCreatedEmblem() {
         // +1: Scry 1, then draw a card.
         // -2: Return target creature to its owner's hand.
-        // -8: You get an emblem with "Whenever an opponent casts his or her first spell each turn, counter that spell."
+        // -8: You get an emblem with "Whenever an opponent casts their first spell each turn, counter that spell."
         addCard(Zone.BATTLEFIELD, playerB, "Jace, Unraveler of Secrets");
         addCounters(1, PhaseStep.DRAW, playerB, "Jace, Unraveler of Secrets", CounterType.LOYALTY, 8);
 
@@ -319,8 +319,8 @@ public class PlayerLeftGameRange1Test extends CardTestMultiPlayerBase {
 
         addCard(Zone.BATTLEFIELD, playerD, "Island", 3);
         // {2}{U}, {T}: Put target creature on the bottom of its owner's library. That creature's controller reveals cards from the
-        // top of his or her library until he or she reveals a creature card. The player puts that card onto the battlefield and the
-        // rest on the bottom of his or her library in any order. Activate this ability only any time you could cast a sorcery.
+        // top of their library until he or she reveals a creature card. The player puts that card onto the battlefield and the
+        // rest on the bottom of their library in any order. Activate this ability only any time you could cast a sorcery.
         addCard(Zone.BATTLEFIELD, playerD, "Proteus Staff", 1);
 
         addCard(Zone.BATTLEFIELD, playerD, "Eager Cadet", 1);
diff --git a/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRangeAllTest.java b/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRangeAllTest.java
index 9e349a728e3..3954e058572 100644
--- a/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRangeAllTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/multiplayer/PlayerLeftGameRangeAllTest.java
@@ -166,7 +166,7 @@ public class PlayerLeftGameRangeAllTest extends CardTestMultiPlayerBase {
     public void TestOtherPlayerPlaneswalkerCreatedEmblem() {
         // +1: Scry 1, then draw a card.
         // -2: Return target creature to its owner's hand.
-        // -8: You get an emblem with "Whenever an opponent casts his or her first spell each turn, counter that spell."
+        // -8: You get an emblem with "Whenever an opponent casts their first spell each turn, counter that spell."
         addCard(Zone.BATTLEFIELD, playerC, "Jace, Unraveler of Secrets");
         addCounters(1, PhaseStep.DRAW, playerC, "Jace, Unraveler of Secrets", CounterType.LOYALTY, 8);
 
diff --git a/Mage.Tests/src/test/java/org/mage/test/testapi/TestPlayerExpectedErrorsTest.java b/Mage.Tests/src/test/java/org/mage/test/testapi/TestPlayerExpectedErrorsTest.java
index 83ced38a61a..971aae579f0 100644
--- a/Mage.Tests/src/test/java/org/mage/test/testapi/TestPlayerExpectedErrorsTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/testapi/TestPlayerExpectedErrorsTest.java
@@ -244,7 +244,7 @@ public class TestPlayerExpectedErrorsTest extends CardTestPlayerBase {
     	/* Underworld Cerberus {3}{B}{3} 6/6
     	*  Underworld Cerberus can't be blocked except by three or more creatures.
     	*  Cards in graveyards can't be the targets of spells or abilities.
-    	*  When Underworld Cerberus dies, exile it and each player returns all creature cards from his or her graveyard to his or her hand.
+    	*  When Underworld Cerberus dies, exile it and each player returns all creature cards from their graveyard to their hand.
     	*/
         addCard(Zone.BATTLEFIELD, playerA, "Underworld Cerberus");
         addCard(Zone.BATTLEFIELD, playerB, "Memnite", 2); // 1/1
diff --git a/Mage/src/main/java/mage/abilities/AbilityImpl.java b/Mage/src/main/java/mage/abilities/AbilityImpl.java
index e990ffb9d1e..389ac3c450b 100644
--- a/Mage/src/main/java/mage/abilities/AbilityImpl.java
+++ b/Mage/src/main/java/mage/abilities/AbilityImpl.java
@@ -250,7 +250,7 @@ public abstract class AbilityImpl implements Ability {
 
         /* 20130201 - 601.2b
          * If the player wishes to splice any cards onto the spell (see rule 702.45), he
-         * or she reveals those cards in his or her hand.
+         * or she reveals those cards in their hand.
          */
         if (this.abilityType == AbilityType.SPELL) {
             game.getContinuousEffects().applySpliceEffects(this, game);
@@ -313,7 +313,7 @@ public abstract class AbilityImpl implements Ability {
         for (UUID modeId : this.getModes().getSelectedModes()) {
             this.getModes().setActiveMode(modeId);
             //20121001 - 601.2c
-            // 601.2c The player announces his or her choice of an appropriate player, object, or zone for
+            // 601.2c The player announces their choice of an appropriate player, object, or zone for
             // each target the spell requires. A spell may require some targets only if an alternative or
             // additional cost (such as a buyback or kicker cost), or a particular mode, was chosen for it;
             // otherwise, the spell is cast as though it did not require those targets. If the spell has a
diff --git a/Mage/src/main/java/mage/abilities/condition/common/CardsInControllerGraveCondition.java b/Mage/src/main/java/mage/abilities/condition/common/CardsInControllerGraveCondition.java
index d85f78d39bd..94500ee9183 100644
--- a/Mage/src/main/java/mage/abilities/condition/common/CardsInControllerGraveCondition.java
+++ b/Mage/src/main/java/mage/abilities/condition/common/CardsInControllerGraveCondition.java
@@ -8,7 +8,7 @@ import mage.players.Player;
 import mage.util.CardUtil;
 
 /**
- * Condition for - Controller has X or more cards in his or her graveyard
+ * Condition for - Controller has X or more cards in their graveyard
  *
  * @author LevelX2
  */
diff --git a/Mage/src/main/java/mage/abilities/condition/common/CardsInOpponentGraveCondition.java b/Mage/src/main/java/mage/abilities/condition/common/CardsInOpponentGraveCondition.java
index 1c2d203d2c9..5a683073b82 100644
--- a/Mage/src/main/java/mage/abilities/condition/common/CardsInOpponentGraveCondition.java
+++ b/Mage/src/main/java/mage/abilities/condition/common/CardsInOpponentGraveCondition.java
@@ -9,7 +9,7 @@ import java.util.UUID;
 
 /**
  * Condition for -
- *  Any opponent has X or more cards in his or her graveyard
+ *  Any opponent has X or more cards in their graveyard
  *  @author Loki
  */
 public class CardsInOpponentGraveCondition implements Condition {
diff --git a/Mage/src/main/java/mage/abilities/costs/common/PayLifeCost.java b/Mage/src/main/java/mage/abilities/costs/common/PayLifeCost.java
index bdc1a6c45da..ff38779e73d 100644
--- a/Mage/src/main/java/mage/abilities/costs/common/PayLifeCost.java
+++ b/Mage/src/main/java/mage/abilities/costs/common/PayLifeCost.java
@@ -63,7 +63,7 @@ public class PayLifeCost extends CostImpl {
     @Override
     public boolean canPay(Ability ability, UUID sourceId, UUID controllerId, Game game) {
         //118.4. If a cost or effect allows a player to pay an amount of life greater than 0, 
-        //the player may do so only if his or her life total is greater than or equal to the 
+        //the player may do so only if their life total is greater than or equal to the
         //amount of the payment. If a player pays life, the payment is subtracted from his or 
         //her life total; in other words, the player loses that much life. (Players can always pay 0 life.)
         int lifeToPayAmount = amount.calculate(game, ability, null);
diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ParleyCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ParleyCount.java
index fe9bbdf59d1..a2f7dfe2f5b 100644
--- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ParleyCount.java
+++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ParleyCount.java
@@ -58,7 +58,7 @@ public class ParleyCount implements DynamicValue, MageSingleton {
 
     @Override
     public int calculate(Game game, Ability sourceAbility, Effect effect) {
-        // Each player reveals the top card of his or her library. For each nonland card revealed this way
+        // Each player reveals the top card of their library. For each nonland card revealed this way
         int parleyValue = 0;
         MageObject sourceObject = game.getObject(sourceAbility.getSourceId());
         if (sourceObject != null) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/AddManaAnyColorAttachedControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AddManaAnyColorAttachedControllerEffect.java
index aac38662541..0e3e6d05d6b 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/AddManaAnyColorAttachedControllerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/AddManaAnyColorAttachedControllerEffect.java
@@ -42,7 +42,7 @@ public class AddManaAnyColorAttachedControllerEffect extends ManaEffect {
 
     public AddManaAnyColorAttachedControllerEffect() {
         super();
-        staticText = "its controller adds one mana of any color to his or her mana pool";
+        staticText = "its controller adds one mana of any color to their mana pool";
     }
 
     public AddManaAnyColorAttachedControllerEffect(final AddManaAnyColorAttachedControllerEffect effect) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/AddManaOfAnyColorToManaPoolTargetPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AddManaOfAnyColorToManaPoolTargetPlayerEffect.java
index b087354cfbf..1f8c6c229be 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/AddManaOfAnyColorToManaPoolTargetPlayerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/AddManaOfAnyColorToManaPoolTargetPlayerEffect.java
@@ -15,7 +15,7 @@ public class AddManaOfAnyColorToManaPoolTargetPlayerEffect extends ManaEffect {
 
     public AddManaOfAnyColorToManaPoolTargetPlayerEffect(String textManaPoolOwner) {
         super();
-        this.staticText = (textManaPoolOwner.equals("his or her") ? "that player adds " : "add ") + "one mana of any color" + " to " + textManaPoolOwner + " mana pool";
+        this.staticText = (textManaPoolOwner.equals("their") ? "that player adds " : "add ") + "one mana of any color" + " to " + textManaPoolOwner + " mana pool";
     }
 
     public AddManaOfAnyColorToManaPoolTargetPlayerEffect(final AddManaOfAnyColorToManaPoolTargetPlayerEffect effect) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/AddManaOfAnyTypeProducedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AddManaOfAnyTypeProducedEffect.java
index 28617232df1..2d84bfff046 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/AddManaOfAnyTypeProducedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/AddManaOfAnyTypeProducedEffect.java
@@ -43,7 +43,7 @@ public class AddManaOfAnyTypeProducedEffect extends ManaEffect {
 
     public AddManaOfAnyTypeProducedEffect() {
         super();
-        staticText = "that player adds one mana to his or her mana pool of any type that land produced";
+        staticText = "that player adds one mana to their mana pool of any type that land produced";
     }
 
     public AddManaOfAnyTypeProducedEffect(final AddManaOfAnyTypeProducedEffect effect) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/AddManaToManaPoolTargetControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/AddManaToManaPoolTargetControllerEffect.java
index 53cdaa155bd..e7943c88b1e 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/AddManaToManaPoolTargetControllerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/AddManaToManaPoolTargetControllerEffect.java
@@ -36,7 +36,7 @@ public class AddManaToManaPoolTargetControllerEffect extends ManaEffect {
         super();
         this.mana = mana;
         this.emptyOnlyOnTurnsEnd = emptyOnTurnsEnd;
-        this.staticText = (textManaPoolOwner.equals("his or her")?"that player adds ":"add ") + mana.toString() + " to " + textManaPoolOwner + " mana pool";
+        this.staticText = (textManaPoolOwner.equals("their")?"that player adds ":"add ") + mana.toString() + " to " + textManaPoolOwner + " mana pool";
     }
 
     public AddManaToManaPoolTargetControllerEffect(final AddManaToManaPoolTargetControllerEffect effect) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ClashEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ClashEffect.java
index 2eb12ec5e12..f7239aa1057 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ClashEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ClashEffect.java
@@ -49,9 +49,9 @@ import mage.target.common.TargetOpponent;
 /**
  * 1. The controller of the spell or ability chooses an opponent. (This doesn't
  * target the opponent.) 2. Each player involved in the clash reveals the top
- * card of his or her library. 3. The converted mana costs of the revealed cards
+ * card of their library. 3. The converted mana costs of the revealed cards
  * are noted. 4. In turn order, each player involved in the clash chooses to put
- * his or her revealed card on either the top or bottom of his or her library.
+ * their revealed card on either the top or bottom of their library.
  * (Note that the player whose turn it is does this first, not necessarily the
  * controller of the clash spell or ability.) When the second player makes this
  * decision, he or she will know what the first player chose. Then all cards are
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInPlayersNextUntapStepAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInPlayersNextUntapStepAllEffect.java
index 37f3e8119c5..37586a0c526 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DontUntapInPlayersNextUntapStepAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DontUntapInPlayersNextUntapStepAllEffect.java
@@ -141,6 +141,6 @@ public class DontUntapInPlayersNextUntapStepAllEffect extends ContinuousRuleModi
         if (!staticText.isEmpty()) {
             return staticText;
         }
-        return filter.getMessage() + " target opponent controls don't untap during his or her next untap step.";
+        return filter.getMessage() + " target opponent controls don't untap during their next untap step.";
     }
 }
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileCardYouChooseTargetOpponentEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileCardYouChooseTargetOpponentEffect.java
index dc0d6978446..9b82b75c37d 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ExileCardYouChooseTargetOpponentEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ExileCardYouChooseTargetOpponentEffect.java
@@ -51,7 +51,7 @@ public class ExileCardYouChooseTargetOpponentEffect extends OneShotEffect {
 
     public ExileCardYouChooseTargetOpponentEffect(FilterCard filter) {
         super(Outcome.Discard);
-        staticText = new StringBuilder("Target opponent reveals his or her hand. You choose ")
+        staticText = new StringBuilder("Target opponent reveals their hand. You choose ")
                 .append(filter.getMessage()).append(" from it and exile that card").toString();
         this.filter = filter;
     }
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileCardsFromTopOfLibraryTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileCardsFromTopOfLibraryTargetEffect.java
index 9ca03c05f0d..d51a986955d 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ExileCardsFromTopOfLibraryTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ExileCardsFromTopOfLibraryTargetEffect.java
@@ -33,7 +33,7 @@ public class ExileCardsFromTopOfLibraryTargetEffect extends OneShotEffect {
         this.amount = amount;
         this.staticText = (targetName == null ? "that player" : targetName) + " exiles the top "
                 + CardUtil.numberToText(amount, "")
-                + (amount == 1 ? "card" : " cards") + " of his or her library";
+                + (amount == 1 ? "card" : " cards") + " of their library";
     }
 
     public ExileCardsFromTopOfLibraryTargetEffect(final ExileCardsFromTopOfLibraryTargetEffect effect) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ExileFromZoneTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ExileFromZoneTargetEffect.java
index 30df84cf478..f9bf188b29b 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ExileFromZoneTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ExileFromZoneTargetEffect.java
@@ -107,6 +107,6 @@ public class ExileFromZoneTargetEffect extends OneShotEffect {
     }
 
     private void setText() {
-        staticText = "target player exiles " + CardUtil.numberToText(amount, "a") + ' ' + filter.getMessage() + " from his or her " + zone.toString().toLowerCase(Locale.ENGLISH);
+        staticText = "target player exiles " + CardUtil.numberToText(amount, "a") + ' ' + filter.getMessage() + " from their " + zone.toString().toLowerCase(Locale.ENGLISH);
     }
 }
diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseHalfLifeTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseHalfLifeTargetEffect.java
index 0ec7b872abd..295f765d48e 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/LoseHalfLifeTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/LoseHalfLifeTargetEffect.java
@@ -41,7 +41,7 @@ public class LoseHalfLifeTargetEffect extends OneShotEffect {
 
     public LoseHalfLifeTargetEffect() {
         super(Outcome.Damage);
-        staticText = "that player loses half his or her life, rounded up";
+        staticText = "that player loses half their life, rounded up";
     }
 
     public LoseHalfLifeTargetEffect(final LoseHalfLifeTargetEffect effect) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java
index 08eafb24e77..c9f19b341c6 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java
@@ -99,7 +99,7 @@ public class PutLibraryIntoGraveTargetEffect extends OneShotEffect {
         } else {
             sb.append(" X cards ");
         }
-        sb.append("of his or her library into his or her graveyard");
+        sb.append("of their library into their graveyard");
 
         if (!message.isEmpty()) {
             sb.append(", where X is the number of ");
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PutPermanentOnBattlefieldEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutPermanentOnBattlefieldEffect.java
index fbde03f3d6a..c6f2461b5a9 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PutPermanentOnBattlefieldEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PutPermanentOnBattlefieldEffect.java
@@ -75,7 +75,7 @@ public class PutPermanentOnBattlefieldEffect extends OneShotEffect {
         }
 
         if (useTargetController) {
-            return "that player may put " + filter.getMessage() + " from his or her hand onto the battlefield";
+            return "that player may put " + filter.getMessage() + " from their hand onto the battlefield";
         } else {
             return "you may put " + filter.getMessage() + " from your hand onto the battlefield";
         }
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveEachPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveEachPlayerEffect.java
index 0a378703ab4..ee596c1d496 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveEachPlayerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveEachPlayerEffect.java
@@ -129,7 +129,7 @@ public class PutTopCardOfLibraryIntoGraveEachPlayerEffect extends OneShotEffect
             sb.append(CardUtil.numberToText(numberCards.toString()));
             sb.append(" cards");
         }
-        sb.append(" of his or her library into his or her graveyard");
+        sb.append(" of their library into their graveyard");
         return sb.toString();
     }
 }
diff --git a/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveTargetEffect.java
index 717a3426b58..46c3b42bd2c 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/PutTopCardOfLibraryIntoGraveTargetEffect.java
@@ -82,7 +82,7 @@ public class PutTopCardOfLibraryIntoGraveTargetEffect extends OneShotEffect {
             sb.append(CardUtil.numberToText(numberCards.toString()));
             sb.append(" cards");
         }
-        sb.append(" of his or her library into his or her graveyard");
+        sb.append(" of their library into their graveyard");
         return sb.toString();
     }
 }
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReplaceOpponentCardsInHandWithSelectedEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReplaceOpponentCardsInHandWithSelectedEffect.java
index 75dd688211f..be82e747f15 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ReplaceOpponentCardsInHandWithSelectedEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ReplaceOpponentCardsInHandWithSelectedEffect.java
@@ -47,7 +47,7 @@ public class ReplaceOpponentCardsInHandWithSelectedEffect extends OneShotEffect
 
     public ReplaceOpponentCardsInHandWithSelectedEffect() {
         super(Outcome.Detriment);
-        this.staticText = "Target opponent puts the cards from his or her hand on top of his or her library. Search that player's library for that many cards. The player puts those cards into his or her hand, then shuffles his or her library.";
+        this.staticText = "Target opponent puts the cards from their hand on top of their library. Search that player's library for that many cards. The player puts those cards into their hand, then shuffles their library.";
     }
 
     public ReplaceOpponentCardsInHandWithSelectedEffect(final ReplaceOpponentCardsInHandWithSelectedEffect effect) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandFromGraveyardAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandFromGraveyardAllEffect.java
index 425d4b6ce0a..71016ad0601 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandFromGraveyardAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnToHandFromGraveyardAllEffect.java
@@ -48,7 +48,7 @@ public class ReturnToHandFromGraveyardAllEffect extends OneShotEffect {
     public ReturnToHandFromGraveyardAllEffect(FilterCard filter) {
         super(Outcome.ReturnToHand);
         this.filter = filter;
-        staticText = "Each player returns all " + filter.getMessage() + " from his or her graveyard to his or her hand";
+        staticText = "Each player returns all " + filter.getMessage() + " from their graveyard to their hand";
     }
 
     public ReturnToHandFromGraveyardAllEffect(final ReturnToHandFromGraveyardAllEffect effect) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/RevealCardsFromLibraryUntilEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RevealCardsFromLibraryUntilEffect.java
index 67adcc88a11..9b53e3227ec 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/RevealCardsFromLibraryUntilEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/RevealCardsFromLibraryUntilEffect.java
@@ -152,7 +152,7 @@ public class RevealCardsFromLibraryUntilEffect extends OneShotEffect {
             }
             case LIBRARY: {
                 if (shuffleRestInto) {
-                    sb.append(", then shuffles the rest into his or her library.");
+                    sb.append(", then shuffles the rest into their library.");
                 } else {
                     sb.append(" and the rest on the bottom of your library in ");
                     if (anyOrder) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/RevealHandTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RevealHandTargetEffect.java
index 089e36ef35b..8282707d0bd 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/RevealHandTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/RevealHandTargetEffect.java
@@ -86,7 +86,7 @@ public class RevealHandTargetEffect extends OneShotEffect {
             default:
                 break;
         }
-        sb.append(" reveals his or her hand");
+        sb.append(" reveals their hand");
         return sb.toString();
     }
 }
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryGraveOfSourceOwnerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryGraveOfSourceOwnerEffect.java
index 563a3d4c47b..08f76fd9fbb 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryGraveOfSourceOwnerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryGraveOfSourceOwnerEffect.java
@@ -43,7 +43,7 @@ public class ShuffleIntoLibraryGraveOfSourceOwnerEffect extends OneShotEffect {
 
     public ShuffleIntoLibraryGraveOfSourceOwnerEffect() {
         super(Outcome.Benefit);
-        staticText = "its owner shuffles his or her graveyard into his or her library";
+        staticText = "its owner shuffles their graveyard into their library";
     }
 
     public ShuffleIntoLibraryGraveOfSourceOwnerEffect(final ShuffleIntoLibraryGraveOfSourceOwnerEffect effect) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryTargetEffect.java
index 542ad7497fc..5166946dfa3 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ShuffleIntoLibraryTargetEffect.java
@@ -56,7 +56,7 @@ public class ShuffleIntoLibraryTargetEffect extends OneShotEffect {
         if (staticText != null && !staticText.isEmpty()) {
             return staticText;
         } else {
-            return "choose target " + mode.getTargets().get(0).getTargetName() + ". Its owner shuffles it into his or her library";
+            return "choose target " + mode.getTargets().get(0).getTargetName() + ". Its owner shuffles it into their library";
         }
     }
 }
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ShuffleLibraryTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ShuffleLibraryTargetEffect.java
index ea96f304433..705829cd5c2 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ShuffleLibraryTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ShuffleLibraryTargetEffect.java
@@ -42,7 +42,7 @@ public class ShuffleLibraryTargetEffect extends OneShotEffect {
 
     public ShuffleLibraryTargetEffect() {
         super(Outcome.Neutral);
-        this.staticText = "Target player shuffles his or her library";
+        this.staticText = "Target player shuffles their library";
     }
 
     public ShuffleLibraryTargetEffect(final ShuffleLibraryTargetEffect effect) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/SkipNextCombatEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SkipNextCombatEffect.java
index d324830c0ba..20964c43aae 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/SkipNextCombatEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/SkipNextCombatEffect.java
@@ -21,7 +21,7 @@ public class SkipNextCombatEffect extends OneShotEffect {
     
     public SkipNextCombatEffect() {
         super(Outcome.Detriment);
-        staticText = "target opponent skips his or her next combat phase";
+        staticText = "target opponent skips their next combat phase";
     }
 
     public SkipNextCombatEffect(SkipNextCombatEffect effect) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java b/Mage/src/main/java/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java
index 2aadf12f97e..66c97e162ff 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/SkipNextPlayerUntapStepEffect.java
@@ -83,7 +83,7 @@ public class SkipNextPlayerUntapStepEffect extends OneShotEffect {
     public String getText(Mode mode) {
         StringBuilder sb = new StringBuilder();
         if (!staticText.isEmpty()) {
-            sb.append(staticText).append(" player skips his or her next untap step");
+            sb.append(staticText).append(" player skips their next untap step");
         } else {
             sb.append("You skip your next untap step");
         }
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/CommanderReplacementEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/CommanderReplacementEffect.java
index adeb100ccdf..879357d990b 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/CommanderReplacementEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/CommanderReplacementEffect.java
@@ -143,7 +143,7 @@ public class CommanderReplacementEffect extends ReplacementEffectImpl {
                 if (player != null && player.chooseUse(Outcome.Benefit, "Move commander to command zone?", source, game)) {
                     ((ZoneChangeEvent) event).setToZone(Zone.COMMAND);
                     if (!game.isSimulation()) {
-                        game.informPlayers(player.getLogName() + " has moved his or her commander to the command zone");
+                        game.informPlayers(player.getLogName() + " has moved their commander to the command zone");
                     }
                 }
             }
@@ -163,7 +163,7 @@ public class CommanderReplacementEffect extends ReplacementEffectImpl {
                 if (player != null && player.chooseUse(Outcome.Benefit, "Move commander to command zone?", source, game)) {
                     ((ZoneChangeEvent) event).setToZone(Zone.COMMAND);
                     if (!game.isSimulation()) {
-                        game.informPlayers(player.getLogName() + " has moved his or her commander to the command zone");
+                        game.informPlayers(player.getLogName() + " has moved their commander to the command zone");
                     }
                 }
             }
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayAdditionalLandsAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayAdditionalLandsAllEffect.java
index a66f6245b69..ed0eb8167ff 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayAdditionalLandsAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/PlayAdditionalLandsAllEffect.java
@@ -38,7 +38,7 @@ import mage.game.Game;
 import mage.players.Player;
 
 /**
- * Each player may play an additional land on each of his or her turns.
+ * Each player may play an additional land on each of their turns.
  *
  * @author nantuko
  */
@@ -46,7 +46,7 @@ public class PlayAdditionalLandsAllEffect extends ContinuousEffectImpl {
 
     public PlayAdditionalLandsAllEffect() {
         super(Duration.WhileOnBattlefield, Layer.PlayerEffects, SubLayer.NA, Outcome.Benefit);
-        staticText = "Each player may play an additional land on each of his or her turns";
+        staticText = "Each player may play an additional land on each of their turns";
     }
 
     public PlayAdditionalLandsAllEffect(final PlayAdditionalLandsAllEffect effect) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardCardYouChooseTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardCardYouChooseTargetEffect.java
index b527f9073f8..7b2d7a7c022 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardCardYouChooseTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardCardYouChooseTargetEffect.java
@@ -194,14 +194,14 @@ public class DiscardCardYouChooseTargetEffect extends OneShotEffect {
                 throw new UnsupportedOperationException("target controller not supported");
         }
         if (revealAllCards) {
-            sb.append(" reveals his or her hand");
+            sb.append(" reveals their hand");
         } else {
             if (numberCardsToReveal instanceof StaticValue) {
                 sb.append(" reveals ");
                 sb.append(numberCardsToReveal.getMessage());
-                sb.append(" from his or her hand");
+                sb.append(" from their hand");
             } else {
-                sb.append(" reveals a number of cards from his or her hand equal to ");
+                sb.append(" reveals a number of cards from their hand equal to ");
                 sb.append(numberCardsToReveal.getMessage());
             }
         }
diff --git a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandAllEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandAllEffect.java
index fca81996372..c190dde1a37 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandAllEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandAllEffect.java
@@ -43,7 +43,7 @@ public class DiscardHandAllEffect extends OneShotEffect {
 
     public DiscardHandAllEffect() {
         super(Outcome.Discard);
-        this.staticText = "Each player discards his or her hand";
+        this.staticText = "Each player discards their hand";
     }
 
     public DiscardHandAllEffect(final DiscardHandAllEffect effect) {
diff --git a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandTargetEffect.java
index 22bee765e98..ee91492abb4 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandTargetEffect.java
@@ -89,7 +89,7 @@ public class DiscardHandTargetEffect extends OneShotEffect {
         } else {
             sb.append("target ").append(mode.getTargets().get(0).getTargetName());
         }
-        sb.append(" discards his or her hand");
+        sb.append(" discards their hand");
         return sb.toString();
     }    
 }
\ No newline at end of file
diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayTargetPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayTargetPlayerEffect.java
index 0d3c6776b03..507223d1f66 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayTargetPlayerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayTargetPlayerEffect.java
@@ -89,7 +89,7 @@ public class SearchLibraryPutInPlayTargetPlayerEffect extends SearchEffect {
 
     private void setText() {
         StringBuilder sb = new StringBuilder();
-        sb.append("target player searches his or her library for ");
+        sb.append("target player searches their library for ");
         if (target.getNumberOfTargets() == 0 && target.getMaxNumberOfTargets() > 0) {
             if (target.getMaxNumberOfTargets() == Integer.MAX_VALUE) {
                 sb.append("any number of ").append(' ');
@@ -104,9 +104,9 @@ public class SearchLibraryPutInPlayTargetPlayerEffect extends SearchEffect {
             sb.append(" tapped");
         }
         if (forceShuffle) {
-            sb.append(". Then that player shuffles his or her library");
+            sb.append(". Then that player shuffles their library");
         } else {
-            sb.append(". If that player does, he or she shuffles his or her library");
+            sb.append(". If that player does, he or she shuffles their library");
         }
         staticText = sb.toString();
     }
diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchTargetGraveyardHandLibraryForCardNameAndExileEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchTargetGraveyardHandLibraryForCardNameAndExileEffect.java
index 5be2bb16f27..3b478fa9a01 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchTargetGraveyardHandLibraryForCardNameAndExileEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchTargetGraveyardHandLibraryForCardNameAndExileEffect.java
@@ -132,7 +132,7 @@ public abstract class SearchTargetGraveyardHandLibraryForCardNameAndExileEffect
         sb.append("search ").append(this.searchWhatText);
         sb.append(" graveyard, hand, and library for ");
         sb.append(this.searchForText);
-        sb.append(" and exile them. Then that player shuffles his or her library");
+        sb.append(" and exile them. Then that player shuffles their library");
         return sb.toString();
     }
 }
diff --git a/Mage/src/main/java/mage/abilities/effects/keyword/ManifestTargetPlayerEffect.java b/Mage/src/main/java/mage/abilities/effects/keyword/ManifestTargetPlayerEffect.java
index bc3538456ce..a1cb93bd9ab 100644
--- a/Mage/src/main/java/mage/abilities/effects/keyword/ManifestTargetPlayerEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/keyword/ManifestTargetPlayerEffect.java
@@ -112,11 +112,11 @@ public class ManifestTargetPlayerEffect extends OneShotEffect {
         } else {
             sb.append("card ");
         }
-        sb.append("of his or her library. ");
+        sb.append("of their library. ");
         if (amount > 1) {
             sb.append("<i>(To manifest a card, put it onto the battlefield face down as a 2/2 creature. The controller may turn it face up at any time for its mana cost if it's a creature card.)</i>");
         } else {
-            sb.append("<i>(That player puts the top card of his or her library onto the battlefield face down as a 2/2 creature. If it's a creature card, it can be turned face up any time for its mana cost.)</i>");
+            sb.append("<i>(That player puts the top card of their library onto the battlefield face down as a 2/2 creature. If it's a creature card, it can be turned face up any time for its mana cost.)</i>");
         }
         return sb.toString();
     }
diff --git a/Mage/src/main/java/mage/abilities/keyword/ForecastAbility.java b/Mage/src/main/java/mage/abilities/keyword/ForecastAbility.java
index a23e221fffb..fdbfe871ffe 100644
--- a/Mage/src/main/java/mage/abilities/keyword/ForecastAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/ForecastAbility.java
@@ -43,8 +43,8 @@ import mage.game.Game;
  *
  * 702.56b A forecast ability may be activated only during the upkeep step of
  * the card's owner and only once each turn. The controller of the forecast
- * ability reveals the card with that ability from his or her hand as the
- * ability is activated. That player plays with that card revealed in his or her
+ * ability reveals the card with that ability from their hand as the
+ * ability is activated. That player plays with that card revealed in their
  * hand until it leaves the player's hand or until a step or phase that isn't an
  * upkeep step begins, whichever comes first.
  *
diff --git a/Mage/src/main/java/mage/abilities/keyword/IngestAbility.java b/Mage/src/main/java/mage/abilities/keyword/IngestAbility.java
index 23a63d04288..75baf302ef2 100644
--- a/Mage/src/main/java/mage/abilities/keyword/IngestAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/IngestAbility.java
@@ -31,7 +31,7 @@ public class IngestAbility extends DealsCombatDamageToAPlayerTriggeredAbility {
 
     @Override
     public String getRule() {
-        return "Ingest <i>(Whenever this creature deals combat damage to a player, that player exiles the top card of his or her library.)</i>";
+        return "Ingest <i>(Whenever this creature deals combat damage to a player, that player exiles the top card of their library.)</i>";
     }
 
     @Override
@@ -44,7 +44,7 @@ class IngestEffect extends OneShotEffect {
 
     public IngestEffect() {
         super(Outcome.Exile);
-        this.staticText = "that player exiles the top card of his or her library";
+        this.staticText = "that player exiles the top card of their library";
     }
 
     public IngestEffect(final IngestEffect effect) {
diff --git a/Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java b/Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java
index b8a74f87112..44153d7f32b 100644
--- a/Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/MadnessAbility.java
@@ -33,10 +33,10 @@ import mage.players.Player;
  * first ability is applied.
  *
  * "Madness [cost]" means "If a player would discard this card, that player
- * discards it, but may exile it instead of putting it into his or her
+ * discards it, but may exile it instead of putting it into their
  * graveyard" and "When this card is exiled this way, its owner may cast it by
  * paying [cost] rather than paying its mana cost. If that player doesn't, he or
- * she puts this card into his or her graveyard.
+ * she puts this card into their graveyard.
  *
  * 702.33b. Casting a spell using its madness ability follows the rules for
  * paying alternative costs in rules 601.2b and 601.2e-g.
diff --git a/Mage/src/main/java/mage/abilities/keyword/MiracleAbility.java b/Mage/src/main/java/mage/abilities/keyword/MiracleAbility.java
index 8c50e898c0a..ed50e9b7b00 100644
--- a/Mage/src/main/java/mage/abilities/keyword/MiracleAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/MiracleAbility.java
@@ -52,7 +52,7 @@ import mage.watchers.common.MiracleWatcher;
  * cost."
  *
  * 702.92b If a player chooses to reveal a card using its miracle ability, he or
- * she plays with that card revealed until that card leaves his or her hand,
+ * she plays with that card revealed until that card leaves their hand,
  * that ability resolves, or that ability otherwise leaves the stack.
  *
  * You can cast a card for its miracle cost only as the miracle triggered
diff --git a/Mage/src/main/java/mage/abilities/keyword/SuspendAbility.java b/Mage/src/main/java/mage/abilities/keyword/SuspendAbility.java
index 0921b18e12d..8e05b879c08 100644
--- a/Mage/src/main/java/mage/abilities/keyword/SuspendAbility.java
+++ b/Mage/src/main/java/mage/abilities/keyword/SuspendAbility.java
@@ -120,7 +120,7 @@ import java.util.UUID;
  * card involves an additional cost, the card's owner must pay that cost if
  * able. If he or she can't, the card remains removed from the game. If the
  * additional cost includes mana, the situation is more complex. If the player
- * has enough mana in his or her mana pool to pay the cost, that player must do
+ * has enough mana in their mana pool to pay the cost, that player must do
  * so. If the player can't possibly pay the cost, the card remains removed from
  * the game. However, if the player has the means to produce enough mana to pay
  * the cost, then he or she has a choice: The player may play the spell, produce
diff --git a/Mage/src/main/java/mage/game/GameCommanderImpl.java b/Mage/src/main/java/mage/game/GameCommanderImpl.java
index 67cf4181b6e..b952ba3ca3f 100644
--- a/Mage/src/main/java/mage/game/GameCommanderImpl.java
+++ b/Mage/src/main/java/mage/game/GameCommanderImpl.java
@@ -97,10 +97,10 @@ public abstract class GameCommanderImpl extends GameImpl {
 
     //20130711
     /*903.8. The Commander variant uses an alternate mulligan rule.
-     * Each time a player takes a mulligan, rather than shuffling his or her entire hand of cards into his or her library, that player exiles any number of cards from his or her hand face down.
+     * Each time a player takes a mulligan, rather than shuffling their entire hand of cards into their library, that player exiles any number of cards from their hand face down.
      * Then the player draws a number of cards equal to one less than the number of cards he or she exiled this way.
      * That player may look at all cards exiled this way while taking mulligans.
-     * Once a player keeps an opening hand, that player shuffles all cards he or she exiled this way into his or her library.
+     * Once a player keeps an opening hand, that player shuffles all cards he or she exiled this way into their library.
      * */
     //TODO implement may look at exile cards
     @Override
diff --git a/Mage/src/main/java/mage/game/command/emblems/JaceTelepathUnboundEmblem.java b/Mage/src/main/java/mage/game/command/emblems/JaceTelepathUnboundEmblem.java
index d7d9b323650..ced27260021 100644
--- a/Mage/src/main/java/mage/game/command/emblems/JaceTelepathUnboundEmblem.java
+++ b/Mage/src/main/java/mage/game/command/emblems/JaceTelepathUnboundEmblem.java
@@ -41,12 +41,12 @@ import mage.target.common.TargetOpponent;
  * @author spjspj
  */
 public class JaceTelepathUnboundEmblem extends Emblem {
-    // You get an emblem with "Whenever you cast a spell, target opponent puts the top five cards of his or her library into his or her graveyard".
+    // You get an emblem with "Whenever you cast a spell, target opponent puts the top five cards of their library into their graveyard".
 
     public JaceTelepathUnboundEmblem() {
         this.setName("Emblem Jace");
         Effect effect = new PutTopCardOfLibraryIntoGraveTargetEffect(5);
-        effect.setText("target opponent puts the top five cards of his or her library into his or her graveyard");
+        effect.setText("target opponent puts the top five cards of their library into their graveyard");
         Ability ability = new SpellCastControllerTriggeredAbility(Zone.COMMAND, effect, new FilterSpell("a spell"), false, false);
         ability.addTarget(new TargetOpponent());
         getAbilities().add(ability);
diff --git a/Mage/src/main/java/mage/game/command/emblems/JaceUnravelerOfSecretsEmblem.java b/Mage/src/main/java/mage/game/command/emblems/JaceUnravelerOfSecretsEmblem.java
index 197d25f7940..6d707cf2979 100644
--- a/Mage/src/main/java/mage/game/command/emblems/JaceUnravelerOfSecretsEmblem.java
+++ b/Mage/src/main/java/mage/game/command/emblems/JaceUnravelerOfSecretsEmblem.java
@@ -47,7 +47,7 @@ import mage.watchers.common.SpellsCastWatcher;
 public class JaceUnravelerOfSecretsEmblem extends Emblem {
 
     /**
-     * Emblem: "Whenever an opponent casts his or her first spell each turn,
+     * Emblem: "Whenever an opponent casts their first spell each turn,
      * counter that spell."
      */
     public JaceUnravelerOfSecretsEmblem() {
@@ -93,6 +93,6 @@ class JaceUnravelerOfSecretsTriggeredAbility extends SpellCastOpponentTriggeredA
 
     @Override
     public String getRule() {
-        return "Whenever an opponent casts his or her first spell each turn, counter that spell.";
+        return "Whenever an opponent casts their first spell each turn, counter that spell.";
     }
 }
diff --git a/Mage/src/main/java/mage/game/turn/Turn.java b/Mage/src/main/java/mage/game/turn/Turn.java
index 7c2c8429dcf..3463487e455 100644
--- a/Mage/src/main/java/mage/game/turn/Turn.java
+++ b/Mage/src/main/java/mage/game/turn/Turn.java
@@ -132,7 +132,7 @@ public class Turn implements Serializable {
         }
 
         if (game.getState().getTurnMods().skipTurn(activePlayer.getId())) {
-            game.informPlayers(activePlayer.getLogName() + " skips his or her turn.");
+            game.informPlayers(activePlayer.getLogName() + " skips their turn.");
             return true;
         }
         logStartOfTurn(game, activePlayer);
diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java
index c9d48f285f5..1c2986aeacb 100644
--- a/Mage/src/main/java/mage/players/PlayerImpl.java
+++ b/Mage/src/main/java/mage/players/PlayerImpl.java
@@ -2313,7 +2313,7 @@ public abstract class PlayerImpl implements Player, Serializable {
         Library searchedLibrary = null;
         String searchInfo = null;
         if (targetPlayerId.equals(playerId)) {
-            searchInfo = getLogName() + " searches his or her library";
+            searchInfo = getLogName() + " searches their library";
             searchedLibrary = library;
         } else {
             Player targetPlayer = game.getPlayer(targetPlayerId);
@@ -3460,7 +3460,7 @@ public abstract class PlayerImpl implements Player, Serializable {
                 game.informPlayers(getLogName() + " puts "
                         + (withName ? card.getLogName() : (card.isFaceDown(game) ? "a face down card" : "a card"))
                         + " from " + fromZone.toString().toLowerCase(Locale.ENGLISH) + ' '
-                        + (card.getOwnerId().equals(this.getId()) ? "into his or her hand" : "into its owner's hand")
+                        + (card.getOwnerId().equals(this.getId()) ? "into their hand" : "into its owner's hand")
                 );
             }
             result = true;
@@ -3555,7 +3555,7 @@ public abstract class PlayerImpl implements Player, Serializable {
                         .append(" puts ").append(card.getLogName()).append(' ').append(card.isCopy() ? "(Copy) " : "")
                         .append(fromZone != null ? "from " + fromZone.toString().toLowerCase(Locale.ENGLISH) + ' ' : "");
                 if (card.getOwnerId().equals(getId())) {
-                    sb.append("into his or her graveyard");
+                    sb.append("into their graveyard");
                 } else {
                     sb.append("it into its owner's graveyard");
                 }
@@ -3587,7 +3587,7 @@ public abstract class PlayerImpl implements Player, Serializable {
                 }
                 sb.append("to the ").append(toTop ? "top" : "bottom");
                 if (card.getOwnerId().equals(getId())) {
-                    sb.append(" of his or her library");
+                    sb.append(" of their library");
                 } else {
                     Player player = game.getPlayer(card.getOwnerId());
                     if (player != null) {