diff --git a/Mage.Sets/src/mage/cards/a/AdarkarWastes.java b/Mage.Sets/src/mage/cards/a/AdarkarWastes.java
index 0c13c73880f5..d9cf3d1c2c1d 100644
--- a/Mage.Sets/src/mage/cards/a/AdarkarWastes.java
+++ b/Mage.Sets/src/mage/cards/a/AdarkarWastes.java
@@ -2,16 +2,12 @@
 package mage.cards.a;
 
 import java.util.UUID;
-import mage.Mana;
 import mage.abilities.Ability;
-import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.effects.common.DamageControllerEffect;
-import mage.abilities.mana.ColorlessManaAbility;
-import mage.abilities.mana.SimpleManaAbility;
+import mage.abilities.mana.*;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.Zone;
 
 /**
  *
@@ -24,10 +20,10 @@ public AdarkarWastes(UUID ownerId, CardSetInfo setInfo) {
 
         this.addAbility(new ColorlessManaAbility());
 
-        Ability whiteManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(1), new TapSourceCost());
+        Ability whiteManaAbility = new WhiteManaAbility();
         whiteManaAbility.addEffect(new DamageControllerEffect(1));
         this.addAbility(whiteManaAbility);
-        Ability blueManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(1), new TapSourceCost());
+        Ability blueManaAbility = new BlueManaAbility();
         blueManaAbility.addEffect(new DamageControllerEffect(1));
         this.addAbility(blueManaAbility);
     }
diff --git a/Mage.Sets/src/mage/cards/b/BattlefieldForge.java b/Mage.Sets/src/mage/cards/b/BattlefieldForge.java
index 7584beb70722..0dd56484708a 100644
--- a/Mage.Sets/src/mage/cards/b/BattlefieldForge.java
+++ b/Mage.Sets/src/mage/cards/b/BattlefieldForge.java
@@ -2,16 +2,12 @@
 package mage.cards.b;
 
 import java.util.UUID;
-import mage.Mana;
 import mage.abilities.Ability;
-import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.effects.common.DamageControllerEffect;
-import mage.abilities.mana.ColorlessManaAbility;
-import mage.abilities.mana.SimpleManaAbility;
+import mage.abilities.mana.*;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.Zone;
 
 /**
  *
@@ -26,10 +22,10 @@ public BattlefieldForge(UUID ownerId, CardSetInfo setInfo) {
         this.addAbility(new ColorlessManaAbility());
 
         // Tap: Add Red or White. Battlefield Forge deals 1 damage to you.
-        Ability redManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new TapSourceCost());
+        Ability redManaAbility = new RedManaAbility();
         redManaAbility.addEffect(new DamageControllerEffect(1));
         this.addAbility(redManaAbility);
-        Ability whiteManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(1), new TapSourceCost());
+        Ability whiteManaAbility = new WhiteManaAbility();
         whiteManaAbility.addEffect(new DamageControllerEffect(1));
         this.addAbility(whiteManaAbility);
     }
diff --git a/Mage.Sets/src/mage/cards/b/Brushland.java b/Mage.Sets/src/mage/cards/b/Brushland.java
index 2ab08216ab7a..52665bc928d4 100644
--- a/Mage.Sets/src/mage/cards/b/Brushland.java
+++ b/Mage.Sets/src/mage/cards/b/Brushland.java
@@ -2,16 +2,12 @@
 package mage.cards.b;
 
 import java.util.UUID;
-import mage.Mana;
 import mage.abilities.Ability;
-import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.effects.common.DamageControllerEffect;
-import mage.abilities.mana.ColorlessManaAbility;
-import mage.abilities.mana.SimpleManaAbility;
+import mage.abilities.mana.*;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.Zone;
 
 /**
  *
@@ -23,10 +19,10 @@ public Brushland(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
         this.addAbility(new ColorlessManaAbility());
 
-        Ability greenManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(1), new TapSourceCost());
+        Ability greenManaAbility = new GreenManaAbility();
         greenManaAbility.addEffect(new DamageControllerEffect(1));
         this.addAbility(greenManaAbility);
-        Ability whiteManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(1), new TapSourceCost());
+        Ability whiteManaAbility = new WhiteManaAbility();
         whiteManaAbility.addEffect(new DamageControllerEffect(1));
         this.addAbility(whiteManaAbility);
     }
diff --git a/Mage.Sets/src/mage/cards/c/CavesOfKoilos.java b/Mage.Sets/src/mage/cards/c/CavesOfKoilos.java
index 6f01d71e28ff..98f8f1b573d4 100644
--- a/Mage.Sets/src/mage/cards/c/CavesOfKoilos.java
+++ b/Mage.Sets/src/mage/cards/c/CavesOfKoilos.java
@@ -2,16 +2,12 @@
 package mage.cards.c;
 
 import java.util.UUID;
-import mage.Mana;
 import mage.abilities.Ability;
-import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.effects.common.DamageControllerEffect;
-import mage.abilities.mana.ColorlessManaAbility;
-import mage.abilities.mana.SimpleManaAbility;
+import mage.abilities.mana.*;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.Zone;
 
 /**
  *
@@ -27,10 +23,10 @@ public CavesOfKoilos(UUID ownerId, CardSetInfo setInfo) {
         this.addAbility(new ColorlessManaAbility());
 
         // Tap: Add White or Black. Caves of Koilos deals 1 damage to you.
-        Ability whiteManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.WhiteMana(1), new TapSourceCost());
+        Ability whiteManaAbility = new WhiteManaAbility();
         whiteManaAbility.addEffect(new DamageControllerEffect(1));
         this.addAbility(whiteManaAbility);
-        Ability blackManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new TapSourceCost());
+        Ability blackManaAbility = new BlackManaAbility();
         blackManaAbility.addEffect(new DamageControllerEffect(1));
         this.addAbility(blackManaAbility);
     }
diff --git a/Mage.Sets/src/mage/cards/k/KarplusanForest.java b/Mage.Sets/src/mage/cards/k/KarplusanForest.java
index 83d208f6ee40..5bd70c249c9f 100644
--- a/Mage.Sets/src/mage/cards/k/KarplusanForest.java
+++ b/Mage.Sets/src/mage/cards/k/KarplusanForest.java
@@ -2,16 +2,12 @@
 package mage.cards.k;
 
 import java.util.UUID;
-import mage.Mana;
 import mage.abilities.Ability;
-import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.effects.common.DamageControllerEffect;
-import mage.abilities.mana.ColorlessManaAbility;
-import mage.abilities.mana.SimpleManaAbility;
+import mage.abilities.mana.*;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.Zone;
 
 /**
  *
@@ -24,10 +20,10 @@ public KarplusanForest(UUID ownerId, CardSetInfo setInfo) {
         
         this.addAbility(new ColorlessManaAbility());
 
-        Ability redManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new TapSourceCost());
+        Ability redManaAbility = new RedManaAbility();
         redManaAbility.addEffect(new DamageControllerEffect(1));
         this.addAbility(redManaAbility);
-        Ability greenManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(1), new TapSourceCost());
+        Ability greenManaAbility = new GreenManaAbility();
         greenManaAbility.addEffect(new DamageControllerEffect(1));
         this.addAbility(greenManaAbility);
     }
diff --git a/Mage.Sets/src/mage/cards/l/LlanowarWastes.java b/Mage.Sets/src/mage/cards/l/LlanowarWastes.java
index 041447892823..ee849bea349f 100644
--- a/Mage.Sets/src/mage/cards/l/LlanowarWastes.java
+++ b/Mage.Sets/src/mage/cards/l/LlanowarWastes.java
@@ -2,16 +2,12 @@
 package mage.cards.l;
 
 import java.util.UUID;
-import mage.Mana;
 import mage.abilities.Ability;
-import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.effects.common.DamageControllerEffect;
-import mage.abilities.mana.ColorlessManaAbility;
-import mage.abilities.mana.SimpleManaAbility;
+import mage.abilities.mana.*;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.Zone;
 
 /**
  *
@@ -26,10 +22,10 @@ public LlanowarWastes(UUID ownerId, CardSetInfo setInfo) {
         this.addAbility(new ColorlessManaAbility());
 
         // Tap: Add Black or Green. Llanowar Wastes deals 1 damage to you.
-        Ability blackManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new TapSourceCost());
+        Ability blackManaAbility = new BlackManaAbility();
         blackManaAbility.addEffect(new DamageControllerEffect(1));
         this.addAbility(blackManaAbility);
-        Ability greenManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(1), new TapSourceCost());
+        Ability greenManaAbility = new GreenManaAbility();
         greenManaAbility.addEffect(new DamageControllerEffect(1));
         this.addAbility(greenManaAbility);
     }
diff --git a/Mage.Sets/src/mage/cards/s/ShivanReef.java b/Mage.Sets/src/mage/cards/s/ShivanReef.java
index 11fde3e73658..b3c014c37c29 100644
--- a/Mage.Sets/src/mage/cards/s/ShivanReef.java
+++ b/Mage.Sets/src/mage/cards/s/ShivanReef.java
@@ -2,16 +2,12 @@
 package mage.cards.s;
 
 import java.util.UUID;
-import mage.Mana;
 import mage.abilities.Ability;
-import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.effects.common.DamageControllerEffect;
-import mage.abilities.mana.ColorlessManaAbility;
-import mage.abilities.mana.SimpleManaAbility;
+import mage.abilities.mana.*;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.Zone;
 
 /**
  *
@@ -26,10 +22,10 @@ public ShivanReef(UUID ownerId, CardSetInfo setInfo) {
         this.addAbility(new ColorlessManaAbility());
 
         //Tap: Add Blue or Red. Shivan Reef deals 1 damage to you.
-        Ability blueManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(1), new TapSourceCost());
+        Ability blueManaAbility = new BlueManaAbility();
         blueManaAbility.addEffect(new DamageControllerEffect(1));
         this.addAbility(blueManaAbility);
-        Ability redManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new TapSourceCost());
+        Ability redManaAbility = new RedManaAbility();
         redManaAbility.addEffect(new DamageControllerEffect(1));
         this.addAbility(redManaAbility);
     }
diff --git a/Mage.Sets/src/mage/cards/s/SulfurousSprings.java b/Mage.Sets/src/mage/cards/s/SulfurousSprings.java
index 6041c5e6d958..65f7b0513953 100644
--- a/Mage.Sets/src/mage/cards/s/SulfurousSprings.java
+++ b/Mage.Sets/src/mage/cards/s/SulfurousSprings.java
@@ -2,16 +2,12 @@
 package mage.cards.s;
 
 import java.util.UUID;
-import mage.Mana;
 import mage.abilities.Ability;
-import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.effects.common.DamageControllerEffect;
-import mage.abilities.mana.ColorlessManaAbility;
-import mage.abilities.mana.SimpleManaAbility;
+import mage.abilities.mana.*;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.Zone;
 
 /**
  *
@@ -24,10 +20,10 @@ public SulfurousSprings(UUID ownerId, CardSetInfo setInfo) {
 
         this.addAbility(new ColorlessManaAbility());
 
-        Ability blackManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new TapSourceCost());
+        Ability blackManaAbility = new BlackManaAbility();
         blackManaAbility.addEffect(new DamageControllerEffect(1));
         this.addAbility(blackManaAbility);
-        Ability redManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.RedMana(1), new TapSourceCost());
+        Ability redManaAbility = new RedManaAbility();
         redManaAbility.addEffect(new DamageControllerEffect(1));
         this.addAbility(redManaAbility);
     }
diff --git a/Mage.Sets/src/mage/cards/u/UndergroundRiver.java b/Mage.Sets/src/mage/cards/u/UndergroundRiver.java
index 850cc79b3b32..d0067b0b09ed 100644
--- a/Mage.Sets/src/mage/cards/u/UndergroundRiver.java
+++ b/Mage.Sets/src/mage/cards/u/UndergroundRiver.java
@@ -2,16 +2,12 @@
 package mage.cards.u;
 
 import java.util.UUID;
-import mage.Mana;
 import mage.abilities.Ability;
-import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.effects.common.DamageControllerEffect;
-import mage.abilities.mana.ColorlessManaAbility;
-import mage.abilities.mana.SimpleManaAbility;
+import mage.abilities.mana.*;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.Zone;
 
 /**
  *
@@ -24,10 +20,10 @@ public UndergroundRiver(UUID ownerId, CardSetInfo setInfo) {
 
         this.addAbility(new ColorlessManaAbility());
 
-        Ability blueManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(1), new TapSourceCost());
+        Ability blueManaAbility = new BlueManaAbility();
         blueManaAbility.addEffect(new DamageControllerEffect(1));
         this.addAbility(blueManaAbility);
-        Ability blackManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlackMana(1), new TapSourceCost());
+        Ability blackManaAbility = new BlackManaAbility();
         blackManaAbility.addEffect(new DamageControllerEffect(1));
         this.addAbility(blackManaAbility);
     }
diff --git a/Mage.Sets/src/mage/cards/y/YavimayaCoast.java b/Mage.Sets/src/mage/cards/y/YavimayaCoast.java
index 9ce66236ce02..d44530df603c 100644
--- a/Mage.Sets/src/mage/cards/y/YavimayaCoast.java
+++ b/Mage.Sets/src/mage/cards/y/YavimayaCoast.java
@@ -2,16 +2,12 @@
 package mage.cards.y;
 
 import java.util.UUID;
-import mage.Mana;
 import mage.abilities.Ability;
-import mage.abilities.costs.common.TapSourceCost;
 import mage.abilities.effects.common.DamageControllerEffect;
-import mage.abilities.mana.ColorlessManaAbility;
-import mage.abilities.mana.SimpleManaAbility;
+import mage.abilities.mana.*;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
-import mage.constants.Zone;
 
 /**
  *
@@ -26,10 +22,10 @@ public YavimayaCoast(UUID ownerId, CardSetInfo setInfo) {
         this.addAbility(new ColorlessManaAbility());
 
         // Tap: Add Green or Blue. Yavimaya Coast deals 1 damage to you.
-        Ability greenManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.GreenMana(1), new TapSourceCost());
+        Ability greenManaAbility = new GreenManaAbility();
         greenManaAbility.addEffect(new DamageControllerEffect(1));
         this.addAbility(greenManaAbility);
-        Ability blueManaAbility = new SimpleManaAbility(Zone.BATTLEFIELD, Mana.BlueMana(1), new TapSourceCost());
+        Ability blueManaAbility = new BlueManaAbility();
         blueManaAbility.addEffect(new DamageControllerEffect(1));
         this.addAbility(blueManaAbility);
     }