diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java
index a88c10aa5..bac13d56b 100644
--- a/src/main/java/mekanism/api/MekanismConfig.java
+++ b/src/main/java/mekanism/api/MekanismConfig.java
@@ -67,8 +67,7 @@ public class MekanismConfig
 		public static double heatPerFuelTick = 4;
 		public static boolean allowTransmitterAlloyUpgrade;
 		public static boolean allowProtection = true;
-		public static boolean accurateHeavyWaterCapture = true;
-		public static int heavyWaterChance = 4;
+
 
 
 	}
@@ -84,6 +83,8 @@ public class MekanismConfig
 		public static int IC2SourceTier;
 		public static int digitalMinerMaxRadius;
 		public static boolean enableSingleUseCardboxes;
+		public static boolean accurateHeavyWaterCapture = true;
+		public static int heavyWaterChance = 4;
 	}
 
 
diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java
index 9c86378dd..e354de292 100644
--- a/src/main/java/mekanism/common/CommonProxy.java
+++ b/src/main/java/mekanism/common/CommonProxy.java
@@ -302,8 +302,8 @@ public class CommonProxy implements IGuiProvider
 		general.heatPerFuelTick = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HeatPerFuelTick", 4D).getDouble();
 		general.allowTransmitterAlloyUpgrade = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowTransmitterAlloyUpgrade", true).getBoolean();
 		general.allowProtection = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowProtection", true).getBoolean();
-		general.accurateHeavyWaterCapture = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AccurateHeavyWater", false).getBoolean();
-		general.heavyWaterChance = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AccurateHeavyWaterGen", 5).getInt();
+		mekce.accurateHeavyWaterCapture = Mekanism.configuration.get("mekce", "AccurateHeavyWater", false).getBoolean();
+		mekce.heavyWaterChance = Mekanism.configuration.get("mekce", "AccurateHeavyWaterGen", 5).getInt();
 
 
 		general.blacklistIC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistIC2Power", false).getBoolean();
diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java
index 9999c7671..615648bb3 100644
--- a/src/main/java/mekanism/common/network/PacketConfigSync.java
+++ b/src/main/java/mekanism/common/network/PacketConfigSync.java
@@ -75,8 +75,8 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
 			dataStream.writeDouble(general.heatPerFuelTick);
 			dataStream.writeBoolean(general.allowTransmitterAlloyUpgrade);
 			dataStream.writeBoolean(general.allowProtection);
-			dataStream.writeBoolean(general.accurateHeavyWaterCapture);
-			dataStream.writeInt(general.heavyWaterChance);
+			dataStream.writeBoolean(mekce.accurateHeavyWaterCapture);
+			dataStream.writeInt(mekce.heavyWaterChance);
 			dataStream.writeBoolean(mekce.EnableQuartzCompat);
 			dataStream.writeBoolean(mekce.EnableDiamondCompat);
 			dataStream.writeBoolean(mekce.EnablePoorOresCompat);
@@ -271,8 +271,8 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
 			general.heatPerFuelTick = dataStream.readDouble();
 			general.allowTransmitterAlloyUpgrade = dataStream.readBoolean();
 			general.allowProtection = dataStream.readBoolean();
-			general.accurateHeavyWaterCapture = dataStream.readBoolean();
-			general.heavyWaterChance = dataStream.readInt();
+			mekce.accurateHeavyWaterCapture = dataStream.readBoolean();
+			mekce.heavyWaterChance = dataStream.readInt();
 			mekce.EnableQuartzCompat = dataStream.readBoolean();
 			mekce.EnableDiamondCompat = dataStream.readBoolean();
 			mekce.EnablePoorOresCompat = dataStream.readBoolean();
diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java
index 40b4b58df..ead16ec51 100644
--- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java
+++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java
@@ -13,6 +13,7 @@ import java.util.Set;
 import mekanism.api.Coord4D;
 import mekanism.api.EnumColor;
 import mekanism.api.IConfigurable;
+import mekanism.api.MekanismConfig;
 import mekanism.api.MekanismConfig.general;
 import mekanism.api.MekanismConfig.usage;
 import mekanism.common.Upgrade;
@@ -84,7 +85,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I
 		super("ElectricPump", 10000);
 		inventory = new ItemStack[4];
 
-		if (!general.accurateHeavyWaterCapture)
+		if (!MekanismConfig.mekce.accurateHeavyWaterCapture)
 			upgradeComponent.setSupported(Upgrade.FILTER);
 	}
 
@@ -161,7 +162,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I
 	
 	public boolean hasFilter()
 	{
-		if (!general.accurateHeavyWaterCapture)
+		if (!MekanismConfig.mekce.accurateHeavyWaterCapture)
 			return upgradeComponent.getInstalledTypes().contains(Upgrade.FILTER);
 		return false;
 	}
diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
index 818259062..2ad85e5d8 100644
--- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
+++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java
@@ -97,13 +97,13 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
     /** This machine's current RedstoneControl type. */
     public RedstoneControl controlType = RedstoneControl.DISABLED;
 	public static final Random rnd = new Random();
-	public static int captureHeavyWaterChance = MekanismConfig.general.heavyWaterChance;
+	public static int captureHeavyWaterChance = MekanismConfig.mekce.heavyWaterChance;
 
 	public TileEntityElectrolyticSeparator()
 	{
 		super("ElectrolyticSeparator", MachineType.ELECTROLYTIC_SEPARATOR.baseEnergy);
 		inventory = new ItemStack[5];
-		if (MekanismConfig.general.accurateHeavyWaterCapture)
+		if (MekanismConfig.mekce.accurateHeavyWaterCapture)
 			upgradeComponent.setSupported(Upgrade.FILTER);
 	}
 
@@ -292,7 +292,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp
 	}
 	public boolean hasFilter()
 	{
-		if (MekanismConfig.general.accurateHeavyWaterCapture)
+		if (MekanismConfig.mekce.accurateHeavyWaterCapture)
 			return upgradeComponent.getInstalledTypes().contains(Upgrade.FILTER);
 		return false;
 	}