diff --git a/forge-gui/res/cardsfolder/c/cinder_marsh.txt b/forge-gui/res/cardsfolder/c/cinder_marsh.txt
index dc193116a29..0a0e5e31eaa 100644
--- a/forge-gui/res/cardsfolder/c/cinder_marsh.txt
+++ b/forge-gui/res/cardsfolder/c/cinder_marsh.txt
@@ -4,6 +4,9 @@ Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBStayTapped | SpellDescription$ Add {B}. CARDNAME doesn't untap during your next untap step.
 A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBStayTapped | SpellDescription$ Add {R}. CARDNAME doesn't untap during your next untap step.
-SVar:DBStayTapped:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
+SVar:DBStayTapped:DB$ Effect | RememberObjects$ Self | StaticAbilities$ DontUntap | Duration$ Permanent | ForgetOnMoved$ Battlefield | Triggers$ RemoveEffect | SVars$ ExileEffect
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ EFFECTSOURCE 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/cinder_marsh.jpg
 Oracle:{T}: Add {C}.\n{T}: Add {B} or {R}. Cinder Marsh doesn't untap during your next untap step.
diff --git a/forge-gui/res/cardsfolder/c/cloudcrest_lake.txt b/forge-gui/res/cardsfolder/c/cloudcrest_lake.txt
index 98dc209fad4..892ffdd30ff 100644
--- a/forge-gui/res/cardsfolder/c/cloudcrest_lake.txt
+++ b/forge-gui/res/cardsfolder/c/cloudcrest_lake.txt
@@ -4,6 +4,9 @@ Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBStayTapped | SpellDescription$ Add {W}. CARDNAME doesn't untap during your next untap step.
 A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBStayTapped | SpellDescription$ Add {U}. CARDNAME doesn't untap during your next untap step.
-SVar:DBStayTapped:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
+SVar:DBStayTapped:DB$ Effect | RememberObjects$ Self | StaticAbilities$ DontUntap | Duration$ Permanent | ForgetOnMoved$ Battlefield | Triggers$ RemoveEffect | SVars$ ExileEffect
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ EFFECTSOURCE 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/cloudcrest_lake.jpg
 Oracle:{T}: Add {C}.\n{T}: Add {W} or {U}. Cloudcrest Lake doesn't untap during your next untap step.
diff --git a/forge-gui/res/cardsfolder/l/lantern_lit_graveyard.txt b/forge-gui/res/cardsfolder/l/lantern_lit_graveyard.txt
index 8b9faaaa4d0..cab211e0650 100644
--- a/forge-gui/res/cardsfolder/l/lantern_lit_graveyard.txt
+++ b/forge-gui/res/cardsfolder/l/lantern_lit_graveyard.txt
@@ -4,6 +4,9 @@ Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBStayTapped | SpellDescription$ Add {B}. CARDNAME doesn't untap during your next untap step.
 A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBStayTapped | SpellDescription$ Add {R}. CARDNAME doesn't untap during your next untap step.
-SVar:DBStayTapped:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
+SVar:DBStayTapped:DB$ Effect | RememberObjects$ Self | StaticAbilities$ DontUntap | Duration$ Permanent | ForgetOnMoved$ Battlefield | Triggers$ RemoveEffect | SVars$ ExileEffect
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ EFFECTSOURCE 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/lantern_lit_graveyard.jpg
 Oracle:{T}: Add {C}.\n{T}: Add {B} or {R}. Lantern-Lit Graveyard doesn't untap during your next untap step.
diff --git a/forge-gui/res/cardsfolder/m/mogg_hollows.txt b/forge-gui/res/cardsfolder/m/mogg_hollows.txt
index 26f800ac13a..4cb8455510d 100644
--- a/forge-gui/res/cardsfolder/m/mogg_hollows.txt
+++ b/forge-gui/res/cardsfolder/m/mogg_hollows.txt
@@ -2,8 +2,11 @@ Name:Mogg Hollows
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Mana | Cost$ T | Produced$ R | SpellDescription$ Add {R}. CARDNAME doesn't untap during your next untap step. | SubAbility$ DBPump
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}. CARDNAME doesn't untap during your next untap step. | SubAbility$ DBPump
-SVar:DBPump:DB$ Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
+A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBStayTapped | SpellDescription$ Add {R}. CARDNAME doesn't untap during your next untap step.
+A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBStayTapped | SpellDescription$ Add {G}. CARDNAME doesn't untap during your next untap step.
+SVar:DBStayTapped:DB$ Effect | RememberObjects$ Self | StaticAbilities$ DontUntap | Duration$ Permanent | ForgetOnMoved$ Battlefield | Triggers$ RemoveEffect | SVars$ ExileEffect
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ EFFECTSOURCE 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://magiccards.info/scans/en/br/45.jpg
 Oracle:{T}: Add {C}.\n{T}: Add {R} or {G}. Mogg Hollows doesn't untap during your next untap step.
