diff --git a/forge-gui/res/cardsfolder/d/diminishing_returns.txt b/forge-gui/res/cardsfolder/d/diminishing_returns.txt
index 156095d3aad..07eec93112c 100644
--- a/forge-gui/res/cardsfolder/d/diminishing_returns.txt
+++ b/forge-gui/res/cardsfolder/d/diminishing_returns.txt
@@ -1,7 +1,7 @@
 Name:Diminishing Returns
 ManaCost:2 U U
 Types:Sorcery
-A:SP$ ChangeZoneAll | Cost$ 2 U U | ChangeType$ Card | Origin$ Graveyard,Hand | Destination$ Library | SubAbility$ DBExile | UseAllOriginZones$ True | SpellDescription$ Each player shuffles his or her hand and graveyard into his or her library.
+A:SP$ ChangeZoneAll | Cost$ 2 U U | ChangeType$ Card | Origin$ Graveyard,Hand | Destination$ Library | Shuffle$ True | Random$ True | SubAbility$ DBExile | UseAllOriginZones$ True | SpellDescription$ Each player shuffles his or her hand and graveyard into his or her library.
 SVar:DBExile:DB$ Mill | Defined$ You | NumCards$ 10 | Destination$ Exile | SubAbility$ DBDraw | SpellDescription$ You exile the top ten cards of your library.
 SVar:DBDraw:DB$ Draw | Defined$ Each | NumCards$ 7 | SpellDescription$ Then each player draws up to seven cards.
 SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/s/sway_of_the_stars.txt b/forge-gui/res/cardsfolder/s/sway_of_the_stars.txt
index 4aed475a61c..fd18f3dabe6 100644
--- a/forge-gui/res/cardsfolder/s/sway_of_the_stars.txt
+++ b/forge-gui/res/cardsfolder/s/sway_of_the_stars.txt
@@ -1,9 +1,9 @@
 Name:Sway of the Stars
 ManaCost:8 U U
 Types:Sorcery
-A:SP$ ChangeZoneAll | Cost$ 8 U U |  ChangeType$ Card | Origin$ Hand,Graveyard,Battlefield | Destination$ Library | SubAbility$ DBDraw | UseAllOriginZones$ True | SpellDescription$ 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.
-SVar:DBDraw:DB$ Draw | NumCards$ 7 | Defined$ Each | SubAbility$ DBSetLife
-SVar:DBSetLife:DB$ SetLife | Defined$ Each | LifeAmount$ 7
+A:SP$ ChangeZoneAll | Cost$ 8 U U |  ChangeType$ Card | Origin$ Hand,Graveyard,Battlefield | Destination$ Library | Random$ True | Shuffle$ True | SubAbility$ DBDraw | UseAllOriginZones$ True | SpellDescription$ 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.
+SVar:DBDraw:DB$ Draw | NumCards$ 7 | Defined$ Each | SubAbility$ DBSetLife | StackDescription$ None
+SVar:DBSetLife:DB$ SetLife | Defined$ Each | LifeAmount$ 7 | StackDescription$ None
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sway_of_the_stars.jpg
 Oracle: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.
diff --git a/forge-gui/res/cardsfolder/t/temporal_cascade.txt b/forge-gui/res/cardsfolder/t/temporal_cascade.txt
index f93062a56f7..ae29dbcb1ee 100644
--- a/forge-gui/res/cardsfolder/t/temporal_cascade.txt
+++ b/forge-gui/res/cardsfolder/t/temporal_cascade.txt
@@ -3,7 +3,7 @@ ManaCost:5 U U
 Types:Sorcery
 K:Entwine 2
 A:SP$ Charm | Cost$ 5 U U | Choices$ DBChangeZone,DBDraw | CharmNum$ 1 | SpellDescription$ Choose one - Each player shuffles his or her hand and graveyard into his or her library; or each player draws seven cards.
