diff --git a/forge-gui/res/cardsfolder/a/amber_prison.txt b/forge-gui/res/cardsfolder/a/amber_prison.txt
index bd70ac0dcb3..edba06b3af9 100644
--- a/forge-gui/res/cardsfolder/a/amber_prison.txt
+++ b/forge-gui/res/cardsfolder/a/amber_prison.txt
@@ -3,7 +3,7 @@ ManaCost:4
 Types:Artifact
 K:You may choose not to untap CARDNAME during your untap step.
 A:AB$ Tap | Cost$ 4 T | ValidTgts$ Artifact,Creature,Land | TgtPrompt$ Select target artifact, creature, or land | SubAbility$ DBEffect | SpellDescription$ Tap target artifact, creature, or land. That permanent doesn't untap during its controller's untap step for as long as CARDNAME remains tapped. | StackDescription$ SpellDescription
-SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilUntaps
+SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilUntaps | ForgetOnMoved$ Battlefield
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ Remembered doesn't untap during its controller's untap step for as long as EFFECTSOURCE remains tapped.
 AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/amber_prison.jpg
diff --git a/forge-gui/res/cardsfolder/b/bontus_last_reckoning.txt b/forge-gui/res/cardsfolder/b/bontus_last_reckoning.txt
index 58f758b314f..635264769f2 100644
--- a/forge-gui/res/cardsfolder/b/bontus_last_reckoning.txt
+++ b/forge-gui/res/cardsfolder/b/bontus_last_reckoning.txt
@@ -3,7 +3,7 @@ ManaCost:1 B B
 Types:Sorcery
 A:SP$ DestroyAll | Cost$ 1 B B | ValidCards$ Creature | SubAbility$ DBNoUntap | SpellDescription$ Destroy all creatures.
 SVar:DBNoUntap:DB$ Effect | StaticAbilities$ DontUntap | Triggers$ RemoveEffect | SVars$ ExileEffect | Duration$ Permanent | Name$ Bontu's Last Reckoning Effect | SpellDescription$ Lands you control don't untap during your next untap step.
-SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Land.YouCtrl | AddHiddenKeyword$ This card doesn't untap during your next untap step.
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Land.YouCtrl | CantUntap$ True | Description$ Lands you control don't untap during your next untap step.
 SVar:RemoveEffect:Mode$ Phase | Phase$ Untap | ValidPlayer$ You | TriggerZones$ Command | Static$ True | Execute$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile 
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bontus_last_reckoning.jpg
diff --git a/forge-gui/res/cardsfolder/d/deserters_quarters.txt b/forge-gui/res/cardsfolder/d/deserters_quarters.txt
index 3f912b0b74c..48f2b536621 100644
--- a/forge-gui/res/cardsfolder/d/deserters_quarters.txt
+++ b/forge-gui/res/cardsfolder/d/deserters_quarters.txt
@@ -3,7 +3,7 @@ ManaCost:2
 Types:Artifact
 K:You may choose not to untap CARDNAME during your untap step.
 A:AB$ Tap | Cost$ 6 T | ValidTgts$ Creature | SubAbility$ DBEffect | SpellDescription$ Tap target creature. It doesn't untap during its controller's untap step for as long as Deserter's Quarters remains tapped. | StackDescription$ SpellDescription
-SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilUntaps
+SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilUntaps | ForgetOnMoved$ Battlefield
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ Remembered doesn't untap during its controller's untap step for as long as EFFECTSOURCE remains tapped.
 AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/deserters_quarters.jpg
diff --git a/forge-gui/res/cardsfolder/d/dread_wight.txt b/forge-gui/res/cardsfolder/d/dread_wight.txt
index c9f107e44e7..37de1d02f11 100644
--- a/forge-gui/res/cardsfolder/d/dread_wight.txt
+++ b/forge-gui/res/cardsfolder/d/dread_wight.txt
@@ -5,7 +5,7 @@ PT:3/4
 T:Mode$ Phase | Phase$ EndCombat | Execute$ TrigCounter | TriggerDescription$ At end of combat, put a paralyzation counter on each creature blocking or blocked by CARDNAME and tap those creatures. Each of those creatures doesn't untap during its controller's untap step for as long as it has a paralyzation counter on it. Each of those creatures gains "{4}: Remove a paralyzation counter from this creature."
 SVar:TrigCounter:DB$ PutCounterAll | CounterType$ PARALYZATION | CounterNum$ 1 | ValidCards$ Creature.blockedBySource,Creature.blockingSource | SubAbility$ DBTap
 SVar:DBTap:DB$ TapAll | ValidCards$ Creature.blockedBySource,Creature.blockingSource | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ Valid Creature.blockedBySource,Creature.blockingSource | StaticAbilities$ DontUntap | Duration$ UntilUntaps | ConditionPresent$ Creature.blockedBySource,Creature.blockingSource | SubAbility$ DBAnimate