diff --git a/forge-gui/res/cardsfolder/p/pinecrest_ridge.txt b/forge-gui/res/cardsfolder/p/pinecrest_ridge.txt
index 63a73bd6530..cd7b87551a2 100644
--- a/forge-gui/res/cardsfolder/p/pinecrest_ridge.txt
+++ b/forge-gui/res/cardsfolder/p/pinecrest_ridge.txt
@@ -4,6 +4,9 @@ Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Mana | Cost$ T | Produced$ R | SubAbility$ DBStayTapped | SpellDescription$ Add {R}. CARDNAME doesn't untap during your next untap step.
 A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBStayTapped | SpellDescription$ Add {G}. CARDNAME doesn't untap during your next untap step.
-SVar:DBStayTapped:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
+SVar:DBStayTapped:DB$ Effect | RememberObjects$ Self | StaticAbilities$ DontUntap | Duration$ Permanent | ForgetOnMoved$ Battlefield | Triggers$ RemoveEffect | SVars$ ExileEffect
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ EFFECTSOURCE 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/pinecrest_ridge.jpg
 Oracle:{T}: Add {C}.\n{T}: Add {R} or {G}. Pinecrest Ridge doesn't untap during your next untap step.
diff --git a/forge-gui/res/cardsfolder/r/rootwater_depths.txt b/forge-gui/res/cardsfolder/r/rootwater_depths.txt
index b67b053d7d1..96174457f34 100644
--- a/forge-gui/res/cardsfolder/r/rootwater_depths.txt
+++ b/forge-gui/res/cardsfolder/r/rootwater_depths.txt
@@ -2,8 +2,11 @@ Name:Rootwater Depths
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Mana | Cost$ T | Produced$ U | SpellDescription$ Add {U}. CARDNAME doesn't untap during your next untap step. | SubAbility$ DBPump
-A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}. CARDNAME doesn't untap during your next untap step. | SubAbility$ DBPump
-SVar:DBPump:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
+A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBStayTapped | SpellDescription$ Add {U}. CARDNAME doesn't untap during your next untap step.
+A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBStayTapped | SpellDescription$ Add {B}. CARDNAME doesn't untap during your next untap step.
+SVar:DBStayTapped:DB$ Effect | RememberObjects$ Self | StaticAbilities$ DontUntap | Duration$ Permanent | ForgetOnMoved$ Battlefield | Triggers$ RemoveEffect | SVars$ ExileEffect
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ EFFECTSOURCE 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://magiccards.info/scans/en/tp/329.jpg
 Oracle:{T}: Add {C}.\n{T}: Add {U} or {B}. Rootwater Depths doesn't untap during your next untap step.
diff --git a/forge-gui/res/cardsfolder/t/thalakos_lowlands.txt b/forge-gui/res/cardsfolder/t/thalakos_lowlands.txt
index 58befe7d1c9..638c1b63000 100644
--- a/forge-gui/res/cardsfolder/t/thalakos_lowlands.txt
+++ b/forge-gui/res/cardsfolder/t/thalakos_lowlands.txt
@@ -4,6 +4,9 @@ Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBStayTapped | SpellDescription$ Add {W}. CARDNAME doesn't untap during your next untap step.
 A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBStayTapped | SpellDescription$ Add {U}. CARDNAME doesn't untap during your next untap step.
-SVar:DBStayTapped:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
+SVar:DBStayTapped:DB$ Effect | RememberObjects$ Self | StaticAbilities$ DontUntap | Duration$ Permanent | ForgetOnMoved$ Battlefield | Triggers$ RemoveEffect | SVars$ ExileEffect
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ EFFECTSOURCE 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/thalakos_lowlands.jpg
 Oracle:{T}: Add {C}.\n{T}: Add {W} or {U}. Thalakos Lowlands doesn't untap during your next untap step.