-SVar:DBChangeZone:DB$ ChangeZoneAll | ChangeType$ Card | Origin$ Hand,Graveyard | Destination$ Library | Shuffle$ True | UseAllOriginZones$ True | SpellDescription$ Each player shuffles his or her hand and graveyard into his or her library;
+SVar:DBChangeZone:DB$ ChangeZoneAll | ChangeType$ Card | Origin$ Hand,Graveyard | Destination$ Library | Shuffle$ True | Random$ True | UseAllOriginZones$ True | SpellDescription$ Each player shuffles his or her hand and graveyard into his or her library;
 SVar:DBDraw:DB$ Draw | NumCards$ 7 | Defined$ Each | SpellDescription$ Each player draws seven cards.
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/temporal_cascade.jpg
diff --git a/forge-gui/res/cardsfolder/t/time_spiral.txt b/forge-gui/res/cardsfolder/t/time_spiral.txt
index ddef271d1ab..9454974dd90 100644
--- a/forge-gui/res/cardsfolder/t/time_spiral.txt
+++ b/forge-gui/res/cardsfolder/t/time_spiral.txt
@@ -1,10 +1,10 @@
 Name:Time Spiral
 ManaCost:4 U U
 Types:Sorcery
-A:SP$ ChangeZoneAll | Cost$ 4 U U |  ChangeType$ Card | Origin$ Hand,Graveyard | Destination$ Library | Shuffle$ True  | SubAbility$ DBDraw | UseAllOriginZones$ True | SpellDescription$ Each player shuffles his or her graveyard and hand into his or her library, then draws seven cards. Exile CARDNAME. You untap up to six lands.
-SVar:DBDraw:DB$ Draw | NumCards$ 7 | Defined$ Each | SubAbility$ DBChange
-SVar:DBChange:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | SubAbility$ DBUntap
-SVar:DBUntap:DB$ Untap | UntapUpTo$ True | UntapType$ Land | Amount$ 6
+A:SP$ ChangeZoneAll | Cost$ 4 U U |  ChangeType$ Card | Origin$ Hand,Graveyard | Destination$ Library | Shuffle$ True | Random$ True | SubAbility$ DBDraw | UseAllOriginZones$ True | SpellDescription$ Each player shuffles his or her graveyard and hand into his or her library, then draws seven cards. Exile CARDNAME. You untap up to six lands.
+SVar:DBDraw:DB$ Draw | NumCards$ 7 | Defined$ Each | SubAbility$ DBChange | StackDescription$ None
+SVar:DBChange:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | SubAbility$ DBUntap | StackDescription$ None
+SVar:DBUntap:DB$ Untap | UntapUpTo$ True | UntapType$ Land | Amount$ 6 | StackDescription$ None
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/time_spiral.jpg
 Oracle: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.
diff --git a/forge-gui/res/cardsfolder/t/timetwister.txt b/forge-gui/res/cardsfolder/t/timetwister.txt
index 16c326fd4ab..9c2179eee95 100644
--- a/forge-gui/res/cardsfolder/t/timetwister.txt
+++ b/forge-gui/res/cardsfolder/t/timetwister.txt
@@ -1,7 +1,7 @@
 Name:Timetwister
 ManaCost:2 U
 Types:Sorcery
-A:SP$ ChangeZoneAll | Cost$ 2 U |  ChangeType$ Card | Origin$ Hand,Graveyard | Destination$ Library | Shuffle$ True  | SubAbility$ DBDraw | UseAllOriginZones$ True | SpellDescription$ Each player shuffles his or her graveyard and hand into his or her library, then draws seven cards.
+A:SP$ ChangeZoneAll | Cost$ 2 U |  ChangeType$ Card | Origin$ Hand,Graveyard | Destination$ Library | Shuffle$ True | Random$ True | SubAbility$ DBDraw | UseAllOriginZones$ True | SpellDescription$ Each player shuffles his or her graveyard and hand into his or her library, then draws seven cards.
 SVar:DBDraw:DB$ Draw | NumCards$ 7 | Defined$ Each
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/timetwister.jpg