diff --git a/src/main/java/anvil/infinity/items/ItemMindStone.java b/src/main/java/anvil/infinity/items/ItemMindStone.java
index bfad052..0ceebbc 100644
--- a/src/main/java/anvil/infinity/items/ItemMindStone.java
+++ b/src/main/java/anvil/infinity/items/ItemMindStone.java
@@ -35,15 +35,12 @@ public class ItemMindStone extends ItemInfinityStone {
 
     @Override
     public Ability.AbilityMap addStoneAbilities(EntityLivingBase entity, Ability.AbilityMap abilities, Ability.EnumAbilityContext context) {
-        abilities.put("flight", new AbilityFlight(entity).setDataValue(AbilityFlight.SPEED, 1f));
-        abilities.put("changesnap", new AbilityChangeSnap(entity));
+        abilities.put("flight", new AbilityFlight(entity).setDataValue(AbilityFlight.SPEED, 1f).setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.YELLOW));
+        abilities.put("changesnap", new AbilityChangeSnap(entity).setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.YELLOW));
         if (CompatHandler.isHeroesExpansion && ConfigHandler.heAbilities) {
-            abilities.put("telekinesis", CompatHandler.HeroesExpension.getAbilityGrabEntity(entity));
+            abilities.put("telekinesis", CompatHandler.HeroesExpension.getAbilityGrabEntity(entity).setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.YELLOW));
         }
 
-        for (Ability ability : abilities.values()) {
-            ability.setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.YELLOW);
-        }
 
         return super.addStoneAbilities(entity, abilities, context);
     }
diff --git a/src/main/java/anvil/infinity/items/ItemPowerStone.java b/src/main/java/anvil/infinity/items/ItemPowerStone.java
index dc7696b..1602412 100644
--- a/src/main/java/anvil/infinity/items/ItemPowerStone.java
+++ b/src/main/java/anvil/infinity/items/ItemPowerStone.java
@@ -37,21 +37,18 @@ public class ItemPowerStone extends ItemInfinityStone implements IAbilityProvide
 
     @Override
     public Ability.AbilityMap addStoneAbilities(EntityLivingBase entity, Ability.AbilityMap abilities, Ability.EnumAbilityContext context) {
-        abilities.put("blast", new AbilityEnergyBlast(entity).setDataValue(AbilityEnergyBlast.DAMAGE, Float.MAX_VALUE).setDataValue(AbilityEnergyBlast.COLOR, Color.MAGENTA));
-        abilities.put("strength", new AbilityStrength(entity).setDataValue(AbilityAttributeModifier.AMOUNT, Float.MAX_VALUE));
-        abilities.put("damage", new AbilityPunch(entity).setDataValue(AbilityPunch.AMOUNT, Float.MAX_VALUE));
-        abilities.put("resistance", new AbilityDamageResistance(entity).setDataValue(AbilityAttributeModifier.AMOUNT, Float.MAX_VALUE));
+        abilities.put("blast", new AbilityEnergyBlast(entity).setDataValue(AbilityEnergyBlast.DAMAGE, Float.MAX_VALUE).setDataValue(AbilityEnergyBlast.COLOR, Color.MAGENTA).setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.PURPLE));
+        abilities.put("strength", new AbilityStrength(entity).setDataValue(AbilityAttributeModifier.AMOUNT, Float.MAX_VALUE).setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.PURPLE));
+        abilities.put("damage", new AbilityPunch(entity).setDataValue(AbilityPunch.AMOUNT, Float.MAX_VALUE).setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.PURPLE));
+        abilities.put("resistance", new AbilityDamageResistance(entity).setDataValue(AbilityAttributeModifier.AMOUNT, Float.MAX_VALUE).setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.PURPLE));
         abilities.put("saturation", new AbilitySaturation(entity));
         if (CompatHandler.isStarTech && ConfigHandler.stAbilities) {
-            abilities.put("power_blat", CompatHandler.StarTech.getAbilityPowerBlast(entity).setMaxCooldown(ConfigHandler.powerCooldown));
-            abilities.put("power_impower", CompatHandler.StarTech.getAbilityPowerImpower(entity));
-            abilities.put("power_rocket_burst", CompatHandler.StarTech.getAbilityPowerRocketBurst(entity).setMaxCooldown(100));
-            abilities.put("power_tendrils", CompatHandler.StarTech.getAbilityTendrils(entity));
+            abilities.put("power_blat", CompatHandler.StarTech.getAbilityPowerBlast(entity).setMaxCooldown(ConfigHandler.powerCooldown).setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.PURPLE));
+            abilities.put("power_impower", CompatHandler.StarTech.getAbilityPowerImpower(entity).setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.PURPLE));
+            abilities.put("power_rocket_burst", CompatHandler.StarTech.getAbilityPowerRocketBurst(entity).setMaxCooldown(100).setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.PURPLE));
+            abilities.put("power_tendrils", CompatHandler.StarTech.getAbilityTendrils(entity).setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.PURPLE));
         }
 
-        for (Ability ability : abilities.values()) {
-            ability.setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.PURPLE);
-        }
 
         return super.addStoneAbilities(entity, abilities, context);
     }