+SVar:DBEffect:DB$ Effect | RememberObjects$ Valid Creature.blockedBySource,Creature.blockingSource | StaticAbilities$ DontUntap | Duration$ UntilUntaps | ConditionPresent$ Creature.blockedBySource,Creature.blockingSource | SubAbility$ DBAnimate | ForgetOnMoved$ Battlefield
 SVar:DBAnimate:DB$ AnimateAll | ValidCards$ Creature.blockedBySource,Creature.blockingSource | Abilities$ ABRemoveCounter | Permanent$ True
 SVar:ABRemoveCounter:AB$ RemoveCounter | Defined$ Self | Cost$ 4 | CounterType$ PARALYZATION | CounterNum$ 1 | SpellDescription$ Remove a paralyzation counter from this creature.
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered+counters_GE1_PARALYZATION | CantUntap$ True | Description$ Each of those creatures doesn't untap during its controller's untap step for as long as it has a paralyzation counter on it.
diff --git a/forge-gui/res/cardsfolder/d/dungeon_geists.txt b/forge-gui/res/cardsfolder/d/dungeon_geists.txt
index 03bac39b205..9117fecb913 100644
--- a/forge-gui/res/cardsfolder/d/dungeon_geists.txt
+++ b/forge-gui/res/cardsfolder/d/dungeon_geists.txt
@@ -5,7 +5,7 @@ PT:3/3
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap target creature an opponent controls. That creature doesn't untap for as long as you control CARDNAME.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilLoseControlOfHost
+SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilLoseControlOfHost | ForgetOnMoved$ Battlefield
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ Remembered doesn't untap for as long as you control EFFECTSOURCE.
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dungeon_geists.jpg
diff --git a/forge-gui/res/cardsfolder/e/exhaustion.txt b/forge-gui/res/cardsfolder/e/exhaustion.txt
index caf50193f4f..de421ff495f 100644
--- a/forge-gui/res/cardsfolder/e/exhaustion.txt
+++ b/forge-gui/res/cardsfolder/e/exhaustion.txt
@@ -2,7 +2,7 @@ Name:Exhaustion
 ManaCost:2 U
 Types:Sorcery
 A:SP$ Effect | Cost$ 2 U | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | IsCurse$ True | StaticAbilities$ DontUntap | Triggers$ RemoveEffect | SVars$ ExileEffect | RememberObjects$ Targeted | Duration$ Permanent | Name$ Exhaustion Effect | AILogic$ KeepOppCreatsLandsTapped | SpellDescription$ Creatures and lands target opponent controls don't untap during their next untap step.
-SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.RememberedPlayerCtrl,Land.RememberedPlayerCtrl | AddHiddenKeyword$ This card doesn't untap during your next untap step.
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.RememberedPlayerCtrl,Land.RememberedPlayerCtrl | CantUntap$ True | Description$ Creatures and lands target opponent controls don't untap during their next untap step.
 SVar:RemoveEffect:Mode$ Phase | Phase$ Untap | ValidPlayer$ Player.IsRemembered | TriggerZones$ Command | Static$ True | Execute$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:Picture:http://www.wizards.com/global/images/magic/general/exhaustion.jpg
diff --git a/forge-gui/res/cardsfolder/h/hazorets_undying_fury.txt b/forge-gui/res/cardsfolder/h/hazorets_undying_fury.txt
index e8af5e71cad..06922bd1ae8 100644
--- a/forge-gui/res/cardsfolder/h/hazorets_undying_fury.txt
+++ b/forge-gui/res/cardsfolder/h/hazorets_undying_fury.txt
@@ -5,9 +5,9 @@ A:SP$ Shuffle | Cost$ 4 R R | Defined$ You | SubAbility$ DBMill | SpellDescripti
 SVar:DBMill:DB$ Mill | Defined$ You | NumCards$ 4 | Destination$ Exile | RememberMilled$ True | SubAbility$ DBPlay
 SVar:DBPlay:DB$ Play | Valid$ Card.nonLand+IsRemembered+YouOwn+cmcLE5 | ValidZone$ Exile | Controller$ You | WithoutManaCost$ True | Optional$ True | Amount$ All | SubAbility$ DBNoUntap
 SVar:DBNoUntap:DB$ Effect | StaticAbilities$ DontUntap | Triggers$ RemoveEffect | SVars$ ExileEffect | Duration$ Permanent | Name$ Hazoret's Undying Fury Effect | SubAbility$ DBCleanup | SpellDescription$ Lands you control don't untap during your next untap step.
-SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Land.YouCtrl | AddHiddenKeyword$ This card doesn't untap during your next untap step.
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Land.YouCtrl | CantUntap$ True | Description$ Lands you control don't untap during your next untap step.
 SVar:RemoveEffect:Mode$ Phase | Phase$ Untap | ValidPlayer$ You | TriggerZones$ Command | Static$ True | Execute$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hazorets_undying_fury.jpg
-Oracle:Shuffle your library, then exile the top four cards. You may cast any number of nonland cards with converted mana cost 5 or less from among them without paying their mana costs. Lands you control don't untap during your next untap step.
\ No newline at end of file
+Oracle:Shuffle your library, then exile the top four cards. You may cast any number of nonland cards with converted mana cost 5 or less from among them without paying their mana costs. Lands you control don't untap during your next untap step.
diff --git a/forge-gui/res/cardsfolder/i/ice_floe.txt b/forge-gui/res/cardsfolder/i/ice_floe.txt
index ab674d9e54f..03fa5ba7206 100644
--- a/forge-gui/res/cardsfolder/i/ice_floe.txt
+++ b/forge-gui/res/cardsfolder/i/ice_floe.txt
@@ -3,7 +3,7 @@ ManaCost:no cost
 Types:Land
 K:You may choose not to untap CARDNAME during your untap step.
 A:AB$ Tap | Cost$ T | ValidTgts$ Creature.withoutFlying+attackingYou | TgtPrompt$ Select target creature without flying that's attacking you | SubAbility$ DBEffect | SpellDescription$ Tap target creature without flying that's attacking you. It doesn't untap during its controller's untap step for as long as CARDNAME remains tapped. | StackDescription$ SpellDescription
-SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilUntaps
+SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilUntaps | ForgetOnMoved$ Battlefield
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ Remembered doesn't untap during its controller's untap step for as long as EFFECTSOURCE remains tapped.
 AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ice_floe.jpg
diff --git a/forge-gui/res/cardsfolder/i/icefall_regent.txt b/forge-gui/res/cardsfolder/i/icefall_regent.txt
index 369cfb07d61..5768f12d887 100644
--- a/forge-gui/res/cardsfolder/i/icefall_regent.txt
+++ b/forge-gui/res/cardsfolder/i/icefall_regent.txt
@@ -5,7 +5,7 @@ PT:4/3
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap target creature an opponent controls. That creature doesn't untap for as long as you control CARDNAME.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilLoseControlOfHost
+SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilLoseControlOfHost | ForgetOnMoved$ Battlefield
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ Remembered doesn't untap for as long as you control EFFECTSOURCE.
 S:Mode$ RaiseCost | ValidTarget$ Card.Self | Activator$ Opponent | Type$ Spell | Amount$ 2 | Description$ Spells your opponents cast that target CARDNAME cost {2} more to cast.
 SVar:PlayMain1:TRUE
diff --git a/forge-gui/res/cardsfolder/i/imaginary_threats.txt b/forge-gui/res/cardsfolder/i/imaginary_threats.txt
index 98bd9185ef8..82fcadc50d8 100644
--- a/forge-gui/res/cardsfolder/i/imaginary_threats.txt
+++ b/forge-gui/res/cardsfolder/i/imaginary_threats.txt
@@ -4,10 +4,10 @@ Types:Instant
 A:SP$ Effect | Cost$ 2 U U | Name$ Imaginary Threats Effect 1 | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | StaticAbilities$ MustAttack | References$ MustAttack | RememberObjects$ Targeted | SubAbility$ DBEffect | SpellDescription$ Creatures target player controls attack this turn if able.
 SVar:MustAttack:Mode$ Continuous | EffectZone$ Command | Affected$ Creature.RememberedPlayerCtrl | AddHiddenKeyword$ CARDNAME attacks each combat if able. | Description$ Creatures target opponent controls attack this turn if able.
 SVar:DBEffect:DB$ Effect | IsCurse$ True | StaticAbilities$ DontUntap | Triggers$ RemoveEffect | SVars$ ExileEffect | Duration$ Permanent | RememberObjects$ Targeted | Name$ Imaginary Threats Effect 2 | SubAbility$ DBCleanup | SpellDescription$ During that player's next untap step, creatures they control don't untap.
-SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.RememberedPlayerCtrl | AddHiddenKeyword$ This card doesn't untap during your next untap step. | Description$ Creatures target opponent controls don't untap during their next untap step.
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.RememberedPlayerCtrl | CantUntap$ True | Description$ Creatures target opponent controls don't untap during their next untap step.
 SVar:RemoveEffect:Mode$ Phase | Phase$ Untap | ValidPlayer$ Player.IsRemembered | TriggerZones$ Command | Static$ True | Execute$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
 K:Cycling:2
 SVar:Picture:http://www.wizards.com/global/images/magic/general/imaginary_threats.jpg
-Oracle:Creatures target opponent controls attack this turn if able. During that player's next untap step, creatures they control don't untap.\nCycling {2} ({2}, Discard this card: Draw a card.)
\ No newline at end of file
+Oracle:Creatures target opponent controls attack this turn if able. During that player's next untap step, creatures they control don't untap.\nCycling {2} ({2}, Discard this card: Draw a card.)
diff --git a/forge-gui/res/cardsfolder/k/kefnets_last_word.txt b/forge-gui/res/cardsfolder/k/kefnets_last_word.txt
index ffd0f155a17..d7f4c017f8f 100644
--- a/forge-gui/res/cardsfolder/k/kefnets_last_word.txt
+++ b/forge-gui/res/cardsfolder/k/kefnets_last_word.txt
@@ -3,7 +3,7 @@ ManaCost:2 U U
 Types:Sorcery
 A:SP$ GainControl | Cost$ 2 U U | ValidTgts$ Artifact,Creature,Enchantment | TgtPrompt$ Select target artifact, creature, or enchantment | SubAbility$ DBNoUntap | SpellDescription$ Gain control of target artifact, creature or enchantment.
 SVar:DBNoUntap:DB$ Effect | StaticAbilities$ DontUntap | Triggers$ RemoveEffect | SVars$ ExileEffect | Duration$ Permanent | Name$ Kefnet's Last Word Effect | SpellDescription$ Lands you control don't untap during your next untap step.
-SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Land.YouCtrl | AddHiddenKeyword$ This card doesn't untap during your next untap step.
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Land.YouCtrl | CantUntap$ True | Description$ Lands you control don't untap during your next untap step.
 SVar:RemoveEffect:Mode$ Phase | Phase$ Untap | ValidPlayer$ You | TriggerZones$ Command | Static$ True | Execute$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kefnets_last_word.jpg
diff --git a/forge-gui/res/cardsfolder/k/kill_switch.txt b/forge-gui/res/cardsfolder/k/kill_switch.txt
index c6db23a988d..c618a5c715f 100644
--- a/forge-gui/res/cardsfolder/k/kill_switch.txt
+++ b/forge-gui/res/cardsfolder/k/kill_switch.txt
@@ -2,7 +2,7 @@ Name:Kill Switch
 ManaCost:3
 Types:Artifact
 A:AB$ TapAll | Cost$ 2 T | ValidCards$ Artifact.Other | SubAbility$ DBEffect | SpellDescription$ Tap all other artifacts. They don't untap during their controllers' untap steps for as long as CARDNAME remains tapped. | StackDescription$ SpellDescription
-SVar:DBEffect:DB$ Effect | RememberObjects$ Valid Artifact.Other | StaticAbilities$ DontUntap | Duration$ UntilUntaps
+SVar:DBEffect:DB$ Effect | RememberObjects$ Valid Artifact.Other | StaticAbilities$ DontUntap | Duration$ UntilUntaps | ForgetOnMoved$ Battlefield
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ Remembered doesn't untap during its controller's untap step for as long as EFFECTSOURCE remains tapped.
 AI:RemoveDeck:All
 AI:RemoveDeck:Random
diff --git a/forge-gui/res/cardsfolder/m/mana_leech.txt b/forge-gui/res/cardsfolder/m/mana_leech.txt
index 420d7078477..f154bfac9f2 100644
--- a/forge-gui/res/cardsfolder/m/mana_leech.txt
+++ b/forge-gui/res/cardsfolder/m/mana_leech.txt
@@ -4,7 +4,7 @@ Types:Creature Leech
 PT:1/1
 K:You may choose not to untap CARDNAME during your untap step.
 A:AB$ Tap | Cost$ T | ValidTgts$ Land | SubAbility$ DBEffect | SpellDescription$ Tap target land. It doesn't untap during its controller's untap step for as long as CARDNAME remains tapped. | StackDescription$ SpellDescription
-SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilUntaps
+SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilUntaps | ForgetOnMoved$ Battlefield
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ Remembered doesn't untap during its controller's untap step for as long as EFFECTSOURCE remains tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mana_leech.jpg
 Oracle:You may choose not to untap Mana Leech during your untap step.\n{T}: Tap target land. It doesn't untap during its controller's untap step for as long as Mana Leech remains tapped.
diff --git a/forge-gui/res/cardsfolder/m/mole_worms.txt b/forge-gui/res/cardsfolder/m/mole_worms.txt
index c2ce512021b..e4421711b06 100644
--- a/forge-gui/res/cardsfolder/m/mole_worms.txt
+++ b/forge-gui/res/cardsfolder/m/mole_worms.txt
@@ -4,7 +4,7 @@ Types:Creature Worm
 PT:1/1
 K:You may choose not to untap CARDNAME during your untap step.
 A:AB$ Tap | Cost$ T | ValidTgts$ Land | SubAbility$ DBEffect | SpellDescription$ Tap target land. It doesn't untap during its controller's untap step for as long as CARDNAME remains tapped. | StackDescription$ SpellDescription
-SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilUntaps
+SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilUntaps | ForgetOnMoved$ Battlefield
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ Remembered doesn't untap during its controller's untap step for as long as EFFECTSOURCE remains tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mole_worms.jpg
 Oracle:You may choose not to untap Mole Worms during your untap step.\n{T}: Tap target land. It doesn't untap during its controller's untap step for as long as Mole Worms remains tapped.
diff --git a/forge-gui/res/cardsfolder/n/neko_te.txt b/forge-gui/res/cardsfolder/n/neko_te.txt
index cdd71b9a039..f25b4b20feb 100644
--- a/forge-gui/res/cardsfolder/n/neko_te.txt
+++ b/forge-gui/res/cardsfolder/n/neko_te.txt
@@ -4,7 +4,7 @@ Types:Artifact Equipment
 K:Equip:2
 T:Mode$ DamageDone | ValidSource$ Card.EquippedBy | ValidTarget$ Creature | Execute$ TrigNekoTeTap | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals damage to a creature, tap that creature. That creature doesn't untap during its controller's untap step for as long as CARDNAME remains on the battlefield.
 SVar:TrigNekoTeTap:DB$ Tap | Defined$ TriggeredTarget | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ TriggeredTarget | StaticAbilities$ DontUntap | Duration$ UntilLoseControlOfHost
+SVar:DBEffect:DB$ Effect | RememberObjects$ TriggeredTarget | StaticAbilities$ DontUntap | Duration$ UntilLoseControlOfHost | ForgetOnMoved$ Battlefield
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ Remembered doesn't untap for as long as you control EFFECTSOURCE.
 T:Mode$ DamageDone | ValidSource$ Card.EquippedBy | ValidTarget$ Player | Execute$ TrigNekoTeLoseLife | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals damage to a player, that player loses 1 life.
 SVar:TrigNekoTeLoseLife:DB$ LoseLife | LifeAmount$ 1 | Defined$ TriggeredTarget
diff --git a/forge-gui/res/cardsfolder/o/oketras_last_mercy.txt b/forge-gui/res/cardsfolder/o/oketras_last_mercy.txt
index 91d513c2dc5..0565daf24c9 100644
--- a/forge-gui/res/cardsfolder/o/oketras_last_mercy.txt
+++ b/forge-gui/res/cardsfolder/o/oketras_last_mercy.txt
@@ -3,7 +3,7 @@ ManaCost:1 W W
 Types:Sorcery
 A:SP$ SetLife | Cost$ 1 W W | Defined$ You | LifeAmount$ X | References$ X | SubAbility$ DBNoUntap | SpellDescription$ Your life total becomes equal to your starting life total.
 SVar:DBNoUntap:DB$ Effect | StaticAbilities$ DontUntap | Triggers$ RemoveEffect | SVars$ ExileEffect | Duration$ Permanent | Name$ Oketra's Last Mercy Effect | SpellDescription$ Lands you control don't untap during your next untap step.
-SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Land.YouCtrl | AddHiddenKeyword$ This card doesn't untap during your next untap step.
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Land.YouCtrl | CantUntap$ True | Description$ Lands you control don't untap during your next untap step.
 SVar:RemoveEffect:Mode$ Phase | Phase$ Untap | ValidPlayer$ You | TriggerZones$ Command | Static$ True | Execute$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile 
 SVar:X:Count$YourStartingLife
