diff --git a/forge-gui/res/cardsfolder/upcoming/ZNR/soul_shatter.txt b/forge-gui/res/cardsfolder/upcoming/ZNR/soul_shatter.txt
index c8f9baa8258..e15b44612a2 100755
--- a/forge-gui/res/cardsfolder/upcoming/ZNR/soul_shatter.txt
+++ b/forge-gui/res/cardsfolder/upcoming/ZNR/soul_shatter.txt
@@ -1,11 +1,11 @@
 Name:Soul Shatter
 ManaCost:2 B
 Types:Instant
-A:SP$ RepeatEach | Cost$ 2 B | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ CreatureHighCMC | SubAbility$ DBSac | StackDescription$ SpellDescription | SpellDescription$ Each opponent sacrifices a creature or planeswalker with the highest converted mana cost among creatures and planeswalkers they control.
-SVar:CreatureHighCMC:DB$ ChooseCard | ConditionCheckSVar$ X | ConditionSVarCompare$ GTY | Defined$ Player.IsRemembered | Choices$ Creature.YouCtrl+cmcEQX | ChoiceTitle$ Choose a creature with the highest converted mana cost to sacrifice | References$ X,Y | Mandatory$ True | RememberChosen$ True | SubAbility$ WalkerHighCMC
-SVar:WalkerHighCMC:DB$ ChooseCard | ConditionCheckSVar$ Y | ConditionSVarCompare$ GTX | Defined$ Player.IsRemembered | Choices$ Planeswalker.YouCtrl+cmcEQY | ChoiceTitle$ Choose a planeswalker with the highest converted mana cost to sacrifice | References$ X,Y | Mandatory$ True | RememberChosen$ True | SubAbility$ TieCMC
-SVar:TieCMC:DB$ ChooseCard | ConditionCheckSVar$ X | ConditionSVarCompare$ EQY | Defined$ Player.IsRemembered | Choices$ Creature.YouCtrl+cmcEQX,Planeswalker.YouCtrl+cmcEQX | ChoiceTitle$ Choose a creature or planeswalker with the highest converted mana cost to sacrifice | References$ X,Y | Mandatory$ True | RememberChosen$ True
-SVar:DBSac:DB$ SacrificeAll | ValidCards$ Card.IsRemembered | SubAbility$ DBCleanup
+A:SP$ RepeatEach | Cost$ 2 B | RepeatPlayers$ Player.Opponent | RepeatSubAbility$ CreatureHighCMC | SubAbility$ DBSac | StackDescription$ Each opponent | SpellDescription$ Each opponent sacrifices a creature or planeswalker with the highest converted mana cost among creatures and planeswalkers they control.
+SVar:CreatureHighCMC:DB$ ChooseCard | ConditionCheckSVar$ X | ConditionSVarCompare$ GTY | Defined$ Player.IsRemembered | Choices$ Creature.RememberedPlayerCtrl+cmcEQX | ChoiceTitle$ Choose a creature with the highest converted mana cost to sacrifice | References$ X,Y | Mandatory$ True | RememberChosen$ True | SubAbility$ WalkerHighCMC
+SVar:WalkerHighCMC:DB$ ChooseCard | ConditionCheckSVar$ Y | ConditionSVarCompare$ GTX | Defined$ Player.IsRemembered | Choices$ Planeswalker.RememberedPlayerCtrl+cmcEQY | ChoiceTitle$ Choose a planeswalker with the highest converted mana cost to sacrifice | References$ X,Y | Mandatory$ True | RememberChosen$ True | SubAbility$ TieCMC
+SVar:TieCMC:DB$ ChooseCard | ConditionCheckSVar$ X | ConditionSVarCompare$ EQY | Defined$ Player.IsRemembered | Choices$ Creature.RememberedPlayerCtrl+cmcEQX,Planeswalker.RememberedPlayerCtrl+cmcEQX | ChoiceTitle$ Choose a creature or planeswalker with the highest converted mana cost to sacrifice | References$ X,Y | Mandatory$ True | RememberChosen$ True
+SVar:DBSac:DB$ SacrificeAll | ValidCards$ Card.IsRemembered | SubAbility$ DBCleanup | StackDescription$ sacrifices a creature or planeswalker with the highest converted mana cost among creatures and planeswalkers they control.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearChosen$ True
 SVar:X:Count$HighestCMC_Creature.RememberedPlayerCtrl+inZoneBattlefield
 SVar:Y:Count$HighestCMC_Planeswalker.RememberedPlayerCtrl+inZoneBattlefield