diff --git a/forge-gui/res/cardsfolder/t/tranquil_garden.txt b/forge-gui/res/cardsfolder/t/tranquil_garden.txt
index 2869458d7f9..ef8b0f769f9 100644
--- a/forge-gui/res/cardsfolder/t/tranquil_garden.txt
+++ b/forge-gui/res/cardsfolder/t/tranquil_garden.txt
@@ -4,6 +4,9 @@ Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBStayTapped | SpellDescription$ Add {G}. CARDNAME doesn't untap during your next untap step.
 A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBStayTapped | SpellDescription$ Add {W}. CARDNAME doesn't untap during your next untap step.
-SVar:DBStayTapped:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
+SVar:DBStayTapped:DB$ Effect | RememberObjects$ Self | StaticAbilities$ DontUntap | Duration$ Permanent | ForgetOnMoved$ Battlefield | Triggers$ RemoveEffect | SVars$ ExileEffect
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ EFFECTSOURCE 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/tranquil_garden.jpg
 Oracle:{T}: Add {C}.\n{T}: Add {G} or {W}. Tranquil Garden doesn't untap during your next untap step.
diff --git a/forge-gui/res/cardsfolder/v/vec_townships.txt b/forge-gui/res/cardsfolder/v/vec_townships.txt
index 9ba7e2db842..e8c2524363d 100644
--- a/forge-gui/res/cardsfolder/v/vec_townships.txt
+++ b/forge-gui/res/cardsfolder/v/vec_townships.txt
@@ -2,8 +2,11 @@ Name:Vec Townships
 ManaCost:no cost
 Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
-A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}. CARDNAME doesn't untap during your next untap step. | SubAbility$ DBPump
-A:AB$ Mana | Cost$ T | Produced$ G | SpellDescription$ Add {G}. CARDNAME doesn't untap during your next untap step. | SubAbility$ DBPump
-SVar:DBPump:DB$Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
+A:AB$ Mana | Cost$ T | Produced$ W | SubAbility$ DBStayTapped | SpellDescription$ Add {W}. CARDNAME doesn't untap during your next untap step.
+A:AB$ Mana | Cost$ T | Produced$ G | SubAbility$ DBStayTapped | SpellDescription$ Add {G}. CARDNAME doesn't untap during your next untap step.
+SVar:DBStayTapped:DB$ Effect | RememberObjects$ Self | StaticAbilities$ DontUntap | Duration$ Permanent | ForgetOnMoved$ Battlefield | Triggers$ RemoveEffect | SVars$ ExileEffect
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ EFFECTSOURCE 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://magiccards.info/scans/en/br/93.jpg
 Oracle:{T}: Add {C}.\n{T}: Add {G} or {W}. Vec Townships doesn't untap during your next untap step.
diff --git a/forge-gui/res/cardsfolder/w/waterveil_cavern.txt b/forge-gui/res/cardsfolder/w/waterveil_cavern.txt
index 06b6f77dfa0..2b165ccdbd4 100644
--- a/forge-gui/res/cardsfolder/w/waterveil_cavern.txt
+++ b/forge-gui/res/cardsfolder/w/waterveil_cavern.txt
@@ -4,6 +4,9 @@ Types:Land
 A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}.
 A:AB$ Mana | Cost$ T | Produced$ U | SubAbility$ DBStayTapped | SpellDescription$ Add {U}. CARDNAME doesn't untap during your next untap step.
 A:AB$ Mana | Cost$ T | Produced$ B | SubAbility$ DBStayTapped | SpellDescription$ Add {B}. CARDNAME doesn't untap during your next untap step.
-SVar:DBStayTapped:DB$ Pump | KW$ HIDDEN This card doesn't untap during your next untap step. | Defined$ Self | Permanent$ True
+SVar:DBStayTapped:DB$ Effect | RememberObjects$ Self | StaticAbilities$ DontUntap | Duration$ Permanent | ForgetOnMoved$ Battlefield | Triggers$ RemoveEffect | SVars$ ExileEffect
+SVar:DontUntap:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Card.IsRemembered | CantUntap$ True | Description$ EFFECTSOURCE 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/waterveil_cavern.jpg
 Oracle:{T}: Add {C}.\n{T}: Add {U} or {B}. Waterveil Cavern doesn't untap during your next untap step.