diff --git a/forge-gui/res/cardsfolder/p/phyrexian_gremlins.txt b/forge-gui/res/cardsfolder/p/phyrexian_gremlins.txt
index da8767d37b5..1f581314b2c 100644
--- a/forge-gui/res/cardsfolder/p/phyrexian_gremlins.txt
+++ b/forge-gui/res/cardsfolder/p/phyrexian_gremlins.txt
@@ -4,7 +4,7 @@ Types:Creature Gremlin
 PT:1/1
 K:You may choose not to untap CARDNAME during your untap step.
 A:AB$ Tap | Cost$ T | ValidTgts$ Artifact | SubAbility$ DBEffect | SpellDescription$ Tap target artifact. It doesn't untap during its controller's untap step for as long as CARDNAME remains tapped. | StackDescription$ SpellDescription
-SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilUntaps
+SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilUntaps | ForgetOnMoved$ Battlefield
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ Remembered doesn't untap during its controller's untap step for as long as EFFECTSOURCE remains tapped.
 AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/phyrexian_gremlins.jpg
diff --git a/forge-gui/res/cardsfolder/r/rhonass_last_stand.txt b/forge-gui/res/cardsfolder/r/rhonass_last_stand.txt
index 0bf96983a55..bbd90d6a6db 100644
--- a/forge-gui/res/cardsfolder/r/rhonass_last_stand.txt
+++ b/forge-gui/res/cardsfolder/r/rhonass_last_stand.txt
@@ -3,7 +3,7 @@ ManaCost:G G
 Types:Sorcery
 A:SP$ Token | Cost$ G G | TokenAmount$ 1 | TokenScript$ g_5_4_snake | TokenOwner$ You | LegacyImage$ g 5 4 snake hou | SubAbility$ DBNoUntap | SpellDescription$ Create a 5/4 green Snake creature token.
 SVar:DBNoUntap:DB$ Effect | StaticAbilities$ DontUntap | Triggers$ RemoveEffect | SVars$ ExileEffect | Duration$ Permanent | Name$ Rhonas's Last Stand Effect | SpellDescription$ Lands you control don't untap during your next untap step.
-SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Land.YouCtrl | AddHiddenKeyword$ This card doesn't untap during your next untap step.
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Land.YouCtrl | CantUntap$ True | Description$ Lands you control don't untap during your next untap step.
 SVar:RemoveEffect:Mode$ Phase | Phase$ Untap | ValidPlayer$ You | TriggerZones$ Command | Static$ True | Execute$ ExileEffect
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
 DeckHas:Ability$Token
diff --git a/forge-gui/res/cardsfolder/r/rust_tick.txt b/forge-gui/res/cardsfolder/r/rust_tick.txt
index b63870bc4b8..a14bb6d5471 100644
--- a/forge-gui/res/cardsfolder/r/rust_tick.txt
+++ b/forge-gui/res/cardsfolder/r/rust_tick.txt
@@ -4,7 +4,7 @@ Types:Artifact Creature Insect
 PT:1/3
 K:You may choose not to untap CARDNAME during your untap step.
 A:AB$ Tap | Cost$ 1 T | ValidTgts$ Artifact | SubAbility$ DBEffect | SpellDescription$ Tap target artifact. It doesn't untap during its controller's untap step for as long as CARDNAME remains tapped. | StackDescription$ SpellDescription
-SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilUntaps
+SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilUntaps | ForgetOnMoved$ Battlefield
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ Remembered doesn't untap during its controller's untap step for as long as EFFECTSOURCE remains tapped.
 AI:RemoveDeck:Random
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rust_tick.jpg
diff --git a/forge-gui/res/cardsfolder/s/sand_squid.txt b/forge-gui/res/cardsfolder/s/sand_squid.txt
index b23a939f094..8fa902adf25 100644
--- a/forge-gui/res/cardsfolder/s/sand_squid.txt
+++ b/forge-gui/res/cardsfolder/s/sand_squid.txt
@@ -5,7 +5,7 @@ PT:2/2
 K:Islandwalk
 K:You may choose not to untap CARDNAME during your untap step.
 A:AB$ Tap | Cost$ T | ValidTgts$ Creature | SubAbility$ DBEffect | SpellDescription$ Tap target creature. That creature doesn't untap during its controller's untap step for as long as CARDNAME remains tapped. | StackDescription$ SpellDescription
-SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilUntaps
+SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilUntaps | ForgetOnMoved$ Battlefield
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ Remembered doesn't untap during its controller's untap step for as long as EFFECTSOURCE remains tapped.
 AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sand_squid.jpg
