diff --git a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
index 342d2f7da83..da91b969bef 100644
--- a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
@@ -60,15 +60,6 @@ public abstract class SpellAbilityEffect {
         return sa.getDescription();
     }
 
-    protected static final void resolveSubAbility(final SpellAbility sa) {
-        // if mana production has any type of SubAbility, undoable=false
-        final AbilitySub abSub = sa.getSubAbility();
-        if (abSub != null) {
-            sa.setUndoable(false);
-            AbilityUtils.resolve(abSub);
-        }
-    }
-
     /**
      * Returns this effect description with needed prelude and epilogue.
      * @param params
diff --git a/forge-game/src/main/java/forge/game/ability/effects/ManaReflectedEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ManaReflectedEffect.java
index 1616c2432cd..65a0a617f5e 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/ManaReflectedEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/ManaReflectedEffect.java
@@ -23,7 +23,7 @@ public class ManaReflectedEffect extends SpellAbilityEffect {
     public void resolve(SpellAbility sa) {
         // Spells are not undoable
         AbilityManaPart ma = sa.getManaPart();
-        sa.setUndoable(sa.isAbility() && sa.isUndoable());
+        sa.setUndoable(sa.isAbility() && sa.isUndoable() && sa.getSubAbility() == null);
 
         final Collection<String> colors = CardUtil.getReflectableManaColors(sa);
 
@@ -31,8 +31,6 @@ public class ManaReflectedEffect extends SpellAbilityEffect {
             final String generated = generatedReflectedMana(sa, colors, player);
             ma.produceMana(generated, player, sa);
         }
-
-        resolveSubAbility(sa);
     }
 
 
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
index 38ed3ea080f..4e1bed39fab 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
@@ -517,6 +517,12 @@ public class TriggerHandler {
                 abMana.setUndoable(false);
             }
         }
+        if (regtrig instanceof TriggerSpellAbilityCastOrCopy) {
+            final SpellAbility abMana = (SpellAbility) runParams.get(AbilityKey.CastSA);
+            if (null != abMana && null != abMana.getManaPart()) {
+                abMana.setUndoable(false);
+            }
+        }
 
         SpellAbility sa = null;
         Card host = regtrig.getHostCard();
diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCastOrCopy.java b/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCastOrCopy.java
index b394dd89d6a..f3888601b19 100644
--- a/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCastOrCopy.java
+++ b/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCastOrCopy.java
@@ -90,14 +90,23 @@ public class TriggerSpellAbilityCastOrCopy extends Trigger {
         }
 
         if (hasParam("ValidActivatingPlayer")) {
-            if (si == null || !matchesValid(si.getSpellAbility(true).getActivatingPlayer(), getParam("ValidActivatingPlayer").split(","))) {
+            Player activator;
+            if (spellAbility.isManaAbility()) {
+                activator = (Player) runParams.get(AbilityKey.Activator);
+            } else if (si == null) {
+                return false;
+            } else {
+                activator = si.getSpellAbility(true).getActivatingPlayer();
+            }
+
+            if (!matchesValidParam("ValidActivatingPlayer", activator)) {
                 return false;
             }
             if (hasParam("ActivatorThisTurnCast")) {
                 final String compare = getParam("ActivatorThisTurnCast");
                 final String valid = getParamOrDefault("ValidCard", "Card");
                 List<Card> thisTurnCast = CardUtil.getThisTurnCast(valid, getHostCard(), this);
-                thisTurnCast = CardLists.filterControlledBy(thisTurnCast, si.getSpellAbility(true).getActivatingPlayer());
+                thisTurnCast = CardLists.filterControlledBy(thisTurnCast, activator);
                 int left = thisTurnCast.size();
                 int right = Integer.parseInt(compare.substring(2));
                 if (!Expressions.compare(left, compare, right)) {
@@ -121,7 +130,6 @@ public class TriggerSpellAbilityCastOrCopy extends Trigger {
             boolean validTgtFound = false;
             while (sa != null && !validTgtFound) {
                 for (final Card tgt : sa.getTargets().getTargetCards()) {
-
                     if (matchesValid(tgt, getParam("TargetsValid").split(","))) {
                         validTgtFound = true;
                         if (this.hasParam("RememberValidCards")) {
diff --git a/forge-game/src/main/java/forge/game/zone/MagicStack.java b/forge-game/src/main/java/forge/game/zone/MagicStack.java
index b398ff20f49..48efbd76acd 100644
--- a/forge-game/src/main/java/forge/game/zone/MagicStack.java
+++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java
@@ -231,6 +231,18 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
         }
 
         if (sp.isManaAbility()) { // Mana Abilities go straight through
+            Map<AbilityKey, Object> runParams = AbilityKey.mapFromPlayer(sp.getHostCard().getController());
+            runParams.put(AbilityKey.Cost, sp.getPayCosts());
+            runParams.put(AbilityKey.Activator, sp.getActivatingPlayer());
+            runParams.put(AbilityKey.CastSA, sp);
+            game.getTriggerHandler().runTrigger(TriggerType.SpellAbilityCast, runParams, true);
+            if (sp.isActivatedAbility()) {
+                game.getTriggerHandler().runTrigger(TriggerType.AbilityCast, runParams, true);
+            }
+
+            // reset in case a trigger stopped it on a previous activation
+            sp.setUndoable(true);
+
             AbilityUtils.resolve(sp);
             game.getGameLog().add(GameLogEntryType.MANA, source + " - " + sp.getDescription());
             sp.resetOnceResolved();
@@ -292,9 +304,8 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
         si = push(sp);
 
         // Copied spells aren't cast per se so triggers shouldn't run for them.
-        Map<AbilityKey, Object> runParams = AbilityKey.newMap();
+        Map<AbilityKey, Object> runParams = AbilityKey.mapFromPlayer(sp.getHostCard().getController());
         runParams.put(AbilityKey.Cost, sp.getPayCosts());
-        runParams.put(AbilityKey.Player, sp.getHostCard().getController());
         runParams.put(AbilityKey.Activator, sp.getActivatingPlayer());
         runParams.put(AbilityKey.CastSA, si.getSpellAbility(true));
         runParams.put(AbilityKey.CastSACMC, si.getSpellAbility(true).getHostCard().getCMC());
@@ -304,9 +315,9 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
         if (!sp.isCopied()) {
             // Run SpellAbilityCast triggers
             game.getTriggerHandler().runTrigger(TriggerType.SpellAbilityCast, runParams, true);
-            
+
             sp.applyPayingManaEffects();
-            
+
             // Run SpellCast triggers
             if (sp.isSpell()) {
                 if (source.isCommander() && source.getCastFrom() != null && ZoneType.Command == source.getCastFrom().getZoneType()
diff --git a/forge-gui/res/cardsfolder/b/battlemages_bracers.txt b/forge-gui/res/cardsfolder/b/battlemages_bracers.txt
index d5fe9ed35a5..548265d91b5 100644
--- a/forge-gui/res/cardsfolder/b/battlemages_bracers.txt
+++ b/forge-gui/res/cardsfolder/b/battlemages_bracers.txt
@@ -3,6 +3,6 @@ ManaCost:2 R
 Types:Artifact Equipment
 K:Equip:2
 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ Haste | Description$ Equipped creature has haste.
-T:Mode$ AbilityCast | ValidCard$ Creature.EquippedBy+inRealZoneBattlefield | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigCopyAbility | TriggerDescription$ Whenever an ability of equipped creature is activated, if it isn't a mana ability, you may pay {1}. If you do, copy that ability. You may choose new targets for the copy.
+T:Mode$ AbilityCast | ValidCard$ Creature.EquippedBy+inRealZoneBattlefield | ValidSA$ SpellAbility.nonManaAbility | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigCopyAbility | TriggerDescription$ Whenever an ability of equipped creature is activated, if it isn't a mana ability, you may pay {1}. If you do, copy that ability. You may choose new targets for the copy.
 SVar:TrigCopyAbility:AB$ CopySpellAbility | Cost$ 1 | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
 Oracle:Equipped creature has haste.\nWhenever an ability of equipped creature is activated, if it isn't a mana ability, you may pay {1}. If you do, copy that ability. You may choose new targets for the copy.\nEquip {2}
diff --git a/forge-gui/res/cardsfolder/b/burning_tree_shaman.txt b/forge-gui/res/cardsfolder/b/burning_tree_shaman.txt
index 7b6bb47f799..3643336923d 100644
--- a/forge-gui/res/cardsfolder/b/burning_tree_shaman.txt
+++ b/forge-gui/res/cardsfolder/b/burning_tree_shaman.txt
@@ -2,6 +2,6 @@ Name:Burning-Tree Shaman
 ManaCost:1 R G
 Types:Creature Centaur Shaman
 PT:3/4
-T:Mode$ AbilityCast | ValidActivatingPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever a player activates an ability that isn't a mana ability, CARDNAME deals 1 damage to that player.
+T:Mode$ AbilityCast | ValidActivatingPlayer$ Player | ValidSA$ SpellAbility.nonManaAbility | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever a player activates an ability that isn't a mana ability, CARDNAME deals 1 damage to that player.
 SVar:TrigDmg:DB$ DealDamage | NumDmg$ 1 | Defined$ TriggeredActivator
 Oracle:Whenever a player activates an ability that isn't a mana ability, Burning-Tree Shaman deals 1 damage to that player.
diff --git a/forge-gui/res/cardsfolder/c/ceaseless_searblades.txt b/forge-gui/res/cardsfolder/c/ceaseless_searblades.txt
index 85d59e99c8c..7ac44290c3d 100644
--- a/forge-gui/res/cardsfolder/c/ceaseless_searblades.txt
+++ b/forge-gui/res/cardsfolder/c/ceaseless_searblades.txt
@@ -3,6 +3,5 @@ ManaCost:3 R
 Types:Creature Elemental Warrior
 PT:2/4
 T:Mode$ AbilityCast | ValidCard$ Elemental.inZoneBattlefield | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you activate an ability of an Elemental, CARDNAME gets +1/+0 until end of turn.
-T:Mode$ TapsForMana | ValidCard$ Elemental.inZoneBattlefield | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you activate an ability of an Elemental, CARDNAME gets +1/+0 until end of turn.
 SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +1 | NumDef$ +0
 Oracle:Whenever you activate an ability of an Elemental, Ceaseless Searblades gets +1/+0 until end of turn.
diff --git a/forge-gui/res/cardsfolder/c/crackdown_construct.txt b/forge-gui/res/cardsfolder/c/crackdown_construct.txt
index dafa398ffef..25566dd7b9f 100644
--- a/forge-gui/res/cardsfolder/c/crackdown_construct.txt
+++ b/forge-gui/res/cardsfolder/c/crackdown_construct.txt
@@ -2,6 +2,6 @@ Name:Crackdown Construct
 ManaCost:4
 Types:Artifact Creature Construct
 PT:2/2
-T:Mode$ AbilityCast | ValidCard$ Artifact.inZoneBattlefield,Creature.inZoneBattlefield | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you activate an ability of an artifact or creature that isn't a mana ability, Crackdown Construct gets +1/+1 until end of turn.
+T:Mode$ AbilityCast | ValidCard$ Artifact.inZoneBattlefield,Creature.inZoneBattlefield | ValidSA$ SpellAbility.nonManaAbility | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you activate an ability of an artifact or creature that isn't a mana ability, Crackdown Construct gets +1/+1 until end of turn.
 SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +1 | NumDef$ +1
 Oracle:Whenever you activate an ability of an artifact or creature that isn't a mana ability, Crackdown Construct gets +1/+1 until end of turn.
diff --git a/forge-gui/res/cardsfolder/f/flamescroll_celebrant_revel_in_silence.txt b/forge-gui/res/cardsfolder/f/flamescroll_celebrant_revel_in_silence.txt
index 5b76c47bc79..eaf77fe5515 100644
--- a/forge-gui/res/cardsfolder/f/flamescroll_celebrant_revel_in_silence.txt
+++ b/forge-gui/res/cardsfolder/f/flamescroll_celebrant_revel_in_silence.txt
@@ -2,7 +2,7 @@ Name:Flamescroll Celebrant
 ManaCost:1 R
 Types:Creature Human Shaman
 PT:2/1
-T:Mode$ AbilityCast | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever an opponent activates an ability that isn't a mana ability, CARDNAME deals 1 damage to that player.
+T:Mode$ AbilityCast | ValidActivatingPlayer$ Opponent | ValidSA$ SpellAbility.nonManaAbility | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever an opponent activates an ability that isn't a mana ability, CARDNAME deals 1 damage to that player.
 SVar:TrigDmg:DB$ DealDamage | NumDmg$ 1 | Defined$ TriggeredActivator
 A:AB$ Pump | Cost$ 1 R | Defined$ Self | NumAtt$ +2 | SpellDescription$ CARDNAME gets +2/+0 until end of turn.
 AlternateMode:Modal
diff --git a/forge-gui/res/cardsfolder/g/grip_of_chaos.txt b/forge-gui/res/cardsfolder/g/grip_of_chaos.txt
index 5db5407e9c9..a021676fa19 100644
--- a/forge-gui/res/cardsfolder/g/grip_of_chaos.txt
+++ b/forge-gui/res/cardsfolder/g/grip_of_chaos.txt
@@ -2,7 +2,7 @@ Name:Grip of Chaos
 ManaCost:4 R R
 Types:Enchantment
 T:Mode$ SpellAbilityCopy | IsSingleTarget$ True | TriggerZones$ Battlefield | Execute$ TrigChangeTarget | TriggerDescription$ Whenever a spell or ability is put onto the stack, if it has a single target, reselect its target at random. (Select from among all legal targets.)
-T:Mode$ SpellAbilityCast | IsSingleTarget$ True | TriggerZones$ Battlefield | Execute$ TrigChangeTarget | TriggerDescription$ Whenever a spell or ability is put onto the stack, if it has a single target, reselect its target at random. (Select from among all legal targets.)
+T:Mode$ SpellAbilityCast | ValidSA$ SpellAbility.nonManaAbility | IsSingleTarget$ True | TriggerZones$ Battlefield | Execute$ TrigChangeTarget | TriggerDescription$ Whenever a spell or ability is put onto the stack, if it has a single target, reselect its target at random. (Select from among all legal targets.)
 SVar:TrigChangeTarget:DB$ ChangeTargets | Defined$ TriggeredSpellAbility | RandomTarget$ True
 AI:RemoveDeck:Random
 Oracle:Whenever a spell or ability is put onto the stack, if it has a single target, reselect its target at random. (Select from among all legal targets.)
diff --git a/forge-gui/res/cardsfolder/h/harsh_mentor.txt b/forge-gui/res/cardsfolder/h/harsh_mentor.txt
index dbbd6a6cce5..e0dbfa32f87 100644
--- a/forge-gui/res/cardsfolder/h/harsh_mentor.txt
+++ b/forge-gui/res/cardsfolder/h/harsh_mentor.txt
@@ -2,6 +2,6 @@ Name:Harsh Mentor
 ManaCost:1 R
 Types:Creature Human Cleric
 PT:2/2
-T:Mode$ AbilityCast | ValidActivatingPlayer$ Opponent | ValidCard$ Artifact.inZoneBattlefield,Creature.inZoneBattlefield,Land.inZoneBattlefield | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever an opponent activates an ability of an artifact, creature, or land on the battlefield, if it isn't a mana ability, CARDNAME deals 2 damage to that player.
+T:Mode$ AbilityCast | ValidActivatingPlayer$ Opponent | ValidCard$ Artifact.inZoneBattlefield,Creature.inZoneBattlefield,Land.inZoneBattlefield | ValidSA$ SpellAbility.nonManaAbility | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever an opponent activates an ability of an artifact, creature, or land on the battlefield, if it isn't a mana ability, CARDNAME deals 2 damage to that player.
 SVar:TrigDmg:DB$ DealDamage | NumDmg$ 2 | Defined$ TriggeredActivator
 Oracle:Whenever an opponent activates an ability of an artifact, creature, or land on the battlefield, if it isn't a mana ability, Harsh Mentor deals 2 damage to that player.
diff --git a/forge-gui/res/cardsfolder/i/illusionists_bracers.txt b/forge-gui/res/cardsfolder/i/illusionists_bracers.txt
index cfd2f8e5fc3..8e57678e6fb 100644
--- a/forge-gui/res/cardsfolder/i/illusionists_bracers.txt
+++ b/forge-gui/res/cardsfolder/i/illusionists_bracers.txt
@@ -2,6 +2,6 @@ Name:Illusionist's Bracers
 ManaCost:2
 Types:Artifact Equipment
 K:Equip:3
-T:Mode$ AbilityCast | ValidCard$ Creature.EquippedBy+inRealZoneBattlefield | TriggerZones$ Battlefield | Execute$ TrigCopyAbility | OptionalDecider$ You | TriggerDescription$ Whenever an ability of equipped creature is activated, if it isn't a mana ability, copy that ability. You may choose new targets for the copy.
+T:Mode$ AbilityCast | ValidCard$ Creature.EquippedBy+inRealZoneBattlefield | ValidSA$ SpellAbility.nonManaAbility | TriggerZones$ Battlefield | Execute$ TrigCopyAbility | OptionalDecider$ You | TriggerDescription$ Whenever an ability of equipped creature is activated, if it isn't a mana ability, copy that ability. You may choose new targets for the copy.
 SVar:TrigCopyAbility:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
 Oracle:Whenever an ability of equipped creature is activated, if it isn't a mana ability, copy that ability. You may choose new targets for the copy.\nEquip {3}
diff --git a/forge-gui/res/cardsfolder/i/immolation_shaman.txt b/forge-gui/res/cardsfolder/i/immolation_shaman.txt
index f823f6e7909..27ecadc2dac 100644
--- a/forge-gui/res/cardsfolder/i/immolation_shaman.txt
+++ b/forge-gui/res/cardsfolder/i/immolation_shaman.txt
@@ -2,7 +2,7 @@ Name:Immolation Shaman
 ManaCost:1 R
 Types:Creature Viashino Shaman
 PT:1/3
-T:Mode$ AbilityCast | ValidActivatingPlayer$ Opponent | ValidCard$ Artifact.inZoneBattlefield,Creature.inZoneBattlefield,Land.inZoneBattlefield | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever an opponent activates an ability of an artifact, creature, or land that isn't a mana ability, CARDNAME deals 1 damage to that player.
+T:Mode$ AbilityCast | ValidActivatingPlayer$ Opponent | ValidCard$ Artifact.inZoneBattlefield,Creature.inZoneBattlefield,Land.inZoneBattlefield | ValidSA$ SpellAbility.nonManaAbility | TriggerZones$ Battlefield | Execute$ TrigDmg | TriggerDescription$ Whenever an opponent activates an ability of an artifact, creature, or land that isn't a mana ability, CARDNAME deals 1 damage to that player.
 SVar:TrigDmg:DB$ DealDamage | NumDmg$ 1 | Defined$ TriggeredActivator
 A:AB$ Pump | Cost$ 3 R R | Defined$ Self | NumAtt$ +3 | NumDef$ +3 | KW$ Menace | SpellDescription$ CARDNAME gets +3/+3 and gains menace until end of turn.
 Oracle:Whenever an opponent activates an ability of an artifact, creature, or land that isn't a mana ability, Immolation Shaman deals 1 damage to that player.\n{3}{R}{R}: Immolation Shaman gets +3/+3 and gains menace until end of turn.
diff --git a/forge-gui/res/cardsfolder/i/imprison.txt b/forge-gui/res/cardsfolder/i/imprison.txt
index fc2c4fc8b21..cc27d3821c0 100644
--- a/forge-gui/res/cardsfolder/i/imprison.txt
+++ b/forge-gui/res/cardsfolder/i/imprison.txt
@@ -3,7 +3,7 @@ ManaCost:B
 Types:Enchantment Aura
 K:Enchant creature
 A:SP$ Attach | Cost$ B | ValidTgts$ Creature | AILogic$ Curse
-T:Mode$ AbilityCast | ValidCard$ Creature.EnchantedBy | HasTapCost$ True | TriggerZones$ Battlefield | Execute$ TrigDestroy1 | TriggerDescription$ Whenever a player activates an ability of enchanted creature with {T} in its activation cost that isn't a mana ability, you may pay {1}. If you do, counter that ability. If you don't, destroy CARDNAME.
+T:Mode$ AbilityCast | ValidCard$ Creature.EnchantedBy | ValidSA$ SpellAbility.nonManaAbility | HasTapCost$ True | TriggerZones$ Battlefield | Execute$ TrigDestroy1 | TriggerDescription$ Whenever a player activates an ability of enchanted creature with {T} in its activation cost that isn't a mana ability, you may pay {1}. If you do, counter that ability. If you don't, destroy CARDNAME.
 SVar:TrigDestroy1:DB$ Destroy | Defined$ Self | UnlessCost$ 1 | UnlessPayer$ You | UnlessResolveSubs$ WhenPaid | SubAbility$ DBCounter
 SVar:DBCounter:DB$ Counter | Defined$ TriggeredSpellAbility
 T:Mode$ Attacks | ValidCard$ Card.EnchantedBy | TriggerZones$ Battlefield | Execute$ TrigDestroy2 | TriggerDescription$ Whenever enchanted creature attacks or blocks, you may pay {1}. If you do, tap the creature, remove it from combat, and creatures it was blocking that had become blocked by only that creature this combat become unblocked. If you don't, destroy CARDNAME.
diff --git a/forge-gui/res/cardsfolder/k/kurkesh_onakke_ancient.txt b/forge-gui/res/cardsfolder/k/kurkesh_onakke_ancient.txt
index bd3dd5592d9..355d05f4206 100644
--- a/forge-gui/res/cardsfolder/k/kurkesh_onakke_ancient.txt
+++ b/forge-gui/res/cardsfolder/k/kurkesh_onakke_ancient.txt
@@ -2,6 +2,6 @@ Name:Kurkesh, Onakke Ancient
 ManaCost:2 R R
 Types:Legendary Creature Ogre Spirit
 PT:4/3
-T:Mode$ AbilityCast | ValidCard$ Artifact | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigCopyAbility | TriggerDescription$ Whenever you activate an ability of an artifact, if it isn't a mana ability, you may pay {R}. If you do, copy that ability. You may choose new targets for the copy.
+T:Mode$ AbilityCast | ValidCard$ Artifact | ValidSA$ SpellAbility.nonManaAbility | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigCopyAbility | TriggerDescription$ Whenever you activate an ability of an artifact, if it isn't a mana ability, you may pay {R}. If you do, copy that ability. You may choose new targets for the copy.
 SVar:TrigCopyAbility:AB$ CopySpellAbility | Cost$ R | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
 Oracle:Whenever you activate an ability of an artifact, if it isn't a mana ability, you may pay {R}. If you do, copy that ability. You may choose new targets for the copy.
diff --git a/forge-gui/res/cardsfolder/r/rings_of_brighthearth.txt b/forge-gui/res/cardsfolder/r/rings_of_brighthearth.txt
index 956342757ca..5e1edfdf780 100644
--- a/forge-gui/res/cardsfolder/r/rings_of_brighthearth.txt
+++ b/forge-gui/res/cardsfolder/r/rings_of_brighthearth.txt
@@ -1,6 +1,6 @@
 Name:Rings of Brighthearth
 ManaCost:3
 Types:Artifact
-T:Mode$ AbilityCast | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigCopySpell | OptionalDecider$ You | TriggerDescription$ Whenever you activate an ability, if it isn't a mana ability, you may pay {2}. If you do, copy that ability. You may choose new targets for the copy.
+T:Mode$ AbilityCast | ValidActivatingPlayer$ You | ValidSA$ SpellAbility.nonManaAbility | TriggerZones$ Battlefield | Execute$ TrigCopySpell | OptionalDecider$ You | TriggerDescription$ Whenever you activate an ability, if it isn't a mana ability, you may pay {2}. If you do, copy that ability. You may choose new targets for the copy.
 SVar:TrigCopySpell:AB$ CopySpellAbility | Cost$ 2 | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
 Oracle:Whenever you activate an ability, if it isn't a mana ability, you may pay {2}. If you do, copy that ability. You may choose new targets for the copy.
diff --git a/forge-gui/res/cardsfolder/r/rowan_kenrith.txt b/forge-gui/res/cardsfolder/r/rowan_kenrith.txt
index fdfd6ca5f3c..a3e875b3ae2 100644
--- a/forge-gui/res/cardsfolder/r/rowan_kenrith.txt
+++ b/forge-gui/res/cardsfolder/r/rowan_kenrith.txt
@@ -11,7 +11,7 @@ SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 A:AB$ DamageAll | Cost$ SubCounter<2/LOYALTY> | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 3 | ValidCards$ Creature.tapped | Planeswalker$ True | ValidDescription$ each tapped creature target player controls. | SpellDescription$ CARDNAME deals 3 damage to each tapped creature target player controls
 A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidTgts$ Player | EffectOwner$ Targeted | Name$ Emblem - Rowan Kenrith | Image$ emblem_rowan_kenrith | Triggers$ CopyAbility | Duration$ Permanent | AILogic$ Always | SpellDescription$ Target player gets an emblem with "Whenever you activate an ability that isn't a mana ability, copy it. You may choose new targets for the copy."
-SVar:CopyAbility:Mode$ AbilityCast | ValidActivatingPlayer$ You | TriggerZones$ Command | Execute$ TrigCopy | TriggerDescription$ Whenever you activate an ability that isn't a mana ability, copy it. You may choose new targets for the copy.
+SVar:CopyAbility:Mode$ AbilityCast | ValidActivatingPlayer$ You | ValidSA$ SpellAbility.nonManaAbility | TriggerZones$ Command | Execute$ TrigCopy | TriggerDescription$ Whenever you activate an ability that isn't a mana ability, copy it. You may choose new targets for the copy.
 SVar:TrigCopy:DB$ CopySpellAbility | Defined$ TriggeredSpellAbility | MayChooseTarget$ True
 DeckHints:Name$Will Kenrith
 Oracle:[+2]: During target player's next turn, each creature that player controls attacks if able.\n[-2]: Rowan Kenrith deals 3 damage to each tapped creature target player controls.\n[-8]: Target player gets an emblem with "Whenever you activate an ability that isn't a mana ability, copy it. You may choose new targets for the copy."\nPartner with Will Kenrith\nRowan Kenrith can be your commander.
diff --git a/forge-gui/res/cardsfolder/r/runic_armasaur.txt b/forge-gui/res/cardsfolder/r/runic_armasaur.txt
index 9d799916d92..d685168bdc0 100644
--- a/forge-gui/res/cardsfolder/r/runic_armasaur.txt
+++ b/forge-gui/res/cardsfolder/r/runic_armasaur.txt
@@ -2,6 +2,6 @@ Name:Runic Armasaur
 ManaCost:1 G G
 Types:Creature Dinosaur
 PT:2/5
-T:Mode$ AbilityCast | ValidActivatingPlayer$ Opponent | ValidCard$ Creature.inZoneBattlefield,Land.inZoneBattlefield | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigDraw | TriggerDescription$ Whenever an opponent activates an ability of a creature or land that isn't a mana ability, you may draw a card.
+T:Mode$ AbilityCast | ValidActivatingPlayer$ Opponent | ValidCard$ Creature.inZoneBattlefield,Land.inZoneBattlefield | ValidSA$ SpellAbility.nonManaAbility | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigDraw | TriggerDescription$ Whenever an opponent activates an ability of a creature or land that isn't a mana ability, you may draw a card.
 SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
 Oracle:Whenever an opponent activates an ability of a creature or land that isn't a mana ability, you may draw a card.