diff --git a/src/main/java/anvil/infinity/items/ItemRealityStone.java b/src/main/java/anvil/infinity/items/ItemRealityStone.java
index 24749cc..548a961 100644
--- a/src/main/java/anvil/infinity/items/ItemRealityStone.java
+++ b/src/main/java/anvil/infinity/items/ItemRealityStone.java
@@ -35,17 +35,13 @@ public class ItemRealityStone extends ItemInfinityStone {
     @Override
     public Ability.AbilityMap addStoneAbilities(EntityLivingBase entity, Ability.AbilityMap abilities, Ability.EnumAbilityContext context) {
         if (ConfigHandler.sizeChanging) {
-            abilities.put("size", new AbilitySizeChange(entity).setDataValue(AbilitySizeChange.SIZE, ConfigHandler.size));
+            abilities.put("size", new AbilitySizeChange(entity).setDataValue(AbilitySizeChange.SIZE, ConfigHandler.size).setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.RED));
         }
-        abilities.put("invisibility", new AbilityInvisibility(entity));
+        abilities.put("invisibility", new AbilityInvisibility(entity).setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.RED));
         if (CompatHandler.isSpeedsterHeroes && ConfigHandler.useSHRealityAbilities) {
-            abilities.put("save_block", CompatHandler.SpeedsterHeroes.getAbilitySaveBlock(entity));
-            abilities.put("change_block", CompatHandler.SpeedsterHeroes.getAbilityChangeBlock(entity));
-            abilities.put("turn_into_bubbles", CompatHandler.SpeedsterHeroes.getAbilityTurnIntoBubbles(entity));
-        }
-
-        for (Ability ability : abilities.values()) {
-            ability.setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.RED);
+            abilities.put("save_block", CompatHandler.SpeedsterHeroes.getAbilitySaveBlock(entity).setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.RED));
+            abilities.put("change_block", CompatHandler.SpeedsterHeroes.getAbilityChangeBlock(entity).setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.RED));
+            abilities.put("turn_into_bubbles", CompatHandler.SpeedsterHeroes.getAbilityTurnIntoBubbles(entity).setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.RED));
         }
 
         return super.addStoneAbilities(entity, abilities, context);
diff --git a/src/main/java/anvil/infinity/items/ItemSoulStone.java b/src/main/java/anvil/infinity/items/ItemSoulStone.java
index 89f5d67..fa344ea 100644
--- a/src/main/java/anvil/infinity/items/ItemSoulStone.java
+++ b/src/main/java/anvil/infinity/items/ItemSoulStone.java
@@ -46,15 +46,12 @@ public class ItemSoulStone extends ItemInfinityStone {
     @Override
     public Ability.AbilityMap addStoneAbilities(EntityLivingBase entity, Ability.AbilityMap abilities, Ability.EnumAbilityContext context) {
         if (ConfigHandler.soulHealthBoost) {
-            abilities.put("immortality", new AbilityHealth(entity).setDataValue(AbilityAttributeModifier.AMOUNT, Float.MAX_VALUE));
+            abilities.put("immortality", new AbilityHealth(entity).setDataValue(AbilityAttributeModifier.AMOUNT, Float.MAX_VALUE).setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.ORANGE));
         }
-        abilities.put("healing", new AbilityHealing(entity).setDataValue(AbilityHealing.FREQUENCY, 1));
-        abilities.put("kill", new AbilityKill(entity, killCond));
-        abilities.put("snap", new AbilitySnap(entity));
+        abilities.put("healing", new AbilityHealing(entity).setDataValue(AbilityHealing.FREQUENCY, 1).setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.ORANGE));
+        abilities.put("kill", new AbilityKill(entity, killCond).setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.ORANGE));
+        abilities.put("snap", new AbilitySnap(entity).setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.ORANGE));
 
-        for (Ability ability : abilities.values()) {
-            ability.setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.ORANGE);
-        }
 
         return super.addStoneAbilities(entity, abilities, context);
     }
diff --git a/src/main/java/anvil/infinity/items/ItemTimeStone.java b/src/main/java/anvil/infinity/items/ItemTimeStone.java
index 7e1d48c..fab02a6 100644
--- a/src/main/java/anvil/infinity/items/ItemTimeStone.java
+++ b/src/main/java/anvil/infinity/items/ItemTimeStone.java
@@ -32,12 +32,9 @@ public class ItemTimeStone extends ItemInfinityStone {
 
     @Override
     public Ability.AbilityMap addStoneAbilities(EntityLivingBase entity, Ability.AbilityMap abilities, Ability.EnumAbilityContext context) {
-        abilities.put("fast_forward", new AbilityFastForward(entity));
-        abilities.put("stop_time", new AbilityStopTime(entity));
+        abilities.put("fast_forward", new AbilityFastForward(entity).setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.GREEN));
+        abilities.put("stop_time", new AbilityStopTime(entity).setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.GREEN));
 
-        for (Ability ability : abilities.values()) {
-            ability.setDataValue(Ability.BAR_COLOR, EnumAbilityBarColor.GREEN);
-        }
 
         return super.addStoneAbilities(entity, abilities, context);
     }