diff --git a/forge-gui/res/cardsfolder/s/shipbreaker_kraken.txt b/forge-gui/res/cardsfolder/s/shipbreaker_kraken.txt
index 6c76bba6267..cd7ac6763aa 100644
--- a/forge-gui/res/cardsfolder/s/shipbreaker_kraken.txt
+++ b/forge-gui/res/cardsfolder/s/shipbreaker_kraken.txt
@@ -5,7 +5,7 @@ PT:6/6
 K:Monstrosity:4:6 U U
 T:Mode$ BecomeMonstrous | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ When CARDNAME becomes monstrous, tap up to four target creatures. Those creatures don't untap during their controllers' untap steps for as long as you control CARDNAME.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ 4 | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilLoseControlOfHost
+SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilLoseControlOfHost | ForgetOnMoved$ Battlefield
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ Remembered doesn't untap for as long as you control EFFECTSOURCE.
 DeckHas:Ability$Counters
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shipbreaker_kraken.jpg
diff --git a/forge-gui/res/cardsfolder/s/somnophore.txt b/forge-gui/res/cardsfolder/s/somnophore.txt
index ef49ebc3b78..c9357dafa86 100644
--- a/forge-gui/res/cardsfolder/s/somnophore.txt
+++ b/forge-gui/res/cardsfolder/s/somnophore.txt
@@ -5,7 +5,7 @@ PT:2/2
 K:Flying
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME deals damage to a player, tap target creature that player controls. That creature doesn't untap during its controller's untap step for as long as CARDNAME remains on the battlefield.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature | TargetsWithDefinedController$ TriggeredTarget | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilHostLeavesPlay
+SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilHostLeavesPlay | ForgetOnMoved$ Battlefield
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ Remembered doesn't untap during its controller's untap step for as long as EFFECTSOURCE remains on the battlefield.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/somnophore.jpg
 Oracle:Flying\nWhenever Somnophore deals damage to a player, tap target creature that player controls. That creature doesn't untap during its controller's untap step for as long as Somnophore remains on the battlefield.
diff --git a/forge-gui/res/cardsfolder/t/thalakos_dreamsower.txt b/forge-gui/res/cardsfolder/t/thalakos_dreamsower.txt
index 7521390c9da..3b06d38ac7c 100644
--- a/forge-gui/res/cardsfolder/t/thalakos_dreamsower.txt
+++ b/forge-gui/res/cardsfolder/t/thalakos_dreamsower.txt
@@ -6,7 +6,7 @@ K:Shadow
 K:You may choose not to untap CARDNAME during your untap step.
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME deals damage to an opponent, tap target creature. That creature doesn't untap during its controller's untap step for as long as CARDNAME remains tapped.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilUntaps
+SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilUntaps | ForgetOnMoved$ Battlefield
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ Remembered doesn't untap during its controller's untap step for as long as EFFECTSOURCE remains tapped.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thalakos_dreamsower.jpg
 Oracle:Shadow (This creature can block or be blocked by only creatures with shadow.)\nYou may choose not to untap Thalakos Dreamsower during your untap step.\nWhenever Thalakos Dreamsower deals damage to an opponent, tap target creature. That creature doesn't untap during its controller's untap step for as long as Thalakos Dreamsower remains tapped.
diff --git a/forge-gui/res/cardsfolder/t/tidebinder_mage.txt b/forge-gui/res/cardsfolder/t/tidebinder_mage.txt
index be0d8366131..6d70ed281a1 100644
--- a/forge-gui/res/cardsfolder/t/tidebinder_mage.txt
+++ b/forge-gui/res/cardsfolder/t/tidebinder_mage.txt
@@ -4,7 +4,7 @@ Types:Creature Merfolk Wizard
 PT:2/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigTap | TriggerDescription$ When CARDNAME enters the battlefield, tap target red or green creature an opponent controls. That creature doesn't untap during its controller's untap step for as long as you control CARDNAME.
 SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.Red+OppCtrl,Creature.Green+OppCtrl | TgtPrompt$ Choose target red or green creature an opponent controls. | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilLoseControlOfHost
+SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilLoseControlOfHost | ForgetOnMoved$ Battlefield
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ Remembered doesn't untap for as long as you control EFFECTSOURCE.
 SVar:PlayMain1:TRUE
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tidebinder_mage.jpg
diff --git a/forge-gui/res/cardsfolder/t/time_of_ice.txt b/forge-gui/res/cardsfolder/t/time_of_ice.txt
index 3bdfcc9b72e..8baf59eab9a 100644
--- a/forge-gui/res/cardsfolder/t/time_of_ice.txt
+++ b/forge-gui/res/cardsfolder/t/time_of_ice.txt
@@ -3,7 +3,7 @@ ManaCost:3 U
 Types:Enchantment Saga
 K:Saga:3:DBTap,DBTap,DBChangeZoneAll
 SVar:DBTap:DB$ Tap | ValidTgts$ Creature.OppCtrl | TgtPrompt$ Select target creature an opponent controls | SubAbility$ DBEffect | SpellDescription$ Tap target creature an opponent controls. It doesn't untap during its controller's untap step for as long as you control CARDNAME.
-SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilLoseControlOfHost
+SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilLoseControlOfHost | ForgetOnMoved$ Battlefield
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ Remembered doesn't untap for as long as you control EFFECTSOURCE.
 SVar:DBChangeZoneAll:DB$ ChangeZoneAll | ChangeType$ Creature.tapped | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return all tapped creatures to their owners' hands.
 SVar:PlayMain1:TRUE
diff --git a/forge-gui/res/cardsfolder/w/wall_of_stolen_identity.txt b/forge-gui/res/cardsfolder/w/wall_of_stolen_identity.txt
index 461b162e213..16d4155add2 100644
--- a/forge-gui/res/cardsfolder/w/wall_of_stolen_identity.txt
+++ b/forge-gui/res/cardsfolder/w/wall_of_stolen_identity.txt
@@ -6,7 +6,7 @@ K:ETBReplacement:Copy:DBCopy:Optional
 SVar:DBCopy:DB$ Clone | Choices$ Creature.Other | AddTypes$ Wall | PumpKeywords$ Defender | AiChoiceLogic$ BestOppCtrl | SubAbility$ DBTrigger | RememberCloneOrigin$ True | SpellDescription$ You may have CARDNAME enter the battlefield as a copy of any creature on the battlefield, except it's a wall in addition to its other types and it has defender. When you do, tap the copied creature and it doesn't untap during its controller's untap step for as long as you control CARDNAME.
 SVar:DBTrigger:DB$ ImmediateTrigger | Execute$ DBTap | RememberObjects$ RememberedCard | SubAbility$ DBCleanup | TriggerDescription$ When you do, tap the copied creature and it doesn't untap during its controller's untap step for as long as you control CARDNAME.
 SVar:DBTap:DB$ Tap | Defined$ DelayTriggerRemembered | SubAbility$ DBEffect
-SVar:DBEffect:DB$ Effect | RememberObjects$ DelayTriggerRemembered | StaticAbilities$ DontUntap | Duration$ UntilHostLeavesPlay
+SVar:DBEffect:DB$ Effect | RememberObjects$ DelayTriggerRemembered | StaticAbilities$ DontUntap | Duration$ UntilHostLeavesPlay | ForgetOnMoved$ Battlefield
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ Remembered doesn't untap during its controller's untap step for as long as you control EFFECTSOURCE.
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 Oracle:You may have Wall of Stolen Identity enter the battlefield as a copy of any creature on the battlefield, except it's a wall in addition to its other types and it has defender. When you do, tap the copied creature and it doesn't untap during its controller's untap step for as long as you control Wall of Stolen Identity.
diff --git a/forge-gui/res/cardsfolder/w/whip_vine.txt b/forge-gui/res/cardsfolder/w/whip_vine.txt
index 7d1679cb252..ed4d5c09217 100644
--- a/forge-gui/res/cardsfolder/w/whip_vine.txt
+++ b/forge-gui/res/cardsfolder/w/whip_vine.txt
@@ -6,7 +6,7 @@ K:Defender
 K:Reach
 K:You may choose not to untap CARDNAME during your untap step.
 A:AB$ Tap | Cost$ T | ValidTgts$ Creature.withFlying+blockedBySource | TgtPrompt$ Select target creature with flying blocked by Whip Vine | SubAbility$ DBEffect | SpellDescription$ Tap target creature with flying blocked by CARDNAME. That creature doesn't untap during its controller's untap step for as long as CARDNAME remains tapped. | StackDescription$ SpellDescription
-SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilUntaps
+SVar:DBEffect:DB$ Effect | RememberObjects$ Targeted | StaticAbilities$ DontUntap | Duration$ UntilUntaps | ForgetOnMoved$ Battlefield
 SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ Remembered doesn't untap during its controller's untap step for as long as EFFECTSOURCE remains tapped.
 AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/whip_vine.jpg